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

fix: env.match test

Browse source 
The previous test was expecting the .match value to be a function rather than a regexp which is what the README shows. So I've fixed the code to match against a real regexp, and test if the stringified version of the regexp function is [object RegExp].

I've also updated the tests to prime the process.env with values that are specifically tested for to ensure it's correctly loading the env values.

Fixex indexzero/nconf#178
This commit is contained in:
Remy Sharp 2015-08-04 17:54:59 +01:00 committed by indexzero
parent 372521b124
commit 3c11ef50e5
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/nconf/stores/env.js
View file

@ -24,7 +24,7 @@ var Env = exports.Env = function (options) {
this.whitelist = options.whitelist || []; this.whitelist = options.whitelist || [];
this.separator = options.separator || ''; this.separator = options.separator || '';
if (typeof options.match === 'function' if (({}).toString.call(options.match) === '[object RegExp]'
&& typeof options !== 'string') { && typeof options !== 'string') {
this.match = options.match; this.match = options.match;
} }

15
test/complete-test.js
View file

@ -16,12 +16,23 @@ var fs = require('fs'),
var completeTest = helpers.fixture('complete-test.json'), var completeTest = helpers.fixture('complete-test.json'),
complete = helpers.fixture('complete.json'); complete = helpers.fixture('complete.json');
// prime the process.env
process.env['NCONF_foo'] = 'bar';
process.env.FOO = 'bar';
process.env.BAR = 'zalgo';
process.env.NODE_ENV = 'debug';
process.env.FOOBAR = 'should not load';
vows.describe('nconf/multiple-stores').addBatch({ vows.describe('nconf/multiple-stores').addBatch({
"When using the nconf with multiple providers": { "When using the nconf with multiple providers": {
topic: function () { topic: function () {
var that = this; var that = this;
helpers.cp(complete, completeTest, function () { helpers.cp(complete, completeTest, function () {
nconf.env(); nconf.env({
// separator: '__',
match: /^NCONF_/,
whitelist: ['NODE_ENV', 'FOO', 'BAR']
});
nconf.file({ file: completeTest }); nconf.file({ file: completeTest });
nconf.use('argv', { type: 'literal', store: data }); nconf.use('argv', { type: 'literal', store: data });
that.callback(); that.callback();
@ -34,7 +45,7 @@ vows.describe('nconf/multiple-stores').addBatch({
}, },
"env vars": { "env vars": {
"are present": function () { "are present": function () {
Object.keys(process.env).forEach(function (key) { ['NODE_ENV', 'FOO', 'BAR', 'NCONF_foo'].forEach(function (key) {
assert.equal(nconf.get(key), process.env[key]); assert.equal(nconf.get(key), process.env[key]);
}); });
} }