summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-06-29 10:17:10 -0700
committerNoah Kantrowitz <noah@coderanger.net>2015-06-29 10:51:59 -0700
commitb45894a439bcff3a49af2bf5e817cbe662a0329a (patch)
treed7f00ba9294219f38fa858dd780a1bb373bff0b1
parent0f6d0066b96e09e69106e106e690ec3c8b33ce17 (diff)
downloadchef-b45894a439bcff3a49af2bf5e817cbe662a0329a.tar.gz
Get tests passing
-rw-r--r--lib/chef/resource.rb2
-rw-r--r--spec/integration/recipes/resource_action_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 0679406175..0240554b3d 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -1157,7 +1157,7 @@ class Chef
action = action.to_sym
new_action_provider_class.action(action, &recipe_block)
self.allowed_actions += [ action ]
- default_action action if default_action == :nothing
+ default_action action if default_action == [:nothing]
end
#
diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb
index 4786294803..cee79133a9 100644
--- a/spec/integration/recipes/resource_action_spec.rb
+++ b/spec/integration/recipes/resource_action_spec.rb
@@ -337,7 +337,7 @@ describe "Resource.action" do
NoActionJackson.action_was = action
end
}
- expect(NoActionJackson.action_was).to eq :nothing
+ expect(NoActionJackson.action_was).to eq [:nothing]
end
end
end