fixed loading of .types file and test that ecstatic throws if path to…

… .types file is wrong
dotnetCarpenter · May 11, 2015 · 3a13400 · 3a13400
1 parent 81d1820
commit 3a13400
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/lib/ecstatic.js b/lib/ecstatic.js
@@ -33,12 +33,8 @@ var ecstatic = module.exports = function (dir, options) {
 
   // Support hashes and .types files in mimeTypes @since 0.8
   if (opts.mimeTypes) {
-    if (opts.mimeTypes instanceof String) {
-      try {
-        mime.load(opts.mimeTypes);
-      } catch(e) { /* NOT SURE HOW TO TEST THIS - SEE COMMENT IN PR */
-        console.debug(e.message);
-      }
+    if (typeof opts.mimeTypes === 'string') {
+      mime.load( path.join(dir, opts.mimeTypes) );
     } else if (typeof opts.mimeTypes === 'object') {
       mime.define(opts.mimeTypes);
     }

diff --git a/test/content-type.js b/test/content-type.js
@@ -52,7 +52,7 @@ test('custom contentType', function(t) {
       t.ifError(err);
       t.equal(res.statusCode, 200);
       t.equal(res.headers['content-type'], 'application/xml; charset=utf-8');
-      teardown();
+      teardown(t);
     });
   });
 });
@@ -73,30 +73,20 @@ test('custom contentType via .types file', function(t) {
       t.ifError(err);
       t.equal(res.statusCode, 200);
       t.equal(res.headers['content-type'], 'application/xml; charset=utf-8');
-      teardown();
+      teardown(t);
     });
   });
 });
 
-/* NOT SURE HOW TO TEST THIS - SEE COMMENT IN PR
-test('warning when custom contentType .types file does not exist', function(t) {
-  var server = setup({
-    root: __dirname + '/public/',
-    'mime-types': 'this_file_does_not_exist.types'
-  });
-
-  t.plan(3);
+test('throws when custom contentType .types file does not exist', function(t) {
+  t.plan(1);
 
-  t.on('end', function() { server.close(); });
+  t.throws(
+    setup.bind(null, {
+      root: __dirname + '/public/',
+      'mime-types': 'this_file_does_not_exist.types'
+    })
+  );
 
-  server.listen(0, function() {
-    var port = server.address().port;
-    request.get('http://localhost:' + port + '/custom_mime_type.opml', function(err, res, body) {
-      t.ifError(err);
-      t.equal(res.statusCode, 200);
-      t.equal(res.headers['content-type'], 'application/xml; charset=utf-8');
-      teardown();
-    });
-  });
+  teardown(t);
 });
-*/