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 e7920f3
Date Tue, 07 Apr 2015 23:28:57 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 1a505b15b -> e7920f3b1


Tweaks to nightwatch tests

- Increases the timeout to 20 seconds because very rarely it can
timeout on the two tests.
- maxTineout time moved to a global
- couple of minor changes, like click() now clickWhenVisible()


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

Branch: refs/heads/master
Commit: e7920f3b10a21345e04685fa2376043f3144c17a
Parents: 1a505b1
Author: Ben Keen <ben.keen@gmail.com>
Authored: Tue Apr 7 14:56:12 2015 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Tue Apr 7 16:06:06 2015 -0700

----------------------------------------------------------------------
 .../compaction/tests/nightwatch/compactAndCleanIsPresent.js  | 2 +-
 .../databases/tests/nightwatch/checkDatabaseTooltip.js       | 2 +-
 app/addons/databases/tests/nightwatch/createsDatabase.js     | 4 ++--
 app/addons/databases/tests/nightwatch/deletesDatabase.js     | 2 +-
 .../tests/nightwatch/deletesDatabaseSpecialChars.js          | 2 +-
 app/addons/databases/tests/nightwatch/zeroclipboard.js       | 2 +-
 app/addons/documents/tests/nightwatch/bulkDelete.js          | 6 ++++--
 app/addons/documents/tests/nightwatch/bulkSelect.js          | 2 +-
 app/addons/documents/tests/nightwatch/changes.js             | 4 ++--
 app/addons/documents/tests/nightwatch/changesFilter.js       | 2 +-
 app/addons/documents/tests/nightwatch/createsDocument.js     | 2 +-
 app/addons/documents/tests/nightwatch/deleteDatabaseModal.js | 4 ++--
 app/addons/documents/tests/nightwatch/deletesDocument.js     | 2 +-
 .../documents/tests/nightwatch/editDocumentsFromView.js      | 4 ++--
 app/addons/documents/tests/nightwatch/lookaheadTray.js       | 2 +-
 app/addons/documents/tests/nightwatch/mangoIndex.js          | 2 +-
 app/addons/documents/tests/nightwatch/mangoIndexList.js      | 2 +-
 .../navigateAfterEditingDocShouldShowAConfirmationBox.js     | 2 +-
 app/addons/documents/tests/nightwatch/navigateFromNewDoc.js  | 2 +-
 app/addons/documents/tests/nightwatch/navigateToNewView.js   | 2 +-
 app/addons/documents/tests/nightwatch/paginateAllDocs.js     | 6 +++---
 app/addons/documents/tests/nightwatch/paginateView.js        | 6 +++---
 app/addons/documents/tests/nightwatch/previousFromView.js    | 2 +-
 .../tests/nightwatch/switchDatabaseViaLookaheadTray.js       | 2 +-
 app/addons/documents/tests/nightwatch/viewCreate.js          | 8 +++++++-
 app/addons/documents/tests/nightwatch/viewCreateBadView.js   | 4 ++--
 app/addons/documents/tests/nightwatch/viewEdit.js            | 6 +++---
 app/addons/documents/tests/nightwatch/viewQueryOptions.js    | 2 +-
 app/addons/fauxton/tests/nightwatch/highlightsidebar.js      | 2 +-
 .../verifyinstall/tests/nightwatch/testVerification.js       | 2 +-
 test/nightwatch_tests/helpers/helpers.js                     | 2 +-
 31 files changed, 51 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/compaction/tests/nightwatch/compactAndCleanIsPresent.js
----------------------------------------------------------------------
diff --git a/app/addons/compaction/tests/nightwatch/compactAndCleanIsPresent.js b/app/addons/compaction/tests/nightwatch/compactAndCleanIsPresent.js
index 13970c5..a9fb368 100644
--- a/app/addons/compaction/tests/nightwatch/compactAndCleanIsPresent.js
+++ b/app/addons/compaction/tests/nightwatch/compactAndCleanIsPresent.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Compact and Clean Menu shows up' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
index 5c6c121..f72beb7 100644
--- a/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
+++ b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Check the tooltip icon for DB with deleted items appears': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName = 'TemporaryDoc',
         baseUrl = client.globals.test_settings.launch_url;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/databases/tests/nightwatch/createsDatabase.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/createsDatabase.js b/app/addons/databases/tests/nightwatch/createsDatabase.js
index fca6f79..3cb043c 100644
--- a/app/addons/databases/tests/nightwatch/createsDatabase.js
+++ b/app/addons/databases/tests/nightwatch/createsDatabase.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Creates a Database' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -21,7 +21,7 @@ module.exports = {
       .deleteDatabase(newDatabaseName) //need to delete the automatic database 'fauxton-selenium-tests'
that has been set up before each test
       .url(baseUrl)
       .waitForElementPresent('#add-new-database', waitTime, false)
-      .click('#add-new-database')
+      .clickWhenVisible('#add-new-database', waitTime, false)
       .pause(1000)
       .waitForElementVisible('#js-new-database-name', waitTime, false)
       .setValue('#js-new-database-name', [newDatabaseName])

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/databases/tests/nightwatch/deletesDatabase.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/deletesDatabase.js b/app/addons/databases/tests/nightwatch/deletesDatabase.js
index e803475..7a386e5 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabase.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabase.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Deletes a database': function (client) {
-    var waitTime = 8000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
index 0ac07de..0ff4feb 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Deletes a database with special chars': function (client) {
-    var waitTime = 8000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = 'one/two-three/_four', // add any other chars here you want to
test
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/databases/tests/nightwatch/zeroclipboard.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/tests/nightwatch/zeroclipboard.js b/app/addons/databases/tests/nightwatch/zeroclipboard.js
index e188407..8c0c282 100644
--- a/app/addons/databases/tests/nightwatch/zeroclipboard.js
+++ b/app/addons/databases/tests/nightwatch/zeroclipboard.js
@@ -14,7 +14,7 @@ var os = require('os');
 
 module.exports = {
   'ZeroClipboard copies' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/bulkDelete.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/bulkDelete.js b/app/addons/documents/tests/nightwatch/bulkDelete.js
index d6a2f78..333a8c4 100644
--- a/app/addons/documents/tests/nightwatch/bulkDelete.js
+++ b/app/addons/documents/tests/nightwatch/bulkDelete.js
@@ -11,8 +11,9 @@
 // the License.
 
 module.exports = {
+
   'Bulk deletes': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName1 = 'bulktest1',
         newDocumentName2 = 'bulktest2',
@@ -44,7 +45,7 @@ module.exports = {
   },
 
   'Select all works after changing the page': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -63,4 +64,5 @@ module.exports = {
       .waitForElementPresent('.control-select-all.js-headerbar-togglebutton-selected', waitTime,
false)
       .end();
   }
+
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/bulkSelect.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/bulkSelect.js b/app/addons/documents/tests/nightwatch/bulkSelect.js
index e767c30..be6dad1 100644
--- a/app/addons/documents/tests/nightwatch/bulkSelect.js
+++ b/app/addons/documents/tests/nightwatch/bulkSelect.js
@@ -15,7 +15,7 @@ module.exports = {
   // And there are less documents than I have set to display per page
   // Then I want the select-all-button to be selected
   'Bulk Documents: selector': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName1 = 'bulktest1',
         newDocumentName2 = 'bulktest2',

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/changes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/changes.js b/app/addons/documents/tests/nightwatch/changes.js
index 95b823d..49c1527 100644
--- a/app/addons/documents/tests/nightwatch/changes.js
+++ b/app/addons/documents/tests/nightwatch/changes.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Does not display the Select-all-button': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -27,7 +27,7 @@ module.exports = {
   },
 
   'Check doc link in Changes feed links properly': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/changesFilter.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/changesFilter.js b/app/addons/documents/tests/nightwatch/changesFilter.js
index ff8d249..e2e4e5b 100644
--- a/app/addons/documents/tests/nightwatch/changesFilter.js
+++ b/app/addons/documents/tests/nightwatch/changesFilter.js
@@ -16,7 +16,7 @@ module.exports = {
   // changes.componentsSpec.react.jsx mocha tests; this is more of a sanity end-to-end test
   'Check changes filter results' : function (client) {
 
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/createsDocument.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/createsDocument.js b/app/addons/documents/tests/nightwatch/createsDocument.js
index a1fdaf1..19ec1a8 100644
--- a/app/addons/documents/tests/nightwatch/createsDocument.js
+++ b/app/addons/documents/tests/nightwatch/createsDocument.js
@@ -13,7 +13,7 @@
 module.exports = {
   'Creates a document' : function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName = 'create_doc_document',
         baseUrl = client.globals.test_settings.launch_url;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
index d222ee7..973e455 100644
--- a/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
+++ b/app/addons/documents/tests/nightwatch/deleteDatabaseModal.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Shows a warning for system databases (prefixed with _)': function (client) {
-    var waitTime = 8000,
+    var waitTime = client.globals.maxWaitTime,
         baseUrl = client.globals.test_settings.launch_url;
 
     client
@@ -28,7 +28,7 @@ module.exports = {
   },
 
   'Shows no warning for non system databases': function (client) {
-    var waitTime = 8000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/deletesDocument.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/deletesDocument.js b/app/addons/documents/tests/nightwatch/deletesDocument.js
index ca633ae..34f4688 100644
--- a/app/addons/documents/tests/nightwatch/deletesDocument.js
+++ b/app/addons/documents/tests/nightwatch/deletesDocument.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Deletes a document': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName = 'delete_doc_doc',
         baseUrl = client.globals.test_settings.launch_url;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/editDocumentsFromView.js b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
index 6aa2c37..8237399 100644
--- a/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
+++ b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Edit is allowed from default Map Views' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName = '_design/abc',
         baseUrl = client.globals.test_settings.launch_url,
@@ -45,7 +45,7 @@ module.exports = {
   },
 
   'Edit is not allowed for Map Views where reduce is checked' : function (client) {
-    var waitTime = 10000;
+    var waitTime = client.globals.maxWaitTime;
 
     client
       .clickWhenVisible('#dashboard a[href="#database/fauxton-selenium-tests/_design/abc/_view/evens"]')

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/lookaheadTray.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/lookaheadTray.js b/app/addons/documents/tests/nightwatch/lookaheadTray.js
index 1951760..4eef03b 100644
--- a/app/addons/documents/tests/nightwatch/lookaheadTray.js
+++ b/app/addons/documents/tests/nightwatch/lookaheadTray.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'The tray opens': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/mangoIndex.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/mangoIndex.js b/app/addons/documents/tests/nightwatch/mangoIndex.js
index 1c66ebe..50c0e75 100644
--- a/app/addons/documents/tests/nightwatch/mangoIndex.js
+++ b/app/addons/documents/tests/nightwatch/mangoIndex.js
@@ -14,7 +14,7 @@ module.exports = {
 
   'Creating new indexes with mango': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/mangoIndexList.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/mangoIndexList.js b/app/addons/documents/tests/nightwatch/mangoIndexList.js
index a4f8cc0..7ed4af2 100644
--- a/app/addons/documents/tests/nightwatch/mangoIndexList.js
+++ b/app/addons/documents/tests/nightwatch/mangoIndexList.js
@@ -13,7 +13,7 @@
 module.exports = {
 
   'Creating new indexes with mango': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/navigateAfterEditingDocShouldShowAConfirmationBox.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/navigateAfterEditingDocShouldShowAConfirmationBox.js
b/app/addons/documents/tests/nightwatch/navigateAfterEditingDocShouldShowAConfirmationBox.js
index 1983bf8..38bdc48 100644
--- a/app/addons/documents/tests/nightwatch/navigateAfterEditingDocShouldShowAConfirmationBox.js
+++ b/app/addons/documents/tests/nightwatch/navigateAfterEditingDocShouldShowAConfirmationBox.js
@@ -13,7 +13,7 @@
 module.exports = {
 
   'Navigate to New Doc Page, editing and then clicking on the sidebar should show a confirmation
dialog': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/navigateFromNewDoc.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/navigateFromNewDoc.js b/app/addons/documents/tests/nightwatch/navigateFromNewDoc.js
index 22d14a6..c5167dd 100644
--- a/app/addons/documents/tests/nightwatch/navigateFromNewDoc.js
+++ b/app/addons/documents/tests/nightwatch/navigateFromNewDoc.js
@@ -15,7 +15,7 @@ module.exports = {
   // this tests that the user is able to just navigate to and from the New View page without
errors [it confirms
   // a bug fix for where the Ace Editor threw a JS error preventing the subsequent page from
loading]
   'Navigate to and from New Doc Page' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
       newDatabaseName = client.globals.testDatabaseName,
       baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/navigateToNewView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/navigateToNewView.js b/app/addons/documents/tests/nightwatch/navigateToNewView.js
index 133c259..ed8d8c3 100644
--- a/app/addons/documents/tests/nightwatch/navigateToNewView.js
+++ b/app/addons/documents/tests/nightwatch/navigateToNewView.js
@@ -15,7 +15,7 @@ module.exports = {
   // this tests that the user is able to just navigate to and from the New View page without
errors [it confirms
   // a bug fix for where the Ace Editor threw a JS error preventing the subsequent page from
loading]
   'Navigate to and from New View Page' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
       newDatabaseName = client.globals.testDatabaseName,
       baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/paginateAllDocs.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/paginateAllDocs.js b/app/addons/documents/tests/nightwatch/paginateAllDocs.js
index 024911b..7bd3b1e 100644
--- a/app/addons/documents/tests/nightwatch/paginateAllDocs.js
+++ b/app/addons/documents/tests/nightwatch/paginateAllDocs.js
@@ -14,7 +14,7 @@ module.exports = {
 
   'change number of items per page': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -46,7 +46,7 @@ module.exports = {
 
   'paginate to page two and back': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -74,7 +74,7 @@ module.exports = {
 
   'PerPage change resets to page 1': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/paginateView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/paginateView.js b/app/addons/documents/tests/nightwatch/paginateView.js
index 18bd9ab..bcbca08 100644
--- a/app/addons/documents/tests/nightwatch/paginateView.js
+++ b/app/addons/documents/tests/nightwatch/paginateView.js
@@ -13,7 +13,7 @@
 module.exports = {
 
 	'change number of items per page': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -42,7 +42,7 @@ module.exports = {
   },
 
   'paginate to page two and back': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -71,7 +71,7 @@ module.exports = {
   },
 
   'PerPage change resets to page 1': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/previousFromView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/previousFromView.js b/app/addons/documents/tests/nightwatch/previousFromView.js
index 2abc379..d6cecbd 100644
--- a/app/addons/documents/tests/nightwatch/previousFromView.js
+++ b/app/addons/documents/tests/nightwatch/previousFromView.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'View: Navigate previous works correctly': function (client) {
-    var waitTime = 15000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/switchDatabaseViaLookaheadTray.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/switchDatabaseViaLookaheadTray.js b/app/addons/documents/tests/nightwatch/switchDatabaseViaLookaheadTray.js
index 506869f..4cd739c 100644
--- a/app/addons/documents/tests/nightwatch/switchDatabaseViaLookaheadTray.js
+++ b/app/addons/documents/tests/nightwatch/switchDatabaseViaLookaheadTray.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Confirm switching databases via lookahead tray': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
       newDatabaseName = client.globals.testDatabaseName,
       secondDatabaseName = newDatabaseName + "2",
       baseUrl = client.globals.test_settings.launch_url;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/viewCreate.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/viewCreate.js b/app/addons/documents/tests/nightwatch/viewCreate.js
index 5b6fc47..98b7b1e 100644
--- a/app/addons/documents/tests/nightwatch/viewCreate.js
+++ b/app/addons/documents/tests/nightwatch/viewCreate.js
@@ -10,7 +10,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-var waitTime = 10000,
+var waitTime,
     baseUrl,
     newDatabaseName,
     newDocumentName,
@@ -19,6 +19,8 @@ var waitTime = 10000,
 var tests = {
 
   'Creates a Design Doc using the dropdown at "all documents"': function (client) {
+    var waitTime = client.globals.maxWaitTime;
+
     /*jshint multistr: true */
     openDifferentDropdownsAndClick(client, '#header-dropdown-menu')
       .setValue('#new-ddoc', 'test_design_doc-selenium-1')
@@ -38,6 +40,8 @@ var tests = {
 
 
   'Creates a Design Doc using the dropdown at "the upper dropdown in the header"': function
(client) {
+    var waitTime = client.globals.maxWaitTime;
+
     /*jshint multistr: true */
     openDifferentDropdownsAndClick(client, '#header-dropdown-menu')
       .setValue('#new-ddoc', 'test_design_doc-selenium-2')
@@ -56,6 +60,7 @@ var tests = {
   },
 
   'Adds a View to a DDoc using an existing DDoc': function (client) {
+    var waitTime = client.globals.maxWaitTime;
     /*jshint multistr: true */
 
     openDifferentDropdownsAndClick(client, '[data-target="#testdesigndoc"]')
@@ -84,6 +89,7 @@ var tests = {
 
 function openDifferentDropdownsAndClick (client, dropDownElement) {
   modifier = dropDownElement.slice(1);
+  waitTime = client.globals.maxWaitTime;
   newDatabaseName = client.globals.testDatabaseName;
   newDocumentName = 'create_view_doc' + modifier;
   baseUrl = client.globals.test_settings.launch_url;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/viewCreateBadView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/viewCreateBadView.js b/app/addons/documents/tests/nightwatch/viewCreateBadView.js
index bd0ca3f..18d6f1f 100644
--- a/app/addons/documents/tests/nightwatch/viewCreateBadView.js
+++ b/app/addons/documents/tests/nightwatch/viewCreateBadView.js
@@ -14,7 +14,7 @@ module.exports = {
 
   'Displays an error if reduce is not possible': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url,
         dropDownElement = '#header-dropdown-menu';
@@ -41,7 +41,7 @@ module.exports = {
   },
 
   'Visit url of broken view displays error': function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/viewEdit.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/viewEdit.js b/app/addons/documents/tests/nightwatch/viewEdit.js
index b18faab..ec3365a 100644
--- a/app/addons/documents/tests/nightwatch/viewEdit.js
+++ b/app/addons/documents/tests/nightwatch/viewEdit.js
@@ -14,7 +14,7 @@ module.exports = {
 
   'Edits a design doc - set new index name': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -41,7 +41,7 @@ module.exports = {
 
   'Edits a design doc': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 
@@ -67,7 +67,7 @@ module.exports = {
 
   'Query Options are kept after a new reduce method is chosen': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/documents/tests/nightwatch/viewQueryOptions.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/viewQueryOptions.js b/app/addons/documents/tests/nightwatch/viewQueryOptions.js
index 245b89d..fc529fc 100644
--- a/app/addons/documents/tests/nightwatch/viewQueryOptions.js
+++ b/app/addons/documents/tests/nightwatch/viewQueryOptions.js
@@ -13,7 +13,7 @@
 module.exports = {
   'Edit view: Queryoptions work': function (client) {
     /*jshint multistr: true */
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         baseUrl = client.globals.test_settings.launch_url;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/fauxton/tests/nightwatch/highlightsidebar.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/nightwatch/highlightsidebar.js b/app/addons/fauxton/tests/nightwatch/highlightsidebar.js
index 5bb0b63..445e1e5 100644
--- a/app/addons/fauxton/tests/nightwatch/highlightsidebar.js
+++ b/app/addons/fauxton/tests/nightwatch/highlightsidebar.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Highlight Sidebar' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
         baseUrl = client.globals.test_settings.launch_url;
 
     client

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/app/addons/verifyinstall/tests/nightwatch/testVerification.js
----------------------------------------------------------------------
diff --git a/app/addons/verifyinstall/tests/nightwatch/testVerification.js b/app/addons/verifyinstall/tests/nightwatch/testVerification.js
index 0aa246f..1fbb717 100644
--- a/app/addons/verifyinstall/tests/nightwatch/testVerification.js
+++ b/app/addons/verifyinstall/tests/nightwatch/testVerification.js
@@ -12,7 +12,7 @@
 
 module.exports = {
   'Run the Verification test' : function (client) {
-    var waitTime = 10000,
+    var waitTime = client.globals.maxWaitTime,
       baseUrl = client.globals.test_settings.launch_url;
 
     client

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7920f3b/test/nightwatch_tests/helpers/helpers.js
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/helpers/helpers.js b/test/nightwatch_tests/helpers/helpers.js
index f7211d7..6ff9b31 100644
--- a/test/nightwatch_tests/helpers/helpers.js
+++ b/test/nightwatch_tests/helpers/helpers.js
@@ -13,7 +13,7 @@
 var nano = require('nano');
 
 module.exports = {
-
+  maxWaitTime: 20000,
   testDatabaseName : 'fauxton-selenium-tests',
 
   getNanoInstance: function () {


Mime
View raw message