Make use_inline_resources a no-op to allow for easier support of 12 and 13 in a single cookbook codebase.

The test is left in pending mode so it will automatically remind us by failing in six months.

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

2 files changed, 3 insertions, 1 deletions

diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index af7fc860bf..c7048d50e5 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -73,7 +73,8 @@ class Chef
     #
     # @return [void]
     def self.use_inline_resources
-      Chef.deprecated(:use_inline_resources, "The use_inline_resources mode is no longer optional and the line enabling it can be removed")
+      # Uncomment this in Chef 13.6.
+      # Chef.deprecated(:use_inline_resources, "The use_inline_resources mode is no longer optional and the line enabling it can be removed")
     end
 
     #--
diff --git a/spec/unit/provider_spec.rb b/spec/unit/provider_spec.rb
index 613f03a883..6eb2bb9303 100644
--- a/spec/unit/provider_spec.rb
+++ b/spec/unit/provider_spec.rb
@@ -197,6 +197,7 @@ describe Chef::Provider do
 
   context "when using use_inline_resources" do
     it "should log a deprecation warning" do
+      pending Chef::VERSION.start_with?("13.6")
       expect(Chef).to receive(:deprecated).with(:use_inline_resources, kind_of(String))
       Class.new(described_class) { use_inline_resources }
     end