added options test

expressjs · May 25, 2011 · f15eb6d · f15eb6d
1 parent 5b33788
commit f15eb6d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/lib/router/index.js b/lib/router/index.js
@@ -281,7 +281,7 @@ Router.prototype._optionsFor = function(path){
   var self = this;
   return methods.filter(function(method){
     var routes = self.routes[method];
-    if (!routes) return;
+    if (!routes || 'options' == method) return;
     for (var i = 0, len = routes.length; i < len; ++i) {
       if (routes[i].match(path)) return true;
     }

diff --git a/test/router.test.js b/test/router.test.js
@@ -277,5 +277,26 @@ module.exports = {
     assert.response(app,
       { url: '/Account' },
       { body: 'Account' });
+  },
+
+  'override OPTIONS default': function(){
+    var app = express.createServer();
+
+    app.get('/', function(req, res, next){
+
+    });
+
+    app.options('/foo', function(req, res, next){
+      res.header('Allow', 'GET')
+      res.send('whatever');
+    });
+
+    assert.response(app,
+      { url: '/', method: 'OPTIONS' },
+      { body: 'GET', headers: { Allow: 'GET' }});
+
+    assert.response(app,
+      { url: '/foo', method: 'OPTIONS' },
+      { body: 'whatever', headers: { Allow: 'GET' }});
   }
 };