couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject fauxton commit: updated refs/heads/master to 9d95c6f
Date Mon, 25 Apr 2016 16:37:40 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 3f46050d3 -> 9d95c6f7f


Tweak tableViewConflicts NW test

This test fails occasionally. This softens is a little to
ensure the expected parent DOM element is there before
asserting stuff on it.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9d95c6f7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9d95c6f7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9d95c6f7

Branch: refs/heads/master
Commit: 9d95c6f7fee69d32f19235dd1108c04370eb9a6f
Parents: 3f46050
Author: Ben Keen <ben.keen@gmail.com>
Authored: Mon Apr 25 08:41:45 2016 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Mon Apr 25 09:08:41 2016 -0700

----------------------------------------------------------------------
 app/addons/documents/tests/nightwatch/tableViewConflicts.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9d95c6f7/app/addons/documents/tests/nightwatch/tableViewConflicts.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/tableViewConflicts.js b/app/addons/documents/tests/nightwatch/tableViewConflicts.js
index b5740bf..aaeb964 100644
--- a/app/addons/documents/tests/nightwatch/tableViewConflicts.js
+++ b/app/addons/documents/tests/nightwatch/tableViewConflicts.js
@@ -24,11 +24,12 @@ module.exports = {
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
 
       .clickWhenVisible('.alternative-header .two-sides-toggle-button button:last-child')
-      .waitForElementVisible('.table', client.globals.maxWaitTime, false)
+      .waitForElementVisible('.table', waitTime, false)
 
       .clickWhenVisible('.control-toggle-include-docs')
 
-      .waitForElementVisible('.table-container-autocomplete', client.globals.maxWaitTime,
false)
+      .waitForElementVisible('.table-container-autocomplete', waitTime, false)
+      .waitForElementVisible('.tableview-conflict', waitTime, false)
 
       .assert.visible('.table [data-conflicts-indicator="true"]')
 


Mime
View raw message