Merge f5f13d2 into 68ea9f2

expressjs · May 14, 2015 · 44cf632 · 44cf632
2 parents 68ea9f2 + f5f13d2
commit 44cf632
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -59,7 +59,7 @@ module.exports = function favicon(path, options){
   }
 
   return function favicon(req, res, next){
-    if (parseUrl(req).pathname !== '/favicon.ico') {
+    if (parseUrl(req).pathname.indexOf('/favicon.ico') === -1) {
       next();
       return;
     }

diff --git a/test/test.js b/test/test.js
@@ -121,6 +121,13 @@ describe('favicon()', function(){
       .expect(200, done);
     });
 
+    it('should serve icon', function(done){
+      request(server)
+      .get('/somePath/favicon.ico')
+      .expect('Content-Type', 'image/x-icon')
+      .expect(200, done);
+    });
+
     it('should include cache-control', function(done){
       request(server)
       .get('/favicon.ico')