fix(config): do not change urlRoot even if proxied

vojtajina · vojtajina · commit 1be1ae1dc7ff · 2013-03-13T16:34:32.000-07:00
This basically reverts 8b4fd64 See https://github.com/testacular/testacular/commit/8b4fd64df6b7d07b5479e43dcd8cd2aa5e1efc9c
diff --git a/lib/config.js b/lib/config.js
@@ -84,9 +84,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) {

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ var normalizeConfig = function(config) {`
`84`	`84`	`config.urlRoot = urlRoot;`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (config.proxies && config.proxies.hasOwnProperty('/') && config.urlRoot === '/') {`
`88`		`- log.warn('urlRoot set to /__testacualar__/ because of "/" proxy');`
`89`		`- config.urlRoot = '/__testacualar__/';`
	`87`	`+ if (config.proxies && config.proxies.hasOwnProperty(config.urlRoot)) {`
	`88`	`+ log.warn('"%s" is proxied, you should probably change urlRoot to avoid conflicts',`
	`89`	`+ config.urlRoot);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if (config.singleRun && config.autoWatch) {`