feat(web-server): serve css files

timols · timols · commit 4e305545ddf2 · 2013-07-01T18:44:21.000-07:00
Closes #431
diff --git a/lib/web-server.js b/lib/web-server.js
@@ -13,6 +13,7 @@ var proxy = require('./proxy');
 var log = require('./logger').create('web server');
 
 var SCRIPT_TAG = '<script type="%s" src="%s"></script>';
+var LINK_TAG = '<link type="text/css" href="%s" rel="stylesheet">';
 
 
 var setNoCacheHeaders = function(response) {
@@ -113,6 +114,10 @@ var createKarmaSourceHandler = function(promiseContainer, staticFolder, adapterF
               }
             }
 
+            if (/\.css$/.test(file.path)) {
+              return util.format(LINK_TAG, filePath);
+            }
+
             return util.format(SCRIPT_TAG, scriptType, filePath);
           });
 
diff --git a/test/unit/web-server.spec.coffee b/test/unit/web-server.spec.coffee
@@ -188,6 +188,19 @@ describe 'web-server', ->
 
       karmaSrcHandler new httpMock.ServerRequest('/_karma_/context.html'), response, nextSpy
 
+    it 'should serve context.html with replaced link tags', ->
+      includedFiles [{path: '/first.css', mtime: new Date 12345},
+        {path: '/second.css', mtime: new Date 67890}]
+
+      response.once 'end', ->
+        expect(nextSpy).not.to.have.been.called
+        expect(response._content.toString()).to.equal  'CONTEXT\n' +
+        '<link type="text/css" href="/absolute/first.css?12345" rel="stylesheet">\n' +
+        '<link type="text/css" href="/absolute/second.css?67890" rel="stylesheet">'
+        expect(response.statusCode).to.equal 200
+
+      karmaSrcHandler new httpMock.ServerRequest('/_karma_/context.html'), response, nextSpy
+
 
     it 'should serve debug.html with replaced script tags without timestamps', (done) ->
       includedFiles [{path: '/first.js', mtime: new Date 12345},
@@ -204,7 +217,22 @@ describe 'web-server', ->
       karmaSrcHandler new httpMock.ServerRequest('/_karma_/debug.html'), response, nextSpy
 
 
-    it 'should serve context.html with /basepath/*, /adapter/*, /absolute/* ', (done) ->
+    it 'should serve debug.html with replaced link tags without timestamps', (done) ->
+      includedFiles [{path: '/first.css', mtime: new Date 12345},
+        {path: '/second.css', mtime: new Date 67890}]
+
+      response.once 'end', ->
+        expect(nextSpy).not.to.have.been.called
+        expect(response._content.toString()).to.equal  'RUNNER\n' +
+        '<link type="text/css" href="/absolute/first.css" rel="stylesheet">\n' +
+        '<link type="text/css" href="/absolute/second.css" rel="stylesheet">'
+        expect(response.statusCode).to.equal 200
+        done()
+
+      karmaSrcHandler new httpMock.ServerRequest('/_karma_/debug.html'), response, nextSpy
+
+
+    it 'should serve context.html with the correct path for script tags', (done) ->
       includedFiles [{path: '/some/abs/a.js', mtime: new Date 12345},
         {path: '/base/path/b.js', mtime: new Date 67890},
         {path: '/karma/adapter/c.js', mtime: new Date 321}]
@@ -221,6 +249,23 @@ describe 'web-server', ->
       karmaSrcHandler new httpMock.ServerRequest('/_karma_/context.html'), response, nextSpy
 
 
+    it 'should serve context.html with the correct path for link tags', (done) ->
+      includedFiles [{path: '/some/abs/a.css', mtime: new Date 12345},
+        {path: '/base/path/b.css', mtime: new Date 67890},
+        {path: '/karma/adapter/c.css', mtime: new Date 321}]
+
+      response.once 'end', ->
+        expect(nextSpy).not.to.have.been.called
+        expect(response._content.toString()).to.equal  'CONTEXT\n' +
+        '<link type="text/css" href="/absolute/some/abs/a.css?12345" rel="stylesheet">\n' +
+        '<link type="text/css" href="/base/b.css?67890" rel="stylesheet">\n' +
+        '<link type="text/css" href="/adapter/c.css?321" rel="stylesheet">'
+        expect(response.statusCode).to.equal 200
+        done()
+
+      karmaSrcHandler new httpMock.ServerRequest('/_karma_/context.html'), response, nextSpy
+
+
     it 'should not change urls', (done) ->
       includedFiles [{path: 'https://some.url.com/whatever', isUrl: true}]
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ var proxy = require('./proxy');`
`13`	`13`	`var log = require('./logger').create('web server');`
`14`	`14`
`15`	`15`	`var SCRIPT_TAG = '<script type="%s" src="%s"></script>';`
	`16`	`+var LINK_TAG = '<link type="text/css" href="%s" rel="stylesheet">';`
`16`	`17`
`17`	`18`
`18`	`19`	`var setNoCacheHeaders = function(response) {`
`@@ -113,6 +114,10 @@ var createKarmaSourceHandler = function(promiseContainer, staticFolder, adapterF`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`
	`117`	`+ if (/\.css$/.test(file.path)) {`
	`118`	`+ return util.format(LINK_TAG, filePath);`
	`119`	`+ }`
	`120`	`+`
`116`	`121`	`return util.format(SCRIPT_TAG, scriptType, filePath);`
`117`	`122`	`});`
`118`	`123`