chef 15.17.4 → 16.0.257

data/spec/integration/recipes/lwrp_spec.rb

@@ -6,7 +6,7 @@ describe "LWRPs" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
+  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:

data/spec/integration/recipes/noop_resource_spec.rb

@@ -6,7 +6,7 @@ describe "Resources with a no-op provider" do
   context "with noop provider providing foo" do
     before(:each) do
       class NoOpFoo < Chef::Resource
-        resource_name "hi_there"
+        provides "hi_there"
         default_action :update
       end
       Chef::Provider::Noop.provides :hi_there

data/spec/integration/recipes/notifies_spec.rb

@@ -1,3 +1,19 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require "spec_helper"
 require "support/shared/integration/integration_helper"
 require "chef/mixin/shell_out"
@@ -6,7 +22,7 @@ describe "notifications" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
+  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 
   when_the_repository "notifies a nameless resource" do
@@ -16,11 +32,13 @@ describe "notifications" do
           apt_update do
             action :nothing
           end
-          log "foo" do
+          notify_group "foo" do
             notifies :nothing, 'apt_update', :delayed
+            action :run
           end
-          log "bar" do
+          notify_group "bar" do
             notifies :nothing, 'apt_update[]', :delayed
+            action :run
           end
         EOM
       end
@@ -35,7 +53,7 @@ describe "notifications" do
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # our delayed notification should run at the end of the parent run_context after the baz resource
-      expect(result.stdout).to match(/\* apt_update\[\] action nothing \(skipped due to action :nothing\)\s+\* log\[foo\] action write\s+\* log\[bar\] action write\s+\* apt_update\[\] action nothing \(skipped due to action :nothing\)/)
+      expect(result.stdout).to match(/\* apt_update\[\] action nothing \(skipped due to action :nothing\)\s+\* notify_group\[foo\] action run\s+\* notify_group\[bar\] action run\s+\* apt_update\[\] action nothing \(skipped due to action :nothing\)/)
       result.error!
     end
   end
@@ -50,8 +68,9 @@ describe "notifications" do
           resource_name :notifying_test
 
           action :run do
-            log "bar" do
+            notify_group "bar" do
               notifies :write, 'log[foo]', :delayed
+              action :run
             end
           end
         EOM
@@ -76,7 +95,7 @@ describe "notifications" do
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # our delayed notification should run at the end of the parent run_context after the baz resource
-      expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[bar\] action run\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
       result.error!
     end
   end
@@ -91,8 +110,9 @@ describe "notifications" do
           resource_name :notifying_test
 
           action :run do
-            log "bar" do
+            notify_group "bar" do
               notifies :write, 'log[foo]', :delayed
+              action :run
             end
           end
         EOM
@@ -102,8 +122,9 @@ describe "notifications" do
             action :nothing
           end
           notifying_test "whatever"
-          log "baz" do
+          notify_group "baz" do
             notifies :write, 'log[foo]', :delayed
+            action :run
           end
         EOM
 
@@ -119,7 +140,7 @@ describe "notifications" do
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # our delayed notification should run at the end of the parent run_context after the baz resource
-      expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[bar\] action run\s+\* notify_group\[baz\] action run\s+\* log\[foo\] action write/)
       # and only run once
       expect(result.stdout).not_to match(/\* log\[foo\] action write.*\* log\[foo\] action write/)
       result.error!
@@ -136,8 +157,9 @@ describe "notifications" do
           resource_name :notifying_test
 
           action :run do
-            log "bar" do
+            notify_group "bar" do
               notifies :write, 'log[foo]', :delayed
+              action :run
             end
           end
         EOM
@@ -146,9 +168,10 @@ describe "notifications" do
           log "foo" do
             action :nothing
           end
-          log "quux" do
+          notify_group "quux" do
             notifies :write, 'log[foo]', :delayed
             notifies :write, 'log[baz]', :delayed
+            action :run
           end
           notifying_test "whatever"
           log "baz"
@@ -166,7 +189,7 @@ describe "notifications" do
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # the delayed notification from the sub-resource is de-duplicated by the notification already in the parent run_context
-      expect(result.stdout).to match(/\* log\[quux\] action write\s+\* notifying_test\[whatever\] action run\s+\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[quux\] action run\s+\* notifying_test\[whatever\] action run\s+\* notify_group\[bar\] action run\s+\* log\[baz\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       # and only run once
       expect(result.stdout).not_to match(/\* log\[foo\] action write.*\* log\[foo\] action write/)
       result.error!
@@ -180,11 +203,13 @@ describe "notifications" do
           log "foo" do
             action :nothing
           end
-          log "bar" do
+          notify_group "bar" do
             notifies :write, 'log[foo]', :delayed
+            action :run
           end
-          log "baz" do
+          notify_group "baz" do
             notifies :write, 'log[foo]', :delayed
+            action :run
           end
         EOM
 
@@ -200,7 +225,7 @@ describe "notifications" do
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       # the delayed notification from the sub-resource is de-duplicated by the notification already in the parent run_context
-      expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[baz\] action write\s+\* log\[foo\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[bar\] action run\s+\* notify_group\[baz\] action run\s+\* log\[foo\] action write/)
       # and only run once
       expect(result.stdout).not_to match(/\* log\[foo\] action write.*\* log\[foo\] action write/)
       result.error!
@@ -217,8 +242,9 @@ describe "notifications" do
           resource_name :notifying_test
 
           action :run do
-            log "bar" do
+            notify_group "bar" do
               notifies :write, 'log[foo]', :immediately
+              action :run
             end
           end
         EOM
@@ -242,7 +268,7 @@ describe "notifications" do
       EOM
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
-      expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[bar\] action run\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
   end
@@ -257,8 +283,9 @@ describe "notifications" do
           resource_name :notifying_test
 
           action :run do
-            log "bar" do
+            notify_group "bar" do
               notifies :write, resources(log: "foo"), :immediately
+              action :run
             end
           end
         EOM
@@ -282,7 +309,7 @@ describe "notifications" do
       EOM
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
-      expect(result.stdout).to match(/\* log\[bar\] action write\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[bar\] action run\s+\* log\[foo\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
   end
@@ -297,8 +324,9 @@ describe "notifications" do
           resource_name :notifying_test
 
           action :run do
-            log "bar" do
+            notify_group "bar" do
               notifies :write, "log[foo]"
+              action :run
             end
           end
         EOM
@@ -372,8 +400,9 @@ describe "notifications" do
             action :nothing
           end
 
-          log "doit" do
+          notify_group "doit" do
             notifies :write, "log[a, b]"
+            action :run
           end
         EOM
       end

data/spec/integration/recipes/notifying_block_spec.rb

@@ -23,7 +23,7 @@ describe "notifying_block" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
+  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 
   when_the_repository "notifying_block test one" do
@@ -34,11 +34,13 @@ describe "notifying_block" do
             log "gamma" do
               action :nothing
             end
-            log "alpha" do
+            notify_group "alpha" do
               notifies :write, "log[gamma]", :delayed
+              action :run
             end
-            log "beta" do
+            notify_group "beta" do
               notifies :write, "log[gamma]", :delayed
+              action :run
             end
           end
           log "delta"
@@ -57,7 +59,7 @@ describe "notifying_block" do
     #  3. delayed notifications (to resources inside the subcontext) are run at the end of the subcontext
     it "should run alpha, beta, gamma, and delta in that order" do
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
-      expect(result.stdout).to match(/\* log\[alpha\] action write\s+\* log\[beta\] action write\s+\* log\[gamma\] action write\s+Converging 1 resources\s+\* log\[delta\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[alpha\] action run\s+\* notify_group\[beta\] action run\s+\* log\[gamma\] action write\s+Converging 1 resources\s+\* log\[delta\] action write/)
       result.error!
     end
   end
@@ -72,8 +74,9 @@ describe "notifying_block" do
 
           action :run do
             notifying_block do
-              log "foo" do
+              notify_group "foo" do
                 notifies :write, 'log[bar]', :delayed
+                action :run
               end
             end
           end
@@ -105,7 +108,7 @@ describe "notifying_block" do
     #  2. delayed notifications from a subcontext inside a resource will notify resources in their outer run_context
     it "should run foo, quux, bar, and baz in that order" do
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
-      expect(result.stdout).to match(/\* log\[foo\] action write\s+\* log\[quux\] action write\s+\* log\[bar\] action write\s+\* log\[baz\] action write/)
+      expect(result.stdout).to match(/\* notify_group\[foo\] action run\s+\* log\[quux\] action write\s+\* log\[bar\] action write\s+\* log\[baz\] action write/)
       result.error!
     end
   end

data/spec/integration/recipes/provider_choice.rb

@@ -16,6 +16,8 @@ describe "Recipe DSL methods" do
     context "And class Chef::Provider::ProviderThingy with no provides" do
       before :context do
         class Chef::Provider::ProviderThingy < Chef::Provider
+          provides :provider_thingy
+
           def load_current_resource; end
 
           def action_create

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -16,7 +16,7 @@ describe "Recipe DSL methods" do
     before(:each) do
 
       class BaseThingy < Chef::Resource
-        resource_name "base_thingy"
+        provides :base_thingy
         default_action :create
 
         class<<self
@@ -68,7 +68,6 @@ describe "Recipe DSL methods" do
     context "nameless resources" do
       before(:each) do
         class NamelessThingy < BaseThingy
-          resource_name :nameless_thingy
           provides :nameless_thingy
 
           property :name, String, default: ""
@@ -125,7 +124,7 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class AnotherNoNameThingy < BaseThingy
-            resource_name :another_thingy_name
+            provides :another_thingy_name
           end
 
         end
@@ -149,8 +148,8 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class AnotherNoNameThingy2 < BaseThingy
-            resource_name :another_thingy_name2
-            resource_name :another_thingy_name3
+            provides :another_thingy_name2
+            provides :another_thingy_name3
           end
 
         end
@@ -161,10 +160,12 @@ describe "Recipe DSL methods" do
           end.to raise_error(NoMethodError)
         end
 
-        it "another_thingy_name2 does not work" do
-          expect_converge do
+        it "another_thingy_name2 works" do
+          recipe = converge do
             another_thingy_name2("blah") {}
-          end.to raise_error(NoMethodError)
+          end
+          expect(recipe.logged_warnings).to eq ""
+          expect(BaseThingy.created_resource).to eq(AnotherNoNameThingy2)
         end
 
         it "yet_another_thingy_name3 works" do
@@ -181,7 +182,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class AnotherNoNameThingy3 < BaseThingy
-              resource_name :another_no_name_thingy_3
+              provides :another_no_name_thingy_3
               provides :another_no_name_thingy3, os: "blarghle"
             end
 
@@ -210,7 +211,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class AnotherNoNameThingy4 < BaseThingy
-              resource_name :another_no_name_thingy_4
+              provides :another_no_name_thingy_4
               provides :another_no_name_thingy4, os: "blarghle"
               provides :another_no_name_thingy4, platform_family: "foo"
             end
@@ -250,7 +251,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class AnotherNoNameThingy5 < BaseThingy
-              resource_name :another_thingy_name_for_another_no_name_thingy5
+              provides :another_thingy_name_for_another_no_name_thingy5
               provides :another_no_name_thingy5, os: "blarghle"
             end
 
@@ -288,7 +289,7 @@ describe "Recipe DSL methods" do
 
             class AnotherNoNameThingy6 < BaseThingy
               provides :another_no_name_thingy6, os: "blarghle"
-              resource_name :another_thingy_name_for_another_no_name_thingy6
+              provides :another_thingy_name_for_another_no_name_thingy6
             end
 
           end
@@ -324,18 +325,20 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class AnotherNoNameThingy7 < BaseThingy
-              resource_name :another_thingy_name_for_another_no_name_thingy7
+              provides :another_thingy_name_for_another_no_name_thingy7
               provides :another_thingy_name_for_another_no_name_thingy7, os: "blarghle"
             end
 
           end
 
-          it "and os = linux, another_thingy_name_for_another_no_name_thingy7 does not work" do
-            expect_converge do
+          it "and os = linux, another_thingy_name_for_another_no_name_thingy7 works" do
+            recipe = converge do
               # this is an ugly way to test, make Cheffish expose node attrs
               run_context.node.automatic[:os] = "linux"
               another_thingy_name_for_another_no_name_thingy7("blah") {}
-            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
+            end
+            expect(recipe.logged_warnings).to eq ""
+            expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy7)
           end
 
           it "and os = blarghle, another_thingy_name_for_another_no_name_thingy7 works" do
@@ -357,43 +360,6 @@ describe "Recipe DSL methods" do
           end
         end
 
-        # opposite order from the previous test (provides, then resource_name)
-        context "with a resource named AnotherNoNameThingy8, a provides with a new resource name, and resource_name with that new resource name" do
-          before(:each) do
-
-            class AnotherNoNameThingy8 < BaseThingy
-              provides :another_thingy_name_for_another_no_name_thingy8, os: "blarghle"
-              resource_name :another_thingy_name_for_another_no_name_thingy8
-            end
-
-          end
-
-          it "and os = linux, another_thingy_name_for_another_no_name_thingy8 does not work" do
-            expect_converge do
-              # this is an ugly way to test, make Cheffish expose node attrs
-              run_context.node.automatic[:os] = "linux"
-              another_thingy_name_for_another_no_name_thingy8("blah") {}
-            end.to raise_error(Chef::Exceptions::NoSuchResourceType)
-          end
-
-          it "and os = blarghle, another_thingy_name_for_another_no_name_thingy8 works" do
-            recipe = converge do
-              # this is an ugly way to test, make Cheffish expose node attrs
-              run_context.node.automatic[:os] = "blarghle"
-              another_thingy_name_for_another_no_name_thingy8("blah") {}
-            end
-            expect(recipe.logged_warnings).to eq ""
-            expect(BaseThingy.created_resource).to eq (AnotherNoNameThingy8)
-          end
-
-          it "the old resource name does not work" do
-            expect_converge do
-              # this is an ugly way to test, make Cheffish expose node attrs
-              run_context.node.automatic[:os] = "linux"
-              another_thingy_name8("blah") {}
-            end.to raise_error(NoMethodError)
-          end
-        end
       end
     end
 
@@ -402,7 +368,7 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class RecipeDSLSpecNamespace::MySupplier < BaseThingy
-            resource_name :hemlock
+            provides :hemlock
           end
 
         end
@@ -425,7 +391,7 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class RecipeDSLSpecNamespace::Thingy3 < BaseThingy
-            resource_name :thingy3
+            provides :thingy3
           end
 
         end
@@ -441,7 +407,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
-              resource_name :thingy3
+              provides :thingy3
             end
 
           end
@@ -469,7 +435,7 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class RecipeDSLSpecNamespace::Thingy5 < BaseThingy
-            resource_name :thingy5
+            provides :thingy5
             provides :thingy5reverse
             provides :thingy5_2
             provides :thingy5_2reverse
@@ -488,7 +454,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class RecipeDSLSpecNamespace::Thingy6 < BaseThingy
-              resource_name :thingy6
+              provides :thingy6
               provides :thingy5
             end
 
@@ -509,14 +475,14 @@ describe "Recipe DSL methods" do
           end
 
           it "resource_matching_short_name returns Thingy6" do
-            expect(Chef::Resource.resource_matching_short_name(:thingy5)).to eq RecipeDSLSpecNamespace::Thingy5
+            expect(Chef::Resource.resource_matching_short_name(:thingy5)).to eq RecipeDSLSpecNamespace::Thingy6
           end
 
           context "and AThingy5 provides :thingy5reverse" do
             before(:each) do
 
               class RecipeDSLSpecNamespace::AThingy5 < BaseThingy
-                resource_name :thingy5reverse
+                provides :thingy5reverse
               end
 
             end
@@ -534,7 +500,7 @@ describe "Recipe DSL methods" do
 
               module ZRecipeDSLSpecNamespace
                 class Thingy5 < BaseThingy
-                  resource_name :thingy5_2
+                  provides :thingy5_2
                 end
               end
 
@@ -553,7 +519,7 @@ describe "Recipe DSL methods" do
 
               module ARecipeDSLSpecNamespace
                 class Thingy5 < BaseThingy
-                  resource_name :thingy5_2reverse
+                  provides :thingy5_2reverse
                 end
               end
 
@@ -572,7 +538,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class RecipeDSLSpecNamespace::Thingy3 < BaseThingy
-              resource_name :thingy3
+              provides :thingy3
             end
 
           end
@@ -588,7 +554,7 @@ describe "Recipe DSL methods" do
             before(:each) do
 
               class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
-                resource_name :thingy3
+                provides :thingy3
               end
 
             end
@@ -615,7 +581,7 @@ describe "Recipe DSL methods" do
             before(:each) do
 
               class RecipeDSLSpecNamespace::Thingy4 < BaseThingy
-                resource_name :thingy3
+                provides :thingy3
               end
 
             end
@@ -645,7 +611,7 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class RecipeDSLSpecNamespace::Thingy7 < BaseThingy
-            resource_name :thingy7
+            provides :thingy7
             provides :thingy8
           end
 
@@ -655,7 +621,7 @@ describe "Recipe DSL methods" do
           before(:each) do
 
             class RecipeDSLSpecNamespace::Thingy8 < BaseThingy
-              resource_name :thingy8
+              provides :thingy8
             end
 
           end
@@ -684,7 +650,7 @@ describe "Recipe DSL methods" do
         before(:each) do
 
           class RecipeDSLSpecNamespace::Thingy12 < BaseThingy
-            resource_name :thingy12
+            provides :thingy12
             provides :twizzle
             provides :twizzle2
           end
@@ -716,12 +682,12 @@ describe "Recipe DSL methods" do
       context "with platform-specific resources 'my_super_thingy_foo' and 'my_super_thingy_bar'" do
         before(:each) do
           class MySuperThingyFoo < BaseThingy
-            resource_name :my_super_thingy_foo
+            provides :my_super_thingy_foo
             provides :my_super_thingy, platform: "foo"
           end
 
           class MySuperThingyBar < BaseThingy
-            resource_name :my_super_thingy_bar
+            provides :my_super_thingy_bar
             provides :my_super_thingy, platform: "bar"
           end
         end
@@ -762,7 +728,7 @@ describe "Recipe DSL methods" do
       context "when Thingy10 provides :thingy10" do
         before(:each) do
           class RecipeDSLSpecNamespace::Thingy10 < BaseThingy
-            resource_name :thingy10
+            provides :thingy10
           end
         end
 
@@ -777,7 +743,7 @@ describe "Recipe DSL methods" do
       context "when Thingy11 provides :thingy11" do
         before(:each) do
           class RecipeDSLSpecNamespace::Thingy11 < BaseThingy
-            resource_name :thingy10
+            provides :thingy10
           end
         end
 
@@ -802,7 +768,7 @@ describe "Recipe DSL methods" do
 
           def self.inspect; name.inspect; end
         end
-        result.resource_name two_classes_one_dsl
+        result.provides two_classes_one_dsl
         result
       end
       before { resource_class } # pull on it so it gets defined before the recipe runs
@@ -818,7 +784,7 @@ describe "Recipe DSL methods" do
 
             def self.inspect; name.inspect; end
           end
-          result.resource_name two_classes_one_dsl
+          result.provides two_classes_one_dsl
           result
         end
         before { resource_class_a } # pull on it so it gets defined before the recipe runs
@@ -848,7 +814,7 @@ describe "Recipe DSL methods" do
 
             def self.inspect; name.inspect; end
           end
-          result.resource_name two_classes_one_dsl
+          result.provides two_classes_one_dsl
           result
         end
         before { resource_class_z } # pull on it so it gets defined before the recipe runs
@@ -883,25 +849,6 @@ describe "Recipe DSL methods" do
           it "resource_matching_short_name returns Z" do
             expect(Chef::Resource.resource_matching_short_name(two_classes_one_dsl)).to eq resource_class_z
           end
-
-          context "when Z provides(:two_classes_one_dsl) { false }" do
-            before do
-              resource_class_z.provides(two_classes_one_dsl) { false }
-            end
-
-            it "two_classes_one_dsl resolves to B (picks the next thing in the priority array)" do
-              temp_two_classes_one_dsl = two_classes_one_dsl
-              recipe = converge do
-                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
-              end
-              expect(recipe.logged_warnings).to eq ""
-              expect(BaseThingy.created_resource).to eq resource_class
-            end
-
-            it "resource_matching_short_name returns B" do
-              expect(Chef::Resource.resource_matching_short_name(two_classes_one_dsl)).to eq resource_class
-            end
-          end
         end
 
         context "and priority arrays [ B ] and [ Z ]" do
@@ -922,52 +869,7 @@ describe "Recipe DSL methods" do
           it "resource_matching_short_name returns Z" do
             expect(Chef::Resource.resource_matching_short_name(two_classes_one_dsl)).to eq resource_class_z
           end
-
-          context "when Z provides(:two_classes_one_dsl) { false }" do
-            before do
-              resource_class_z.provides(two_classes_one_dsl) { false }
-            end
-
-            it "two_classes_one_dsl resolves to B (picks the first match from the other priority array)" do
-              temp_two_classes_one_dsl = two_classes_one_dsl
-              recipe = converge do
-                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
-              end
-              expect(recipe.logged_warnings).to eq ""
-              expect(BaseThingy.created_resource).to eq resource_class
-            end
-
-            it "resource_matching_short_name returns B" do
-              expect(Chef::Resource.resource_matching_short_name(two_classes_one_dsl)).to eq resource_class
-            end
-          end
         end
-
-        context "and a priority array [ Z ]" do
-          before do
-            Chef.set_resource_priority_array(two_classes_one_dsl, [ resource_class_z ])
-          end
-
-          context "when Z provides(:two_classes_one_dsl) { false }" do
-            before do
-              resource_class_z.provides(two_classes_one_dsl) { false }
-            end
-
-            it "two_classes_one_dsl resolves to B (picks the first match outside the priority array)" do
-              temp_two_classes_one_dsl = two_classes_one_dsl
-              recipe = converge do
-                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
-              end
-              expect(recipe.logged_warnings).to eq ""
-              expect(BaseThingy.created_resource).to eq resource_class
-            end
-
-            it "resource_matching_short_name returns B" do
-              expect(Chef::Resource.resource_matching_short_name(two_classes_one_dsl)).to eq resource_class
-            end
-          end
-        end
-
       end
 
       context "and a provider named 'B' which provides :two_classes_one_dsl" do
@@ -1114,7 +1016,7 @@ describe "Recipe DSL methods" do
 
             def self.inspect; name.inspect; end
           end
-          result.resource_name two_classes_one_dsl
+          result.provides two_classes_one_dsl
           result.provides two_classes_one_dsl, os: "blarghle"
           result
         end
@@ -1139,7 +1041,7 @@ describe "Recipe DSL methods" do
             instance_eval("#{temp_two_classes_one_dsl} 'blah' do; end")
           end
           expect(recipe.logged_warnings).to eq ""
-          expect(BaseThingy.created_resource).to eq resource_class
+          expect(BaseThingy.created_resource).to eq resource_class_blarghle
         end
       end
     end
@@ -1161,7 +1063,7 @@ describe "Recipe DSL methods" do
 
       context "with resource_name :my_resource" do
         before do
-          resource_class.resource_name my_resource
+          resource_class.provides my_resource
         end
 
         context "with provides? returning true to my_resource" do
@@ -1312,14 +1214,14 @@ describe "Recipe DSL methods" do
     context "with UTF-8 provides" do
       before(:each) do
         class UTF8Thingy < BaseThingy
-          resource_name :Straße
+          provides :Straße
           provides :Straße
         end
       end
 
       it "utf-8 dsl names work" do
         recipe = converge do
-          Straße("blah") {} # rubocop: disable Naming/AsciiIdentifiers
+          Straße("blah") {}
         end
         expect(recipe.logged_warnings).to eq ""
         expect(BaseThingy.created_resource).to eq(UTF8Thingy)