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

This basically reverts 8b4fd64 See https://github.com/testacular/testacular/commit/8b4fd64df6b7d07b5479e43dcd8cd2aa5e1efc9c
karma-runner · Mar 13, 2013 · 1be1ae1 · 1be1ae1
1 parent 2d210aa
commit 1be1ae1
Showing 1 changed file with 3 additions and 3 deletions.
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) {