chef 14.2.0 → 14.3.37

data/spec/unit/mixin/powershell_exec_spec.rb

@@ -37,7 +37,7 @@ describe Chef::Mixin::PowershellExec, :windows_only do
       execution = object.powershell_exec("this-should-error")
       expect(execution.errors).to be_a_kind_of(Array)
       expect(execution.errors[0]).to be_a_kind_of(String)
-      expect(execution.errors[0]).to include("CommandNotFoundException")
+      expect(execution.errors[0]).to include("Runtime exception: this-should-error")
     end
   end
 end

data/spec/unit/mixin/powershell_type_coercions_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Mixin::PowershellTypeCoercions do
 
     ["'", '"', "#", "`"].each do |c|
       it "base64 encodes a string that contains #{c}" do
-        expect(test_class.translate_type("#{c}")).to match(Base64.strict_encode64(c))
+        expect(test_class.translate_type(c.to_s)).to match(Base64.strict_encode64(c))
       end
     end
 

data/spec/unit/mixin/securable_spec.rb

@@ -117,10 +117,10 @@ describe Chef::Mixin::Securable do
 
     it "should not accept group/owner names containing embedded carriage returns" do
       skip "XXX: params_validate needs to be extended to support multi-line regex"
-      #lambda { @securable.group "\ntest" }.should raise_error(ArgumentError)
-      #lambda { @securable.group "te\nst" }.should raise_error(ArgumentError)
-      #lambda { @securable.owner "\ntest" }.should raise_error(ArgumentError)
-      #lambda { @securable.owner "te\nst" }.should raise_error(ArgumentError)
+      # lambda { @securable.group "\ntest" }.should raise_error(ArgumentError)
+      # lambda { @securable.group "te\nst" }.should raise_error(ArgumentError)
+      # lambda { @securable.owner "\ntest" }.should raise_error(ArgumentError)
+      # lambda { @securable.owner "te\nst" }.should raise_error(ArgumentError)
     end
 
     it "should accept group/owner names in UTF-8" do
@@ -258,23 +258,23 @@ describe Chef::Mixin::Securable do
     end
 
     it "should allow you to specify whether the permissions applies_to_children with true/false/:containers_only/:objects_only" do
-      expect { @securable.rights :read, "The Dude", :applies_to_children => false }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => :containers_only }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => :objects_only }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => "poop" }.to raise_error(ArgumentError)
+      expect { @securable.rights :read, "The Dude", applies_to_children: false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: :containers_only }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: :objects_only }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: "poop" }.to raise_error(ArgumentError)
     end
 
     it "should allow you to specify whether the permissions applies_to_self with true/false" do
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :applies_to_self => false }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_self => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_self => "poop" }.to raise_error(ArgumentError)
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, applies_to_self: false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_self: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_self: "poop" }.to raise_error(ArgumentError)
     end
 
     it "should allow you to specify whether the permissions applies one_level_deep with true/false" do
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :one_level_deep => false }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :one_level_deep => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :one_level_deep => "poop" }.to raise_error(ArgumentError)
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, one_level_deep: false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, one_level_deep: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, one_level_deep: "poop" }.to raise_error(ArgumentError)
     end
 
     it "should allow multiple rights and deny_rights declarations" do
@@ -288,21 +288,21 @@ describe Chef::Mixin::Securable do
     end
 
     it "should allow you to specify whether the permission applies_to_self only if you specified applies_to_children" do
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :applies_to_self => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :applies_to_self => false }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => false, :applies_to_self => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => false, :applies_to_self => false }.to raise_error(ArgumentError)
-      expect { @securable.rights :read, "The Dude", :applies_to_self => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_self => false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, applies_to_self: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, applies_to_self: false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: false, applies_to_self: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: false, applies_to_self: false }.to raise_error(ArgumentError)
+      expect { @securable.rights :read, "The Dude", applies_to_self: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_self: false }.not_to raise_error
     end
 
     it "should allow you to specify whether the permission applies one_level_deep only if you specified applies_to_children" do
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :one_level_deep => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => true, :one_level_deep => false }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :applies_to_children => false, :one_level_deep => true }.to raise_error(ArgumentError)
-      expect { @securable.rights :read, "The Dude", :applies_to_children => false, :one_level_deep => false }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :one_level_deep => true }.not_to raise_error
-      expect { @securable.rights :read, "The Dude", :one_level_deep => false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, one_level_deep: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: true, one_level_deep: false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", applies_to_children: false, one_level_deep: true }.to raise_error(ArgumentError)
+      expect { @securable.rights :read, "The Dude", applies_to_children: false, one_level_deep: false }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", one_level_deep: true }.not_to raise_error
+      expect { @securable.rights :read, "The Dude", one_level_deep: false }.not_to raise_error
     end
 
     it "should allow you to specify whether the permissions inherit with true/false" do

data/spec/unit/mixin/shell_out_spec.rb

@@ -48,177 +48,185 @@ describe Chef::Mixin::ShellOut do
       ENV.update(@original_env)
     end
 
+    let(:retobj) { instance_double(Mixlib::ShellOut, "error!" => false) }
     let(:cmd) { "echo '#{rand(1000)}'" }
 
-    describe "#shell_out" do
-
-      describe "when the last argument is a Hash" do
-        describe "and environment is an option" do
-          it "should not change environment language settings when they are set to nil" do
-            options = { :environment => { "LC_ALL" => nil, "LANGUAGE" => nil, "LANG" => nil, env_path => nil } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
-          end
-
-          it "should not change environment language settings when they are set to non-nil" do
-            options = { :environment => { "LC_ALL" => "en_US.UTF-8", "LANGUAGE" => "en_US.UTF-8", "LANG" => "en_US.UTF-8", env_path => "foo:bar:baz" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
-          end
-
-          it "should set environment language settings to the configured internal locale when they are not present" do
-            options = { :environment => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-              :environment => {
-                "HOME"     => "/Users/morty",
-                "LC_ALL"   => Chef::Config[:internal_locale],
-                "LANG"     => Chef::Config[:internal_locale],
-                "LANGUAGE" => Chef::Config[:internal_locale],
-                env_path   => sanitized_path,
-              },
-            }).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
-          end
-
-          it "should not mutate the options hash when it adds language settings" do
-            options = { :environment => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-              :environment => {
-                "HOME"     => "/Users/morty",
-                "LC_ALL"   => Chef::Config[:internal_locale],
-                "LANG"     => Chef::Config[:internal_locale],
-                "LANGUAGE" => Chef::Config[:internal_locale],
-                env_path   => sanitized_path,
-              },
-            }).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
-            expect(options[:environment].has_key?("LC_ALL")).to be false
-          end
+    [ :shell_out, :shell_out_compact, :shell_out_compact_timeout, :shell_out!, :shell_out_compact!, :shell_out_compact_timeout! ].each do |method|
+      describe "##{method}" do
+        before do
+          Chef::Config[:treat_deprecation_warnings_as_errors] = false
         end
 
-        describe "and env is an option" do
-          it "should not change env when langauge options are set to nil" do
-            options = { :env => { "LC_ALL" => nil, "LANG" => nil, "LANGUAGE" => nil, env_path => nil } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
+        describe "when the last argument is a Hash" do
+          describe "and environment is an option" do
+            it "should not change environment language settings when they are set to nil" do
+              options = { environment: { "LC_ALL" => nil, "LANGUAGE" => nil, "LANG" => nil, env_path => nil } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
+
+            it "should not change environment language settings when they are set to non-nil" do
+              options = { environment: { "LC_ALL" => "en_US.UTF-8", "LANGUAGE" => "en_US.UTF-8", "LANG" => "en_US.UTF-8", env_path => "foo:bar:baz" } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
+
+            it "should set environment language settings to the configured internal locale when they are not present" do
+              options = { environment: { "HOME" => "/Users/morty" } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, {
+                environment: {
+                  "HOME"     => "/Users/morty",
+                  "LC_ALL"   => Chef::Config[:internal_locale],
+                  "LANG"     => Chef::Config[:internal_locale],
+                  "LANGUAGE" => Chef::Config[:internal_locale],
+                  env_path   => sanitized_path,
+                },
+              }).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
+
+            it "should not mutate the options hash when it adds language settings" do
+              options = { environment: { "HOME" => "/Users/morty" } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, {
+                environment: {
+                  "HOME"     => "/Users/morty",
+                  "LC_ALL"   => Chef::Config[:internal_locale],
+                  "LANG"     => Chef::Config[:internal_locale],
+                  "LANGUAGE" => Chef::Config[:internal_locale],
+                  env_path   => sanitized_path,
+                },
+              }).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+              expect(options[:environment].key?("LC_ALL")).to be false
+            end
           end
 
-          it "should not change env when language options are set to non-nil" do
-            options = { :env => { "LC_ALL" => "de_DE.UTF-8", "LANG" => "de_DE.UTF-8", "LANGUAGE" => "de_DE.UTF-8", env_path => "foo:bar:baz" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
+          describe "and env is an option" do
+            it "should not change env when langauge options are set to nil" do
+              options = { env: { "LC_ALL" => nil, "LANG" => nil, "LANGUAGE" => nil, env_path => nil } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
+
+            it "should not change env when language options are set to non-nil" do
+              options = { env: { "LC_ALL" => "de_DE.UTF-8", "LANG" => "de_DE.UTF-8", "LANGUAGE" => "de_DE.UTF-8", env_path => "foo:bar:baz" } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
+
+            it "should set environment language settings to the configured internal locale when they are not present" do
+              options = { env: { "HOME" => "/Users/morty" } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, {
+                env: {
+                  "HOME"     => "/Users/morty",
+                  "LC_ALL"   => Chef::Config[:internal_locale],
+                  "LANG"     => Chef::Config[:internal_locale],
+                  "LANGUAGE" => Chef::Config[:internal_locale],
+                  env_path   => sanitized_path,
+                },
+              }).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
+
+            it "should not mutate the options hash when it adds language settings" do
+              options = { env: { "HOME" => "/Users/morty" } }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, {
+                env: {
+                  "HOME"     => "/Users/morty",
+                  "LC_ALL"   => Chef::Config[:internal_locale],
+                  "LANG"     => Chef::Config[:internal_locale],
+                  "LANGUAGE" => Chef::Config[:internal_locale],
+                  env_path   => sanitized_path,
+                },
+              }).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+              expect(options[:env].key?("LC_ALL")).to be false
+            end
           end
 
-          it "should set environment language settings to the configured internal locale when they are not present" do
-            options = { :env => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-              :env => {
-                "HOME"     => "/Users/morty",
-                "LC_ALL"   => Chef::Config[:internal_locale],
-                "LANG"     => Chef::Config[:internal_locale],
-                "LANGUAGE" => Chef::Config[:internal_locale],
-                env_path   => sanitized_path,
-              },
-            }).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
-          end
-
-          it "should not mutate the options hash when it adds language settings" do
-            options = { :env => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-              :env => {
-                "HOME"     => "/Users/morty",
-                "LC_ALL"   => Chef::Config[:internal_locale],
-                "LANG"     => Chef::Config[:internal_locale],
-                "LANGUAGE" => Chef::Config[:internal_locale],
-                env_path   => sanitized_path,
-              },
-            }).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
-            expect(options[:env].has_key?("LC_ALL")).to be false
+          describe "and no env/environment option is present" do
+            it "should set environment language settings to the configured internal locale" do
+              options = { user: "morty" }
+              expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, {
+                user: "morty",
+                environment: {
+                  "LC_ALL"   => Chef::Config[:internal_locale],
+                  "LANG"     => Chef::Config[:internal_locale],
+                  "LANGUAGE" => Chef::Config[:internal_locale],
+                  env_path   => sanitized_path,
+                },
+              }).and_return(retobj)
+              shell_out_obj.send(method, cmd, options)
+            end
           end
         end
 
-        describe "and no env/environment option is present" do
+        describe "when the last argument is not a Hash" do
           it "should set environment language settings to the configured internal locale" do
-            options = { :user => "morty" }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-              :user => "morty",
-              :environment => {
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, {
+              environment: {
                 "LC_ALL"   => Chef::Config[:internal_locale],
                 "LANG"     => Chef::Config[:internal_locale],
                 "LANGUAGE" => Chef::Config[:internal_locale],
                 env_path   => sanitized_path,
               },
-            }).and_return(true)
-            shell_out_obj.shell_out(cmd, options)
+            }).and_return(retobj)
+            shell_out_obj.send(method, cmd)
           end
         end
       end
-
-      describe "when the last argument is not a Hash" do
-        it "should set environment language settings to the configured internal locale" do
-          expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {
-            :environment => {
-              "LC_ALL"   => Chef::Config[:internal_locale],
-              "LANG"     => Chef::Config[:internal_locale],
-              "LANGUAGE" => Chef::Config[:internal_locale],
-              env_path   => sanitized_path,
-            },
-          }).and_return(true)
-          shell_out_obj.shell_out(cmd)
-        end
-      end
-
     end
 
     describe "#shell_out_with_systems_locale" do
+      before do
+        Chef::Config[:treat_deprecation_warnings_as_errors] = false
+      end
 
       describe "when the last argument is a Hash" do
         describe "and environment is an option" do
           it "should not change environment['LC_ALL'] when set to nil" do
-            options = { :environment => { "LC_ALL" => nil } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { environment: { "LC_ALL" => nil } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should not change environment['LC_ALL'] when set to non-nil" do
-            options = { :environment => { "LC_ALL" => "en_US.UTF-8" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { environment: { "LC_ALL" => "en_US.UTF-8" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should no longer set environment['LC_ALL'] to nil when 'LC_ALL' not present" do
-            options = { :environment => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { environment: { "HOME" => "/Users/morty" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
         end
 
         describe "and env is an option" do
           it "should not change env when set to nil" do
-            options = { :env => { "LC_ALL" => nil } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { env: { "LC_ALL" => nil } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should not change env when set to non-nil" do
-            options = { :env => { "LC_ALL" => "en_US.UTF-8" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { env: { "LC_ALL" => "en_US.UTF-8" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
 
           it "should no longer set env['LC_ALL'] to nil when 'LC_ALL' not present" do
-            options = { :env => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { env: { "HOME" => "/Users/morty" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
         end
 
         describe "and no env/environment option is present" do
           it "should no longer add environment option and set environment['LC_ALL'] to nil" do
-            options = { :user => "morty" }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { user: "morty" }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out_with_systems_locale(cmd, options)
           end
         end
@@ -226,7 +234,7 @@ describe Chef::Mixin::ShellOut do
 
       describe "when the last argument is not a Hash" do
         it "should no longer add environment options and set environment['LC_ALL'] to nil" do
-          expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {}).and_return(true)
+          expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd).and_return(true)
           shell_out_obj.shell_out_with_systems_locale(cmd)
         end
       end
@@ -237,48 +245,48 @@ describe Chef::Mixin::ShellOut do
       describe "when the last argument is a Hash" do
         describe "and environment is an option" do
           it "should not change environment['LC_ALL'] when set to nil" do
-            options = { :environment => { "LC_ALL" => nil } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { environment: { "LC_ALL" => nil } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
 
           it "should not change environment['LC_ALL'] when set to non-nil" do
-            options = { :environment => { "LC_ALL" => "en_US.UTF-8" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { environment: { "LC_ALL" => "en_US.UTF-8" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
 
           it "should no longer set environment['LC_ALL'] to nil when 'LC_ALL' not present" do
-            options = { :environment => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { environment: { "HOME" => "/Users/morty" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
         end
 
         describe "and env is an option" do
           it "should not change env when set to nil" do
-            options = { :env => { "LC_ALL" => nil } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { env: { "LC_ALL" => nil } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
 
           it "should not change env when set to non-nil" do
-            options = { :env => { "LC_ALL" => "en_US.UTF-8" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { env: { "LC_ALL" => "en_US.UTF-8" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
 
           it "should no longer set env['LC_ALL'] to nil when 'LC_ALL' not present" do
-            options = { :env => { "HOME" => "/Users/morty" } }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { env: { "HOME" => "/Users/morty" } }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
         end
 
         describe "and no env/environment option is present" do
           it "should no longer add environment option and set environment['LC_ALL'] to nil" do
-            options = { :user => "morty" }
-            expect(shell_out_obj).to receive(:shell_out_command).with(cmd, options).and_return(true)
+            options = { user: "morty" }
+            expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
             shell_out_obj.shell_out(cmd, **options, default_env: false)
           end
         end
@@ -286,11 +294,157 @@ describe Chef::Mixin::ShellOut do
 
       describe "when the last argument is not a Hash" do
         it "should no longer add environment options and set environment['LC_ALL'] to nil" do
-          expect(shell_out_obj).to receive(:shell_out_command).with(cmd, {}).and_return(true)
+          expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd).and_return(true)
           shell_out_obj.shell_out(cmd, default_env: false)
         end
       end
     end
 
+    describe "deprecations" do
+      [ :shell_out_with_systems_locale, :shell_out_compact, :shell_out_compact_timeout, :shell_out_with_systems_locale!, :shell_out_compact!, :shell_out_compact_timeout! ].each do |method|
+        it "should not respond to #{method} in Chef-15", chef: ">= 15" do
+          expect(shell_out_obj.respond_to?(method)).to be false
+        end
+      end
+
+      it "removed shell_out_with_timeout from Chef::Provider::Package", chef: ">= 15" do
+        expect(Chef::Provider::Package.instance_methods + Chef::Provider::Package.private_instance_methods).not_to include(:shell_out_with_timeout)
+      end
+
+      it "removed shell_out_with_timeout! from Chef::Provider::Package", chef: ">= 15" do
+        expect(Chef::Provider::Package.instance_methods + Chef::Provider::Package.private_instance_methods).not_to include(:shell_out_with_timeout!)
+      end
+    end
+
+    describe "Custom Resource timeouts" do
+      class CustomResource < Chef::Resource
+        provides :whatever
+
+        property :timeout, Numeric
+
+        action :install do
+        end
+      end
+
+      let(:new_resource) { CustomResource.new("foo") }
+      let(:provider) { new_resource.provider_for_action(:install) }
+
+      describe "on Chef-14", chef: "< 15" do
+        it "doesn't add timeout for shell_out" do
+          expect(provider).to receive(:shell_out_compacted).with("foo")
+          provider.shell_out("foo")
+        end
+        it "doesn't add timeout for shell_out!" do
+          expect(provider).to receive(:shell_out_compacted!).with("foo")
+          provider.shell_out!("foo")
+        end
+      end
+
+      describe "on Chef-15", chef: ">= 15" do
+        [ :shell_out, :shell_out! ].each do |method|
+          stubbed_method = (method == :shell_out) ? :shell_out_compacted : :shell_out_compacted!
+          it "#{method} defaults to 900 seconds" do
+            expect(provider).to receive(stubbed_method).with("foo", timeout: 900)
+            provider.send(method, "foo")
+          end
+          it "#{method} overrides the default timeout with its options" do
+            expect(provider).to receive(stubbed_method).with("foo", timeout: 1)
+            provider.send(method, "foo", timeout: 1)
+          end
+          it "#{method} overrides the new_resource.timeout with the timeout option" do
+            new_resource.timeout(99)
+            expect(provider).to receive(stubbed_method).with("foo", timeout: 1)
+            provider.send(method, "foo", timeout: 1)
+          end
+          it "#{method} defaults to 900 seconds and preserves options" do
+            expect(provider).to receive(stubbed_method).with("foo", env: nil, timeout: 900)
+            provider.send(method, "foo", env: nil)
+          end
+          it "#{method} overrides the default timeout with its options and preserves options" do
+            expect(provider).to receive(stubbed_method).with("foo", timeout: 1, env: nil)
+            provider.send(method, "foo", timeout: 1, env: nil)
+          end
+          it "#{method} overrides the new_resource.timeout with the timeout option and preseves options" do
+            new_resource.timeout(99)
+            expect(provider).to receive(stubbed_method).with("foo", timeout: 1, env: nil)
+            provider.send(method, "foo", timeout: 1, env: nil)
+          end
+        end
+      end
+    end
+
+    describe "timeouts" do
+      let(:new_resource) { Chef::Resource::Package.new("foo") }
+      let(:provider) { new_resource.provider_for_action(:install) }
+
+      [ :shell_out, :shell_out! ].each do |method|
+        stubbed_method = (method == :shell_out) ? :shell_out_compacted : :shell_out_compacted!
+        it "#{method} defaults to 900 seconds" do
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 900)
+          provider.send(method, "foo")
+        end
+        it "#{method} overrides the default timeout with its options" do
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 1)
+          provider.send(method, "foo", timeout: 1)
+        end
+        it "#{method} overrides the new_resource.timeout with the timeout option" do
+          new_resource.timeout(99)
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 1)
+          provider.send(method, "foo", timeout: 1)
+        end
+        it "#{method} defaults to 900 seconds and preserves options" do
+          expect(provider).to receive(stubbed_method).with("foo", env: nil, timeout: 900)
+          provider.send(method, "foo", env: nil)
+        end
+        it "#{method} overrides the default timeout with its options and preserves options" do
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 1, env: nil)
+          provider.send(method, "foo", timeout: 1, env: nil)
+        end
+        it "#{method} overrides the new_resource.timeout with the timeout option and preseves options" do
+          new_resource.timeout(99)
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 1, env: nil)
+          provider.send(method, "foo", timeout: 1, env: nil)
+        end
+      end
+    end
+
+    describe "deprecated timeouts" do # Chef 15: delete me
+      let(:new_resource) { Chef::Resource::Package.new("foo") }
+      let(:provider) { new_resource.provider_for_action(:install) }
+
+      before(:each) do
+        Chef::Config[:treat_deprecation_warnings_as_errors] = false
+      end
+
+      [ :shell_out_compact_timeout, :shell_out_compact_timeout! ].each do |method|
+        stubbed_method = (method == :shell_out_compact_timeout) ? :shell_out_compacted : :shell_out_compacted!
+        it "#{method} defaults to 900 seconds" do
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 900)
+          provider.send(method, "foo")
+        end
+        it "#{method} overrides the default timeout with its options" do
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 1)
+          provider.send(method, "foo", timeout: 1)
+        end
+        it "#{method} overrides the new_resource.timeout with the timeout option" do
+          new_resource.timeout(99)
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 99)
+          provider.send(method, "foo", timeout: 1)
+        end
+        it "#{method} defaults to 900 seconds and preserves options" do
+          expect(provider).to receive(stubbed_method).with("foo", env: nil, timeout: 900)
+          provider.send(method, "foo", env: nil)
+        end
+        it "#{method} overrides the default timeout with its options and preserves options" do
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 1, env: nil)
+          provider.send(method, "foo", timeout: 1, env: nil)
+        end
+        it "#{method} overrides the new_resource.timeout with the timeout option and preseves options" do
+          new_resource.timeout(99)
+          expect(provider).to receive(stubbed_method).with("foo", timeout: 99, env: nil)
+          provider.send(method, "foo", timeout: 1, env: nil)
+        end
+      end
+    end
   end
 end