summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-06-01 08:36:16 -0700
committerJohn Keiser <john@johnkeiser.com>2015-06-23 14:42:27 -0700
commitbddc2e44470a3df99fe63b76a0ccc12c47e5fed1 (patch)
treeca87839d1c2df1e6115a5b0b575e7ec841b6ed3b
parente8a80c674bfb67b6839eb8498a73da61d0e9cdc0 (diff)
downloadchef-bddc2e44470a3df99fe63b76a0ccc12c47e5fed1.tar.gz
Update resource_name in resource action tests
-rw-r--r--spec/integration/recipes/recipe_dsl_spec.rb1
-rw-r--r--spec/integration/recipes/resource_action_spec.rb9
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/integration/recipes/recipe_dsl_spec.rb b/spec/integration/recipes/recipe_dsl_spec.rb
index 486b24986f..6bbb9a5c4c 100644
--- a/spec/integration/recipes/recipe_dsl_spec.rb
+++ b/spec/integration/recipes/recipe_dsl_spec.rb
@@ -56,7 +56,6 @@ describe "Recipe DSL methods" do
before(:context) {
class Chef::Resource::BackcompatThingy < Chef::Resource
- resource_name 'backcompat_thingy'
default_action :create
end
class Chef::Provider::BackcompatThingy < Chef::Provider
diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb
index 8e8071abbc..ca37a13ea3 100644
--- a/spec/integration/recipes/resource_action_spec.rb
+++ b/spec/integration/recipes/resource_action_spec.rb
@@ -130,7 +130,7 @@ describe "Resource.action" do
context "With resource 'action_jackson'" do
before(:context) {
class ActionJackson < Chef::Resource
- provides :action_jackson
+ use_automatic_resource_name
def foo(value=nil)
@foo = value if value
@foo
@@ -211,7 +211,7 @@ describe "Resource.action" do
context "And 'action_jackgrandson' inheriting from ActionJackson and changing nothing" do
before(:context) {
class ActionJackgrandson < ActionJackson
- provides :action_jackgrandson
+ use_automatic_resource_name
end
}
@@ -223,7 +223,7 @@ describe "Resource.action" do
context "And 'action_jackalope' inheriting from ActionJackson with an extra attribute and action" do
before(:context) {
class ActionJackalope < ActionJackson
- provides :action_jackalope
+ use_automatic_resource_name
def foo(value=nil)
@foo = "#{value}alope" if value
@@ -314,7 +314,8 @@ describe "Resource.action" do
context "With a resource with no actions" do
before(:context) {
class NoActionJackson < Chef::Resource
- provides :no_action_jackson
+ use_automatic_resource_name
+
def foo(value=nil)
@foo = value if value
@foo