summaryrefslogtreecommitdiff
path: root/share/www/script/test/config.js
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2010-07-27 11:02:36 +0000
committerRobert Newson <rnewson@apache.org>2010-07-27 11:02:36 +0000
commit89d0b4600cc80cb507b513c4b76af9c1eb60fb22 (patch)
treee008483a43c59cd40d6dd6cdc4f28073cbedc41e /share/www/script/test/config.js
parent4b0948ddb3a428f8a5330e05745b2fbd4ccf9375 (diff)
fix CLI js test suite.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@979642 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www/script/test/config.js')
-rw-r--r--share/www/script/test/config.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/share/www/script/test/config.js b/share/www/script/test/config.js
index 3cba360d..e83ecfd9 100644
--- a/share/www/script/test/config.js
+++ b/share/www/script/test/config.js
@@ -28,22 +28,21 @@ couchTests.config = function(debug) {
Overengineering FTW.
*/
var server_port = CouchDB.host.split(':');
- var proto = window.location.protocol;
if(server_port.length == 1 && CouchDB.inBrowser) {
- if(proto == "http:") {
+ if(CouchDB.protocol == "http://") {
port = 80;
}
- if(proto == "https:") {
+ if(CouchDB.protocol == "https://") {
port = 443;
}
} else {
port = server_port.pop();
}
- if(proto == "http:") {
+ if(CouchDB.protocol == "http://") {
config_port = config.httpd.port;
}
- if(proto == "https:") {
+ if(CouchDB.protocol == "https://") {
config_port = config.ssl.port;
}