couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 781b6aa
Date Fri, 05 Dec 2014 23:52:16 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master c2e8dbd02 -> 781b6aaec


change Fauxton username variable in testing


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

Branch: refs/heads/master
Commit: 781b6aaecedca09c09d5ef7ef251e79e598bb461
Parents: c2e8dbd
Author: Michelle Phung <michellephung@gmail.com>
Authored: Fri Dec 5 16:17:05 2014 -0500
Committer: Robert Kowalski <rok@kowalski.gd>
Committed: Sat Dec 6 00:53:41 2014 +0100

----------------------------------------------------------------------
 .travis.yml                                                  | 1 +
 Gruntfile.js                                                 | 2 +-
 .../tests/nightwatch/switchDatabaseViaLookaheadTray.js       | 2 +-
 settings.json.default                                        | 2 +-
 tasks/fauxton.js                                             | 4 ++--
 test/nightwatch_tests/custom-commands/loginToGUI.js          | 8 ++++----
 test/nightwatch_tests/helpers/helpers.js                     | 1 -
 test/nightwatch_tests/nightwatch.json.underscore             | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 353e8bb..c4514f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,3 +19,4 @@ env:
   global:
   - secure: GZfXnEV5hwH5FKcnbFK57WZLy2C8i650rCFFU4JaHNMNqsqGN/FH4CNyPO//BveZRQWJFRAaH7WclK/4L45NeX4/iufwGf8ypcGR2GvzQtGe1VdoQCNiiDv42BVvX7riT9aCcCdJNqjoKRIL9NkFo+gln1hEymZrQGUC7dojeFY=
   - secure: THafpI+3svqxOa9gf5wFxuF/QIngKPlNpKPo7rKTnI76pfTuG7MGeBw1S1Da3hkMx3XIYciHcoqnb7LEwI7+s6UWA7eLA1FBcsRqJbSDI5VqSfOcYVJ05oFQ21/Iofk8r8R/LtJGQWwwZxem6P74cwu2iR2VcuWdImSHGiESOKg=
+

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 8a95020..aa5bbb4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -407,7 +407,7 @@ module.exports = function(grunt) {
           ' -e chrome -c ' + __dirname + '/test/nightwatch_tests/' + 'nightwatch.json'
       },
       start_nightWatch_saucelabs: {
-         command: __dirname + '/node_modules/nightwatch/bin/nightwatch' +
+         command: 'sleep 10s; '+ __dirname + '/node_modules/nightwatch/bin/nightwatch' +
           ' -e saucelabs -c ' + __dirname + '/test/nightwatch_tests/' + 'nightwatch.json'
       }
     },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/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 13a4e87..506869f 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 = 8000,
+    var waitTime = 10000,
       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/781b6aae/settings.json.default
----------------------------------------------------------------------
diff --git a/settings.json.default b/settings.json.default
index 0bf96cb..2eede08 100644
--- a/settings.json.default
+++ b/settings.json.default
@@ -73,7 +73,7 @@
     },
 
     "nightwatch": {
-      "username": "tester",
+      "fauxton_username": "tester",
       "password": "testerpass",
       "fauxton_host": "localhost",
       "fauxton_port": "8000",

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/tasks/fauxton.js
----------------------------------------------------------------------
diff --git a/tasks/fauxton.js b/tasks/fauxton.js
index d229a29..0afd2d7 100644
--- a/tasks/fauxton.js
+++ b/tasks/fauxton.js
@@ -156,7 +156,7 @@ module.exports = function(grunt) {
       src_folders: JSON.stringify(addonsWithTests),
       custom_commands_path: JSON.stringify(this.data.settings.nightwatch.custom_commands_path),
       globals_path: this.data.settings.nightwatch.globals_path,
-      username: this.data.settings.nightwatch.username,
+      fauxton_username: this.data.settings.nightwatch.fauxton_username,
       password: this.data.settings.nightwatch.password,
       launch_url: this.data.settings.nightwatch.launch_url,
       fauxton_host: this.data.settings.nightwatch.fauxton_host,
@@ -178,7 +178,7 @@ module.exports = function(grunt) {
 
     // check the requires nightwatch settings. These should always exist in the settings.json
file
     } else if (!_.has(data, 'nightwatch') ||
-      !_.has(data.nightwatch, 'username') ||
+      !_.has(data.nightwatch, 'fauxton_username') ||
       !_.has(data.nightwatch, 'password')) {
       error = 'Your settings.json file doesn\'t contain valid nightwatch settings. Please
check the user doc.';
     }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/test/nightwatch_tests/custom-commands/loginToGUI.js
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/custom-commands/loginToGUI.js b/test/nightwatch_tests/custom-commands/loginToGUI.js
index 7b0dc18..e3361f8 100644
--- a/test/nightwatch_tests/custom-commands/loginToGUI.js
+++ b/test/nightwatch_tests/custom-commands/loginToGUI.js
@@ -2,18 +2,18 @@ exports.command = function () {
 
   var client = this,
       baseUrl = client.globals.test_settings.launch_url,
-      username = client.globals.test_settings.username,
+      username = client.globals.test_settings.fauxton_username,
       password = client.globals.test_settings.password;
 
   client
     .url(baseUrl+'/#login')
-    .waitForElementPresent('a[href="#login"]', 8000, false)
+    .waitForElementPresent('a[href="#login"]', 15000, false)
     .click('a[href="#login"]')
-    .waitForElementPresent('#username', 8000, false)
+    .waitForElementPresent('#username', 10000, false)
     .setValue('#username', [username])
     .setValue('#password', [password, client.Keys.ENTER])
     .closeNotification()
-    .waitForElementPresent('#jump-to-db', 8000, false);
+    .waitForElementPresent('#jump-to-db', 10000, false);
 
   return this;
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/test/nightwatch_tests/helpers/helpers.js
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/helpers/helpers.js b/test/nightwatch_tests/helpers/helpers.js
index 0f69bc4..555a747 100644
--- a/test/nightwatch_tests/helpers/helpers.js
+++ b/test/nightwatch_tests/helpers/helpers.js
@@ -7,7 +7,6 @@ module.exports = {
   getNanoInstance: function () {
     return nano(this.test_settings.db_url);
   },
-
   beforeEach: function (done) {
     var nano = module.exports.getNanoInstance(),
         database = module.exports.testDatabaseName;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/781b6aae/test/nightwatch_tests/nightwatch.json.underscore
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/nightwatch.json.underscore b/test/nightwatch_tests/nightwatch.json.underscore
index c421f2e..5acb5a0 100644
--- a/test/nightwatch_tests/nightwatch.json.underscore
+++ b/test/nightwatch_tests/nightwatch.json.underscore
@@ -22,10 +22,10 @@
 
   "test_settings" : {
     "default" : {
-      "username": "<%- username %>",
+      "fauxton_username": "<%- fauxton_username %>",
       "password": "<%- password %>",
       "launch_url": "http://<%- fauxton_host %>:<%- fauxton_port %>",
-      "db_url": "http://<%- username %>:<%- password %>@<%- db_host %>:<%-
db_port %>",
+      "db_url": "http://<%- fauxton_username %>:<%- password %>@<%- db_host
%>:<%- db_port %>",
       "selenium_host" : "127.0.0.1",
       "selenium_port" : 4444,
       "silent" : true,


Mime
View raw message