From fd2a1904f61c8dc1d47445833a91e365bd8ab708 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Tue, 15 Sep 2009 16:02:45 -0700 Subject: Fix for #2621 (JSON serialization of exec) Removed the array wrapping of values for JSON serialization, and the associated test. Signed-off-by: Markus Roberts --- lib/puppet/resource.rb | 1 - spec/unit/resource.rb | 6 ------ 2 files changed, 7 deletions(-) diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb index 134076580..3e27e0e00 100644 --- a/lib/puppet/resource.rb +++ b/lib/puppet/resource.rb @@ -55,7 +55,6 @@ class Puppet::Resource # Don't duplicate the title as the namevar next hash if param == namevar and value == title - value = [value] unless value.is_a?(Array) hash[param] = value hash end diff --git a/spec/unit/resource.rb b/spec/unit/resource.rb index 2205619c5..c233dd3f8 100755 --- a/spec/unit/resource.rb +++ b/spec/unit/resource.rb @@ -422,12 +422,6 @@ describe Puppet::Resource do result["foo"].should == %w{bar eh} result["fee"].should == %w{baz} end - - it "should set all parameter values as arrays" do - resource = Puppet::Resource.new("File", "/foo") - resource[:foo] = "bar" - JSON.parse(resource.to_json)["foo"].should == %w{bar} - end end describe "when converting from json" do -- cgit