tests: add tests for exists and directory

divshot · Jul 23, 2014 · 3bbecb3 · 3bbecb3
1 parent c162654
commit 3bbecb3
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 15 deletions.
diff --git a/index.js b/index.js
@@ -6,31 +6,20 @@ var fileExists = require('file-exists');
 module.exports = function (options) {
   options = options || {};
 
-  /*
-  DEFAULTS
-  ===============
-  {
-    root: './',
-    index: 'index.html',
-    directory: true
-    exists: undefined
-  }
-   */
-
   var root = options.root || './';
   var indexFile = options.index || 'index.html';
-  var leaveOnDirectory = (options.directory || options.directory === undefined) ? true : false;
+  var leaveOnDirectory = (options.directory === false) ? false : true;
 
   if (options.exists) fileExists = options.exists;
 
   return function (req, res, next) {
     var pathname = url.parse(req.url).pathname;
 
-    if (isDirectoryIndex() && !hasTrailingSlash()) return redirect(join(pathname, '/')); // Don't remove tailing slash on directory index file
-    if (isDirectoryIndex()) return next();
+    if (leaveOnDirectory && isDirectoryIndex() && !hasTrailingSlash()) return redirect(join(pathname, '/')); // Don't remove tailing slash on directory index file
+    if (leaveOnDirectory && isDirectoryIndex()) return next();
     if (pathname !== '/' && hasTrailingSlash()) return redirect(pathname.substring(0, pathname.length - 1));
 
-    // pathname looks ok
+    // no redirect needed
     next();
 
     function redirect (redirectUrl) {

diff --git a/test/index.js b/test/index.js
@@ -48,6 +48,48 @@ describe.only('remove trailing slash middleware', function() {
       });
   });
 
+  it('handles custom directory index file names', function (done) {
+    fs.mkdirpSync('.tmp/about');
+    fs.writeFileSync('.tmp/about/custom.html', 'index');
+
+    var app = connect()
+      .use(slashify({
+        root: '.tmp',
+        index: 'custom.html'
+      }));
+
+    request(app)
+      .get('/about/')
+      .expect(404)
+      .expect(function (data) {
+        expect(data.req.path).to.equal('/about/');
+      })
+      .end(function (err) {
+        fs.removeSync('.tmp');
+        done(err);
+      });
+  });
+
+  it('ignores the directory index rule', function (done) {
+    fs.mkdirpSync('.tmp/about');
+    fs.writeFileSync('.tmp/about/index.html', 'index');
+
+    var app = connect()
+      .use(slashify({
+        root: '.tmp',
+        directory: false
+      }));
+
+    request(app)
+      .get('/about/')
+      .expect(301)
+      .expect('Location', '/about')
+      .end(function (err) {
+        fs.removeSync('.tmp');
+        done(err);
+      });
+  });
+
   it('redirects directory index to have a trailing slash', function (done) {
     fs.mkdirpSync('.tmp/about');
     fs.writeFileSync('.tmp/about/index.html', 'index');
@@ -80,4 +122,24 @@ describe.only('remove trailing slash middleware', function() {
       .expect('Location', '/contact?query=param')
       .end(done);
   });
+
+  it('overrides the file exists method with a custom method', function (done) {
+      fs.mkdirpSync('.tmp');
+      fs.writeFileSync('.tmp/test.html', 'test');
+
+      var app = connect()
+        .use(slashify({
+          exists: function () {
+            return false
+          }
+        }));
+
+      request(app)
+        .get('/.tmp/test.html')
+        .expect(404)
+        .end(function (err) {
+          fs.removeSync('.tmp');
+          done(err);
+        });
+    });
 });