summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Yudin <pyudin@parallels.com>2015-03-27 14:27:16 +0300
committerPavel Yudin <pyudin@parallels.com>2015-03-27 14:27:16 +0300
commit500e10ad3d99e8aa495a6173d655a4cefa5b7bd8 (patch)
tree8391604f61a349c831c2d8704b7b35eb9f2601a5
parenteaa56e53be8d71665a5b9a828db54898b7b36fc8 (diff)
downloadchef-500e10ad3d99e8aa495a6173d655a4cefa5b7bd8.tar.gz
Behavior of default_action method changed.
-rw-r--r--lib/chef/resource/lwrp_base.rb2
-rw-r--r--spec/unit/lwrp_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb
index ce72e98028..0e0f11f43d 100644
--- a/lib/chef/resource/lwrp_base.rb
+++ b/lib/chef/resource/lwrp_base.rb
@@ -89,7 +89,7 @@ class Chef
else
action = action_name.to_sym
@actions.push(action) unless @actions.include?(action)
- @default_action = action
+ @default_action = [action]
end
end
diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb
index ec39174da6..6313b84fab 100644
--- a/spec/unit/lwrp_spec.rb
+++ b/spec/unit/lwrp_spec.rb
@@ -131,7 +131,7 @@ describe "LWRP" do
end
it "should set the specified action as the default action" do
- expect(Chef::Resource::LwrpFoo.new("blah").action).to eq(:pass_buck)
+ expect(Chef::Resource::LwrpFoo.new("blah").action).to eq([:pass_buck])
end
it "should create a method for each attribute" do
@@ -235,7 +235,7 @@ describe "LWRP" do
end
it "delegates #default_action to the parent" do
- expect(child.default_action).to eq(:eat)
+ expect(child.default_action).to eq([:eat])
end
end
@@ -252,7 +252,7 @@ describe "LWRP" do
end
it "does not delegate #default_action to the parent" do
- expect(child.default_action).to eq(:dont_eat)
+ expect(child.default_action).to eq([:dont_eat])
end
end