Closes hapijs#804

jmonster · May 1, 2013 · caa5f56 · caa5f56
1 parent 5e85518
commit caa5f56
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/lib/files.js b/lib/files.js
@@ -16,7 +16,6 @@ exports.fileHandler = function (route, options) {
     var filePath = (typeof options === 'object') ? options.path : options;
     var mode = (typeof options === 'object') ? options.mode : false;
     Utils.assert(filePath && (typeof filePath === 'function' || typeof filePath === 'string'), 'Invalid file path');
-    Utils.assert(typeof filePath !== 'string' || route.params.length === 0, 'Route path with static file path cannot contain a parameter');
     Utils.assert(typeof filePath !== 'string' || filePath[filePath.length - 1] !== '/', 'File path cannot end with a \'/\'');
 
     var absolutePath = internals.absolutePath(route);

diff --git a/test/integration/response.js b/test/integration/response.js
@@ -728,18 +728,6 @@ describe('Response', function () {
             });
         });
 
-        it('throws an error when adding a route with a parameter and string path', function (done) {
-
-            var fn = function () {
-
-                var server = new Hapi.Server(0, { files: { relativeTo: 'routes' } });
-                server.route({ method: 'GET', path: '/fileparam/{path}', handler: { file: './package.json' } });
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-
         it('doesn\'t throw an error when adding a route with a parameter and function path', function (done) {
 
             var fn = function () {