Merge branch 'pr-1095' into presubmit-master-pr-1095

karma-runner · Jun 16, 2014 · ecb6390 · ecb6390
2 parents e63acb6 + 911c2f1
commit ecb6390
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/middleware/proxy.js b/lib/middleware/proxy.js
@@ -24,6 +24,7 @@ var parseProxyConfig = function(proxies) {
     if (endsWithSlash(proxyPath) && !endsWithSlash(proxyUrl)) {
       log.warn('proxy "%s" normalized to "%s"', proxyUrl, proxyUrl + '/');
       proxyUrl += '/';
+      pathname += '/';
     }
 
     if (!endsWithSlash(proxyPath) && endsWithSlash(proxyUrl)) {

diff --git a/test/unit/middleware/proxy.spec.coffee b/test/unit/middleware/proxy.spec.coffee
@@ -154,5 +154,20 @@ describe 'middleware.proxy', ->
       baseProxyUrl: '/proxy/test', https:false}
     }
 
+  it 'should normalize proxy url with only basepaths', ->
+    proxy = {'/base/': '/proxy/test'}
+    parsedProxyConfig = m.parseProxyConfig proxy
+    expect(parsedProxyConfig).to.deep.equal {
+      '/base/': {host: c.DEFAULT_HOSTNAME, port: c.DEFAULT_PORT,
+      baseProxyUrl: '/proxy/test/', https:false}
+    }
+
+  it 'should normalize proxy url', ->
+    proxy = {'/base/': 'http://localhost:8000/proxy/test'}
+    parsedProxyConfig = m.parseProxyConfig proxy
+    expect(parsedProxyConfig).to.deep.equal {
+      '/base/': {host: 'localhost', port: '8000', baseProxyUrl: '/proxy/test/', https:false}
+    }
+
   it 'should handle empty proxy config', ->
     expect(m.parseProxyConfig {}).to.deep.equal({})