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

Revert "fixing the tests" 

This reverts commit f69e43a423.
master
Jarrett Cruger 2014-11-26 12:49:50 -05:00
parent f0d5b6eb30
commit 6271cdb35d
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/fixtures/hierarchy/user.json vendored
View File

@ -1,5 +1,4 @@
{ {
"title": "My specific title", "title": "My specific title",
"color": "green", "color": "green"
"weebls": "crap"
} }

6
test/hierarchy-test.js
View File

@ -20,8 +20,8 @@ vows.describe('nconf/hierarchy').addBatch({
"When using nconf": { "When using nconf": {
"configured with two file stores": { "configured with two file stores": {
topic: function () { topic: function () {
nconf.add('global', { type: 'file', file: globalConfig });
nconf.add('user', { type: 'file', file: userConfig }); nconf.add('user', { type: 'file', file: userConfig });
nconf.add('global', { type: 'file', file: globalConfig });
nconf.load(); nconf.load();
return nconf; return nconf;
}, },
@ -98,12 +98,12 @@ vows.describe('nconf/hierarchy').addBatch({
assert.deepEqual(JSON.parse(data), { assert.deepEqual(JSON.parse(data), {
apples: true, apples: true,
candy: { candy: {
something: 'file1', something: 'foo',
something1: true, something1: true,
something2: true, something2: true,
something5: { something5: {
first: 1, first: 1,
second: 2 second: 'bar'
} }
} }
}); });

16
test/nconf-test.js
View File

@ -107,24 +107,22 @@ vows.describe('nconf').addBatch({
"without a callback": { "without a callback": {
"should respond with the merged store": function () { "should respond with the merged store": function () {
assert.deepEqual(nconf.load(), { assert.deepEqual(nconf.load(), {
title: 'My generic title', title: 'My specific title',
color: 'red', color: 'green',
weebls: 'crap', movie: 'Kill Bill'
movie: 'Kill Bill'
}); });
} }
}, },
"with a callback": { "with a callback": {
topic: function () { topic: function () {
nconf.load(this.callback.bind(null, null)); nconf.load(this.callback.bind(null, null));
}, },
"should respond with the merged store": function (ign, err, store) { "should respond with the merged store": function (ign, err, store) {
assert.isNull(err); assert.isNull(err);
assert.deepEqual(store, { assert.deepEqual(store, {
title: 'My generic title', title: 'My specific title',
color: 'red', color: 'green',
weebls: 'crap', movie: 'Kill Bill'
movie: 'Kill Bill'
}); });
} }
} }