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 f9b0ee0
Date Tue, 03 Mar 2015 23:18:22 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 86d2f20de -> f9b0ee090


Nightwatch auth moved to separate folder

This has been done to allow overriding, simply by specifying a
different location for the folder in the settings.json file.


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

Branch: refs/heads/master
Commit: f9b0ee090959656e3451d89c9cc996f67f9ea462
Parents: 86d2f20
Author: Ben Keen <ben.keen@gmail.com>
Authored: Tue Feb 24 08:19:16 2015 -0800
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Tue Mar 3 15:18:56 2015 -0800

----------------------------------------------------------------------
 settings.json.default                            |  2 +-
 .../custom-commands/auth/loginToGUI.js           | 19 +++++++++++++++++++
 .../custom-commands/loginToGUI.js                | 19 -------------------
 3 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f9b0ee09/settings.json.default
----------------------------------------------------------------------
diff --git a/settings.json.default b/settings.json.default
index 775dfb9..157fd7a 100644
--- a/settings.json.default
+++ b/settings.json.default
@@ -79,7 +79,7 @@
       "fauxton_port": "8000",
       "db_host": "localhost",
       "db_port": "5984",
-      "custom_commands_path": "test/nightwatch_tests/custom-commands",
+      "custom_commands_path": ["test/nightwatch_tests/custom-commands", "test/nightwatch_tests/custom-commands/auth"],
       "globals_path": "test/nightwatch_tests/helpers/helpers.js",
       "selenium_port": "4444"
     }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f9b0ee09/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/custom-commands/auth/loginToGUI.js b/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
new file mode 100644
index 0000000..e3361f8
--- /dev/null
+++ b/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
@@ -0,0 +1,19 @@
+exports.command = function () {
+
+  var client = this,
+      baseUrl = client.globals.test_settings.launch_url,
+      username = client.globals.test_settings.fauxton_username,
+      password = client.globals.test_settings.password;
+
+  client
+    .url(baseUrl+'/#login')
+    .waitForElementPresent('a[href="#login"]', 15000, false)
+    .click('a[href="#login"]')
+    .waitForElementPresent('#username', 10000, false)
+    .setValue('#username', [username])
+    .setValue('#password', [password, client.Keys.ENTER])
+    .closeNotification()
+    .waitForElementPresent('#jump-to-db', 10000, false);
+
+  return this;
+};

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f9b0ee09/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
deleted file mode 100644
index e3361f8..0000000
--- a/test/nightwatch_tests/custom-commands/loginToGUI.js
+++ /dev/null
@@ -1,19 +0,0 @@
-exports.command = function () {
-
-  var client = this,
-      baseUrl = client.globals.test_settings.launch_url,
-      username = client.globals.test_settings.fauxton_username,
-      password = client.globals.test_settings.password;
-
-  client
-    .url(baseUrl+'/#login')
-    .waitForElementPresent('a[href="#login"]', 15000, false)
-    .click('a[href="#login"]')
-    .waitForElementPresent('#username', 10000, false)
-    .setValue('#username', [username])
-    .setValue('#password', [password, client.Keys.ENTER])
-    .closeNotification()
-    .waitForElementPresent('#jump-to-db', 10000, false);
-
-  return this;
-};


Mime
View raw message