Merge pull request #149 from acruikshank/master

better error handling for broken database.json files

Author: kunklejr

lib/config.js

@@ -14,6 +14,11 @@ exports.load = function(fileName, currentEnv) {
   try {
     config = require(fileName);
   } catch(e) {
+    // distinguish broken files from missing ones
+    if (e instanceof SyntaxError){
+      throw e;
+    }
+
     config = require(path.join(process.cwd(), fileName));
   }
 

test/config_test.js

@@ -37,6 +37,25 @@ vows.describe('config').addBatch({
       assert.equal(current.settings.driver, 'sqlite3');
       assert.equal(current.settings.filename, ':memory:');
     }
+  },
+}).addBatch({
+  'loading from a broken config file': {
+    topic: function() {
+      var configPath = path.join(__dirname, 'database.notjson');
+      config.load = _configLoad;
+      config.loadUrl = _configLoadUrl;
+      try {
+        config.load(configPath, 'dev');
+      } catch (e) {
+        return e;
+      }
+      return;
+    },
+
+    'should throw a syntax error': function (error) {
+      assert.isDefined(error);
+      assert.ok(error instanceof SyntaxError, "Expected broken file to produce syntax error");
+    }
   }
 }).addBatch({
   'loading from a file with ENV vars': {

test/database.notjson

@@ -0,0 +1 @@
+{this:'is' not:'valid' json}