summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-06-23 15:27:11 -0700
committerJohn Keiser <john@johnkeiser.com>2015-06-23 15:33:31 -0700
commit4f55ea5d8e4b1a684163028b0df80b8d86851adf (patch)
treea55e57a7bfd1f7391e801b7f821f597b5ad6d284
parent705e22b975196baa6decf23f9c3a7e676d6aefc4 (diff)
downloadchef-4f55ea5d8e4b1a684163028b0df80b8d86851adf.tar.gz
Do not validate defaults, for backcompat purposesjk/property-base
-rw-r--r--lib/chef/mixin/params_validate.rb3
-rw-r--r--spec/unit/property_spec.rb57
2 files changed, 39 insertions, 21 deletions
diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index c1a792b235..f7d52a19cf 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -147,7 +147,8 @@ class Chef
# Coerce and validate the default value
_pv_required(opts, symbol, required, explicitly_allows_nil?(symbol, validation)) if required
_pv_coerce(opts, symbol, coerce) if coerce
- validate(opts, { symbol => validation })
+ # We presently do not validate defaults, for backwards compatibility.
+# validate(opts, { symbol => validation })
# Defaults are presently "stickily" set on the instance
self.instance_variable_set(iv_symbol, opts[symbol])
diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb
index 326948713b..ce0552c564 100644
--- a/spec/unit/property_spec.rb
+++ b/spec/unit/property_spec.rb
@@ -281,9 +281,9 @@ describe "Chef::Resource.property" do
resource.x lazy { 10 }
expect(resource.property_is_set?(:x)).to be_truthy
end
- it "when x is retrieved, property_is_set?(:x) is false" do
+ it "when x is retrieved, property_is_set?(:x) is true" do
resource.x
- expect(resource.property_is_set?(:x)).to be_falsey
+ expect(resource.property_is_set?(:x)).to be_truthy
end
end
@@ -436,9 +436,12 @@ describe "Chef::Resource.property" do
expect(resource.x 'hi').to eq 'hi'
expect(resource.x).to eq 'hi'
end
- it "when x is retrieved, a validation error is raised" do
- expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ it "when x is retrieved, no validation error is raised" do
+ expect(resource.x).to eq 10
end
+ # it "when x is retrieved, a validation error is raised" do
+ # expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ # end
end
with_property ":x, String, default: lazy { Namer.next_index }" do
@@ -449,19 +452,27 @@ describe "Chef::Resource.property" do
expect(resource.x 'hi').to eq 'hi'
expect(resource.x).to eq 'hi'
end
- it "when x is retrieved, a validation error is raised" do
- expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ it "when x is retrieved, no validation error is raised" do
+ expect(resource.x).to eq 1
expect(Namer.current_index).to eq 1
end
+ # it "when x is retrieved, a validation error is raised" do
+ # expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ # expect(Namer.current_index).to eq 1
+ # end
end
with_property ":x, default: lazy { Namer.next_index }, is: proc { |v| Namer.next_index; true }" do
- it "validation is only run the first time" do
+ it "validation is not run at all on the default value" do
expect(resource.x).to eq 1
- expect(Namer.current_index).to eq 2
- expect(resource.x).to eq 1
- expect(Namer.current_index).to eq 2
+ expect(Namer.current_index).to eq 1
end
+ # it "validation is only run the first time" do
+ # expect(resource.x).to eq 1
+ # expect(Namer.current_index).to eq 2
+ # expect(resource.x).to eq 1
+ # expect(Namer.current_index).to eq 2
+ # end
end
end
@@ -496,12 +507,12 @@ describe "Chef::Resource.property" do
end
with_property ':x, proc { |v| Namer.next_index; true }, coerce: proc { |v| "#{v}#{next_index}" }, default: lazy { 10 }' do
- it "coercion is only run the first time x is retrieved" do
+ it "coercion is only run the first time x is retrieved, and validation is not run" do
expect(Namer.current_index).to eq 0
expect(resource.x).to eq '101'
- expect(Namer.current_index).to eq 2
+ expect(Namer.current_index).to eq 1
expect(resource.x).to eq '101'
- expect(Namer.current_index).to eq 2
+ expect(Namer.current_index).to eq 1
end
end
@@ -512,9 +523,12 @@ describe "Chef::Resource.property" do
end
end
with_property ':x, Integer, coerce: proc { |v| "#{v}#{next_index}" }, default: 10' do
- it "when x is retrieved, it is coerced before validating and fails" do
- expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ it "when x is retrieved, it is coerced and not validated" do
+ expect(resource.x).to eq '101'
end
+ # it "when x is retrieved, it is coerced before validating and fails" do
+ # expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ # end
end
with_property ':x, String, coerce: proc { |v| "#{v}#{next_index}" }, default: lazy { 10 }' do
it "when x is retrieved, it is coerced before validating and passes" do
@@ -522,17 +536,20 @@ describe "Chef::Resource.property" do
end
end
with_property ':x, Integer, coerce: proc { |v| "#{v}#{next_index}" }, default: lazy { 10 }' do
- it "when x is retrieved, it is coerced before validating and fails" do
- expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ it "when x is retrieved, it is coerced and not validated" do
+ expect(resource.x).to eq '101'
end
+ # it "when x is retrieved, it is coerced before validating and fails" do
+ # expect { resource.x }.to raise_error Chef::Exceptions::ValidationFailed
+ # end
end
with_property ':x, proc { |v| Namer.next_index; true }, coerce: proc { |v| "#{v}#{next_index}" }, default: lazy { 10 }' do
- it "coercion and validation is only run the first time x is retrieved" do
+ it "coercion is only run the first time x is retrieved, and validation is not run" do
expect(Namer.current_index).to eq 0
expect(resource.x).to eq '101'
- expect(Namer.current_index).to eq 2
+ expect(Namer.current_index).to eq 1
expect(resource.x).to eq '101'
- expect(Namer.current_index).to eq 2
+ expect(Namer.current_index).to eq 1
end
end
end