summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-07-02 16:30:14 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2015-07-02 16:30:22 -0700
commitfb97f2390d311d3c0726d1258118bd550141627f (patch)
tree29f4db70d385b8e04260a2f5bf1a15a8849108f0
parented2b0904361448173e5644dddacb48399fd8dc68 (diff)
downloadchef-jdm/no-freeze-default.tar.gz
Revert "Freeze default constants"jdm/no-freeze-default
This reverts commit 705e22b975196baa6decf23f9c3a7e676d6aefc4. I'd like to revert this change because it breaks the packagecloud cookbook. See https://gist.github.com/cwebberOps/ae002be2339ca843cbb3
-rw-r--r--lib/chef/mixin/params_validate.rb1
-rw-r--r--spec/unit/property_spec.rb8
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index 4ab016249f..84dcfcef13 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -317,7 +317,6 @@ class Chef
def _pv_default(opts, key, default_value)
value = _pv_opts_lookup(opts, key)
if value.nil?
- default_value = default_value.freeze if !default_value.is_a?(DelayedEvaluator)
opts[key] = default_value
end
end
diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb
index ce0552c564..bce2b0b51b 100644
--- a/spec/unit/property_spec.rb
+++ b/spec/unit/property_spec.rb
@@ -367,14 +367,10 @@ describe "Chef::Resource.property" do
expect(resource.x.object_id).to eq(value.object_id)
end
it "Multiple instances of x receive the exact same value" do
+ # TODO this isn't really great behavior, but it's noted here so we find out
+ # if it changed.
expect(resource.x.object_id).to eq(resource_class.new('blah2').x.object_id)
end
- it "The default value is frozen" do
- expect(resource.x).to be_frozen
- end
- it "The default value cannot be written to" do
- expect { resource.x[:a] = 1 }.to raise_error RuntimeError, /frozen/
- end
end
with_property ':x, default: lazy { {} }' do