You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2015/02/23 13:30:43 UTC
fauxton commit: updated refs/heads/master to eb06a94
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 5752c4862 -> eb06a9431
allow multiple selenium ports
Make selenium port configurable, e.g. to spin up several selenium
servers on one CI system
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/eb06a943
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/eb06a943
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/eb06a943
Branch: refs/heads/master
Commit: eb06a94312612b7f41eb1efd5ec75b077fcff650
Parents: 5752c48
Author: Robert Kowalski <ro...@apache.org>
Authored: Fri Feb 20 17:22:09 2015 +0100
Committer: Robert Kowalski <ro...@apache.org>
Committed: Mon Feb 23 13:29:18 2015 +0100
----------------------------------------------------------------------
settings.json.default | 3 ++-
tasks/fauxton.js | 3 ++-
test/nightwatch_tests/nightwatch.json.underscore | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eb06a943/settings.json.default
----------------------------------------------------------------------
diff --git a/settings.json.default b/settings.json.default
index 9c3ba87..35ed88e 100644
--- a/settings.json.default
+++ b/settings.json.default
@@ -79,6 +79,7 @@
"db_host": "localhost",
"db_port": "5984",
"custom_commands_path": "test/nightwatch_tests/custom-commands",
- "globals_path": "test/nightwatch_tests/helpers/helpers.js"
+ "globals_path": "test/nightwatch_tests/helpers/helpers.js",
+ "selenium_port": "4444"
}
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eb06a943/tasks/fauxton.js
----------------------------------------------------------------------
diff --git a/tasks/fauxton.js b/tasks/fauxton.js
index e3204a3..2cbe240 100644
--- a/tasks/fauxton.js
+++ b/tasks/fauxton.js
@@ -164,7 +164,8 @@ module.exports = function(grunt) {
fauxton_host: this.data.settings.nightwatch.fauxton_host,
fauxton_port: this.data.settings.nightwatch.fauxton_port,
db_host: this.data.settings.nightwatch.db_host,
- db_port: this.data.settings.nightwatch.db_port
+ db_port: this.data.settings.nightwatch.db_port,
+ selenium_port: this.data.settings.nightwatch.selenium_port
}));
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eb06a943/test/nightwatch_tests/nightwatch.json.underscore
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/nightwatch.json.underscore b/test/nightwatch_tests/nightwatch.json.underscore
index b22fff0..b4c3bb0 100644
--- a/test/nightwatch_tests/nightwatch.json.underscore
+++ b/test/nightwatch_tests/nightwatch.json.underscore
@@ -12,7 +12,7 @@
"server_path" : "test/nightwatch_tests/selenium/selenium-server-standalone-2.43.1.jar",
"log_path" : "",
"host" : "127.0.0.1",
- "port" : 4444,
+ "port" : "<%- selenium_port %>",
"cli_args" : {
"webdriver.chrome.driver" : "test/nightwatch_tests/selenium/chromedriver",
"webdriver.ie.driver" : "",
@@ -27,7 +27,7 @@
"launch_url": "http://<%- fauxton_host %>:<%- fauxton_port %>",
"db_url": "http://<%- fauxton_username %>:<%- password %>@<%- db_host %>:<%- db_port %>",
"selenium_host" : "127.0.0.1",
- "selenium_port" : 4444,
+ "selenium_port" : "<%- selenium_port %>",
"silent" : true,
"disable_colors": false,
"screenshots" : {