TheThing
/
nconf-lite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #82 from mfloryan/fileinfo 

Fileinfo
master
Charlie Robbins 2013-06-21 23:14:20 -07:00
parent 818526ca62 ada15db9e3
commit 62589145f3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nconf/stores/file.js
View File

@ -100,7 +100,7 @@ File.prototype.load = function (callback) {
self.store = self.format.parse(data.toString());
}
catch (ex) {
return callback(new Error("Error parsing your JSON configuration file."));
return callback(new Error("Error parsing your JSON configuration file: [" + self.file + '].'));
}
callback(null, self.store);
@ -129,7 +129,7 @@ File.prototype.loadSync = function () {
this.store = data;
}
catch (ex) {
throw new Error("Error parsing your JSON configuration file.")
throw new Error("Error parsing your JSON configuration file: [" + self.file + '].');
}
}

3
test/stores/file-store-test.js
View File

@ -42,8 +42,9 @@ vows.describe('nconf/stores/file').addBatch({
topic: function () {
this.store.load(this.callback.bind(null, null));
},
"should respond with an error": function (_, err) {
"should respond with an error and indicate file name": function (_, err) {
assert.isTrue(!!err);
assert.match(err, /malformed\.json/);
}
}
}