From 5d2ebfbe9ffbf3e7134a3870e4a0a6a64ee99bd8 Mon Sep 17 00:00:00 2001 From: Michael Schoonmaker Date: Thu, 20 Dec 2012 19:02:36 -0800 Subject: [PATCH] Added test to confirm merging an Object and null behaves as expected. --- test/fixtures/merge/file1.json | 3 +++ test/fixtures/merge/file2.json | 5 +++-- test/provider-test.js | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/fixtures/merge/file1.json b/test/fixtures/merge/file1.json index b48f5c0..f9e1ca9 100644 --- a/test/fixtures/merge/file1.json +++ b/test/fixtures/merge/file1.json @@ -12,5 +12,8 @@ "first": 1, "second": 2 } + }, + "unicorn": { + "exists": true } } diff --git a/test/fixtures/merge/file2.json b/test/fixtures/merge/file2.json index 815779c..7940cb9 100644 --- a/test/fixtures/merge/file2.json +++ b/test/fixtures/merge/file2.json @@ -5,5 +5,6 @@ "something4": true }, "dates": true, - "elderberries": true -} \ No newline at end of file + "elderberries": true, + "unicorn": null +} diff --git a/test/provider-test.js b/test/provider-test.js index 78ee97d..0805369 100644 --- a/test/provider-test.js +++ b/test/provider-test.js @@ -84,6 +84,11 @@ vows.describe('nconf/provider').addBatch({ provider.merge(override); helpers.assertMerged(null, provider.stores.file.store); assert.equal(provider.stores.file.store.candy.something, 'file1'); + }, + "should merge Objects over null": function (provider) { + provider.load(); + provider.merge(override); + assert.equal(provider.stores.file.store.unicorn.exists, true); } } }