From 6271cdb35da4c6a195ca9562d0a62bf6ea3da9f1 Mon Sep 17 00:00:00 2001
From: Jarrett Cruger <jcrugzz@gmail.com>
Date: Wed, 26 Nov 2014 12:49:50 -0500
Subject: [PATCH] Revert "fixing the tests"

This reverts commit f69e43a423b75ac765ce891b2132af74a8f34dbe.
---
 test/fixtures/hierarchy/user.json |  3 +--
 test/hierarchy-test.js            |  6 +++---
 test/nconf-test.js                | 16 +++++++---------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/test/fixtures/hierarchy/user.json b/test/fixtures/hierarchy/user.json
index ac5c090..45a3aac 100644
--- a/test/fixtures/hierarchy/user.json
+++ b/test/fixtures/hierarchy/user.json
@@ -1,5 +1,4 @@
 {
   "title": "My specific title",
-  "color": "green",
-  "weebls": "crap"
+  "color": "green"
 }
\ No newline at end of file
diff --git a/test/hierarchy-test.js b/test/hierarchy-test.js
index 59edcab..2c0ec12 100644
--- a/test/hierarchy-test.js
+++ b/test/hierarchy-test.js
@@ -20,8 +20,8 @@ vows.describe('nconf/hierarchy').addBatch({
   "When using nconf": {
     "configured with two file stores": {
       topic: function () {
-        nconf.add('global', { type: 'file', file: globalConfig });
         nconf.add('user', { type: 'file', file: userConfig });
+        nconf.add('global', { type: 'file', file: globalConfig });
         nconf.load();
         return nconf;
       },
@@ -98,12 +98,12 @@ vows.describe('nconf/hierarchy').addBatch({
         assert.deepEqual(JSON.parse(data), {
           apples: true,
           candy: {
-            something: 'file1',
+            something: 'foo',
             something1: true,
             something2: true,
             something5: {
               first: 1,
-              second: 2
+              second: 'bar'
             }
           }
         });
diff --git a/test/nconf-test.js b/test/nconf-test.js
index 091ea09..f0fce79 100644
--- a/test/nconf-test.js
+++ b/test/nconf-test.js
@@ -107,24 +107,22 @@ vows.describe('nconf').addBatch({
         "without a callback": {
           "should respond with the merged store": function () {
             assert.deepEqual(nconf.load(), {
-              title: 'My generic title',
-              color: 'red',
-              weebls: 'crap',
-              movie: 'Kill Bill'
+              title: 'My specific title', 
+              color: 'green',
+              movie: 'Kill Bill' 
             });
           }
         },
         "with a callback": {
           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) {
             assert.isNull(err);
             assert.deepEqual(store, {
-              title: 'My generic title',
-              color: 'red',
-              weebls: 'crap',
-              movie: 'Kill Bill'
+              title: 'My specific title', 
+              color: 'green',
+              movie: 'Kill Bill' 
             });
           }
         }