added one more rspec test

Signed-off-by: Jeremy J. Miller <jm@chef.io>

2 files changed, 13 insertions, 6 deletions

diff --git a/lib/chef/chef_fs/data_handler/data_handler_base.rb b/lib/chef/chef_fs/data_handler/data_handler_base.rb
index 9fdc5579f2..c3cbb96ecc 100644
--- a/lib/chef/chef_fs/data_handler/data_handler_base.rb
+++ b/lib/chef/chef_fs/data_handler/data_handler_base.rb
@@ -63,8 +63,8 @@ class Chef
         def normalize_hash(object, defaults)
           # Make a normalized result in the specified order for diffing
           result = {}
-          defaults.each_pair do |key, default|
-            result[key] = object.is_a?(Hash) && object.key?(key) ? object[key] : default
+          defaults.each_pair do |key, value|
+            result[key] = object.is_a?(Hash) && object.key?(key) ? object[key] : value
           end
           if object.is_a?(Hash)
             object.each_pair do |key, value|
diff --git a/spec/unit/chef_fs/data_handler/data_handler_base_spec.rb b/spec/unit/chef_fs/data_handler/data_handler_base_spec.rb
index 2df468aca5..8f300b1dd0 100644
--- a/spec/unit/chef_fs/data_handler/data_handler_base_spec.rb
+++ b/spec/unit/chef_fs/data_handler/data_handler_base_spec.rb
@@ -24,14 +24,16 @@ describe Chef::ChefFS::DataHandler::DataHandlerBase do
     let(:some_item) do
       { "name" => "grizzly",
         "gender" => "female",
-        "age" => 3
+        "age" => 3,
+        "food" => "honey"
       }
     end
 
     let(:item_defaults) do
       { "family" => "ursidae",
         "hibernate" => true,
-        "avg_lifespan_years" => 22,
+        "food" => "berries",
+        "avg_lifespan_years" => 22
       }
     end
 
@@ -41,16 +43,21 @@ describe Chef::ChefFS::DataHandler::DataHandlerBase do
         "family" => "ursidae",
         "hibernate" => true,
         "avg_lifespan_years" => 22,
-        "age" => 3
+        "age" => 3,
+        "food" => "honey"
       }
     end
 
     let(:handler) { described_class.new }
 
-    it "normalizes the Hash, filling in defaults" do
+    it "normalizes the Hash, filling in default values" do
       expect(handler.normalize_hash(some_item, item_defaults)).to eq(normalized)
     end
 
+    it "prefers already existing values over default values" do
+      expect(handler.normalize_hash(some_item, item_defaults)['food']).to eq("honey")
+    end
+
     it "handles being passed a nil value instead of Hash" do
       expect(handler.normalize_hash(nil, item_defaults)).to eq(item_defaults)
     end