Allow setting the protocol of the couchdb URL for nightwatch tests (#…

…1058)
apache · Mar 6, 2018 · 5c18e65 · 5c18e65
1 parent 5e81931
commit 5c18e65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/settings.json.default.json b/settings.json.default.json
@@ -77,6 +77,7 @@
       "fauxton_username": "tester",
       "password": "testerpass",
       "fauxton_port": "8000",
+      "db_protocol": "http",
       "db_host": "localhost",
       "db_port": "5984",
       "custom_commands_path": ["test/nightwatch_tests/custom-commands", "test/nightwatch_tests/custom-commands/auth"],

diff --git a/tasks/fauxton.js b/tasks/fauxton.js
@@ -104,6 +104,7 @@ module.exports = function (grunt) {
       launch_url: this.data.settings.nightwatch.launch_url,
       fauxton_host: _getHost(this.data.settings.nightwatch.fauxton_ip),
       fauxton_port: this.data.settings.nightwatch.fauxton_port,
+      db_protocol: this.data.settings.nightwatch.db_protocol,
       db_host: this.data.settings.nightwatch.db_host,
       db_port: this.data.settings.nightwatch.db_port,
       selenium_port: this.data.settings.nightwatch.selenium_port

diff --git a/test/nightwatch_tests/nightwatch.json.underscore b/test/nightwatch_tests/nightwatch.json.underscore
@@ -25,7 +25,7 @@
       "fauxton_username": "<%- fauxton_username %>",
       "password": "<%- password %>",
       "launch_url": "http://<%- fauxton_host %>:<%- fauxton_port %>",
-      "db_url": "http://<%- fauxton_username %>:<%- password %>@<%- db_host %>:<%- db_port %>",
+      "db_url": "<%- db_protocol %>://<%- fauxton_username %>:<%- password %>@<%- db_host %>:<%- db_port %>",
       "selenium_host" : "127.0.0.1",
       "selenium_port" : "<%- selenium_port %>",
       "silent" : true,