From 8c138b504046a3aeb230b71e1049aa60ee46905d Mon Sep 17 00:00:00 2001 From: Vojta Jina Date: Wed, 13 Mar 2013 16:34:08 -0700 Subject: [PATCH] fix(config): do not change urlRoot even if proxied This basically reverts 8b4fd64df6b7d07b5479e43dcd8cd2aa5e1efc9c See https://github.com/testacular/testacular/commit/8b4fd64df6b7d07b5479e43dcd8cd2aa5e1efc9c --- lib/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/config.js b/lib/config.js index 49d60fbf4..b1ecb3869 100644 --- a/lib/config.js +++ b/lib/config.js @@ -85,9 +85,9 @@ var normalizeConfig = function(config) { config.urlRoot = urlRoot; } - if (config.proxies && config.proxies.hasOwnProperty('/') && config.urlRoot === '/') { - log.warn('urlRoot set to /__testacualar__/ because of "/" proxy'); - config.urlRoot = '/__testacualar__/'; + if (config.proxies && config.proxies.hasOwnProperty(config.urlRoot)) { + log.warn('"%s" is proxied, you should probably change urlRoot to avoid conflicts', + config.urlRoot); } if (config.singleRun && config.autoWatch) {