chef 14.2.0 → 14.3.37

data/spec/unit/provider/service_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Provider::Service do
 
   describe "action_restart" do
     before do
-      @current_resource.supports(:restart => true)
+      @current_resource.supports(restart: true)
     end
 
     it "should restart the service if it's supported and set the resource as updated" do
@@ -118,11 +118,11 @@ describe Chef::Provider::Service do
 
   describe "action_reload" do
     before do
-      @new_resource.supports(:reload => true)
+      @new_resource.supports(reload: true)
     end
 
     it "should raise an exception if reload isn't supported" do
-      @new_resource.supports(:reload => false)
+      @new_resource.supports(reload: false)
       @new_resource.reload_command(false)
       expect { @provider.run_action(:reload) }.to raise_error(Chef::Exceptions::UnsupportedAction)
     end

data/spec/unit/provider/subversion_spec.rb

@@ -46,7 +46,7 @@ describe Chef::Provider::Subversion do
   it "converts resource attributes to options for shell_out" do
     expect(@provider.run_options).to eq({})
     @resource.user "deployninja"
-    expect(@provider.run_options).to eq({ :user => "deployninja" })
+    expect(@provider.run_options).to eq({ user: "deployninja" })
   end
 
   context "determining the revision of the currently deployed code" do
@@ -73,18 +73,18 @@ describe Chef::Provider::Subversion do
         "Last Changed Rev: 11410\n" + # Last Changed Rev is preferred to Revision
         "Last Changed Date: 2009-03-25 06:09:56 -0600 (Wed, 25 Mar 2009)\n\n"
       expect(::File).to receive(:exist?).at_least(1).times.with("/my/deploy/dir/.svn").and_return(true)
-      expected_command = ["svn info", { :cwd => "/my/deploy/dir", :returns => [0, 1] }]
-      expect(@provider).to receive(:shell_out!).with(*expected_command).
-        and_return(double("ShellOut result", :stdout => example_svn_info, :stderr => ""))
+      expected_command = ["svn info", { cwd: "/my/deploy/dir", returns: [0, 1] }]
+      expect(@provider).to receive(:shell_out!).with(*expected_command)
+        .and_return(double("ShellOut result", stdout: example_svn_info, stderr: ""))
       expect(@provider.find_current_revision).to eql("11410")
     end
 
     it "gives nil as the current revision if the deploy dir isn't a SVN working copy" do
       example_svn_info = "svn: '/tmp/deploydir' is not a working copy\n"
       expect(::File).to receive(:exist?).with("/my/deploy/dir/.svn").and_return(true)
-      expected_command = ["svn info", { :cwd => "/my/deploy/dir", :returns => [0, 1] }]
-      expect(@provider).to receive(:shell_out!).with(*expected_command).
-        and_return(double("ShellOut result", :stdout => example_svn_info, :stderr => ""))
+      expected_command = ["svn info", { cwd: "/my/deploy/dir", returns: [0, 1] }]
+      expect(@provider).to receive(:shell_out!).with(*expected_command)
+        .and_return(double("ShellOut result", stdout: example_svn_info, stderr: ""))
       expect(@provider.find_current_revision).to be_nil
     end
 
@@ -128,18 +128,18 @@ describe Chef::Provider::Subversion do
         "Last Changed Rev: 11410\n" + # Last Changed Rev is preferred to Revision
         "Last Changed Date: 2009-03-25 06:09:56 -0600 (Wed, 25 Mar 2009)\n\n"
       @resource.revision "HEAD"
-      expected_command = ["svn info http://svn.example.org/trunk/ --no-auth-cache  -rHEAD", { :cwd => "/my/deploy/dir", :returns => [0, 1] }]
-      expect(@provider).to receive(:shell_out!).with(*expected_command).
-        and_return(double("ShellOut result", :stdout => example_svn_info, :stderr => ""))
+      expected_command = ["svn info http://svn.example.org/trunk/ --no-auth-cache  -rHEAD", { cwd: "/my/deploy/dir", returns: [0, 1] }]
+      expect(@provider).to receive(:shell_out!).with(*expected_command)
+        .and_return(double("ShellOut result", stdout: example_svn_info, stderr: ""))
       expect(@provider.revision_int).to eql("11410")
     end
 
     it "returns a helpful message if data from `svn info` can't be parsed" do
       example_svn_info =  "some random text from an error message\n"
       @resource.revision "HEAD"
-      expected_command = ["svn info http://svn.example.org/trunk/ --no-auth-cache  -rHEAD", { :cwd => "/my/deploy/dir", :returns => [0, 1] }]
-      expect(@provider).to receive(:shell_out!).with(*expected_command).
-        and_return(double("ShellOut result", :stdout => example_svn_info, :stderr => ""))
+      expected_command = ["svn info http://svn.example.org/trunk/ --no-auth-cache  -rHEAD", { cwd: "/my/deploy/dir", returns: [0, 1] }]
+      expect(@provider).to receive(:shell_out!).with(*expected_command)
+        .and_return(double("ShellOut result", stdout: example_svn_info, stderr: ""))
       expect { @provider.revision_int }.to raise_error(RuntimeError, "Could not parse `svn info` data: some random text from an error message\n")
 
     end

data/spec/unit/provider/systemd_unit_spec.rb

@@ -50,27 +50,27 @@ describe Chef::Provider::SystemdUnit do
 
   let(:user_cmd_opts) do
     {
-      :user => "joe",
-      :environment => {
+      user: "joe",
+      environment: {
         "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/1000/bus",
       },
     }
   end
 
   let(:shell_out_success) do
-    double("shell_out", :exitstatus => 0, :error? => false)
+    double("shell_out", exitstatus: 0, error?: false)
   end
 
   let(:shell_out_failure) do
-    double("shell_out", :exitstatus => 1, :error? => true)
+    double("shell_out", exitstatus: 1, error?: true)
   end
 
   let(:shell_out_masked) do
-    double("shell_out", :exit_status => 0, :error? => false, :stdout => "masked")
+    double("shell_out", exit_status: 0, error?: false, stdout: "masked")
   end
 
   let(:shell_out_static) do
-    double("shell_out", :exit_status => 0, :error? => false, :stdout => "static")
+    double("shell_out", exit_status: 0, error?: false, stdout: "static")
   end
 
   before(:each) do
@@ -803,7 +803,7 @@ describe Chef::Provider::SystemdUnit do
       describe "#active?" do
         before(:each) do
           provider.current_resource = current_resource
-          allow(provider).to receive(:which).with("systemctl").and_return("#{systemctl_path}")
+          allow(provider).to receive(:which).with("systemctl").and_return(systemctl_path.to_s)
         end
 
         context "when a user is specified" do
@@ -844,7 +844,7 @@ describe Chef::Provider::SystemdUnit do
       describe "#enabled?" do
         before(:each) do
           provider.current_resource = current_resource
-          allow(provider).to receive(:which).with("systemctl").and_return("#{systemctl_path}")
+          allow(provider).to receive(:which).with("systemctl").and_return(systemctl_path.to_s)
         end
 
         context "when a user is specified" do
@@ -885,7 +885,7 @@ describe Chef::Provider::SystemdUnit do
       describe "#masked?" do
         before(:each) do
           provider.current_resource = current_resource
-          allow(provider).to receive(:which).with("systemctl").and_return("#{systemctl_path}")
+          allow(provider).to receive(:which).with("systemctl").and_return(systemctl_path.to_s)
         end
 
         context "when a user is specified" do
@@ -926,7 +926,7 @@ describe Chef::Provider::SystemdUnit do
       describe "#static?" do
         before(:each) do
           provider.current_resource = current_resource
-          allow(provider).to receive(:which).with("systemctl").and_return("#{systemctl_path}")
+          allow(provider).to receive(:which).with("systemctl").and_return(systemctl_path.to_s)
         end
 
         context "when a user is specified" do

data/spec/unit/provider/template/content_spec.rb

@@ -30,20 +30,20 @@ describe Chef::Provider::Template::Content do
 
   let(:new_resource) do
     double("Chef::Resource::Template (new)",
-         :cookbook_name => "openldap",
-         :recipe_name => "default",
-         :source_line => "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
-         :source_line_file => "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb",
-         :source_line_number => "2",
-         :source => "openldap_stuff.conf.erb",
-         :name => "openldap_stuff.conf",
-         :path => resource_path,
-         :local => false,
-         :cookbook => nil,
-         :variables => {},
-         :inline_helper_blocks => {},
-         :inline_helper_modules => [],
-         :helper_modules => [])
+         cookbook_name: "openldap",
+         recipe_name: "default",
+         source_line: "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
+         source_line_file: "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb",
+         source_line_number: "2",
+         source: "openldap_stuff.conf.erb",
+         name: "openldap_stuff.conf",
+         path: resource_path,
+         local: false,
+         cookbook: nil,
+         variables: {},
+         inline_helper_blocks: {},
+         inline_helper_modules: [],
+         helper_modules: [])
   end
 
   let(:rendered_file_locations) do
@@ -58,7 +58,7 @@ describe Chef::Provider::Template::Content do
     cl.load_cookbooks
     cookbook_collection = Chef::CookbookCollection.new(cl)
     node = Chef::Node.new
-    double("Chef::Resource::RunContext", :node => node, :cookbook_collection => cookbook_collection)
+    double("Chef::Resource::RunContext", node: node, cookbook_collection: cookbook_collection)
   end
 
   let(:content) do
@@ -130,38 +130,38 @@ describe Chef::Provider::Template::Content do
   describe "when using location helpers" do
     let(:new_resource) do
       double("Chef::Resource::Template (new)",
-             :cookbook_name => "openldap",
-             :recipe_name => "default",
-             :source_line => CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
-             :source_line_file => CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb",
-             :source_line_number => "2",
-             :source => "helpers.erb",
-             :name => "helpers.erb",
-             :path => CHEF_SPEC_DATA + "/cookbooks/openldap/templates/default/helpers.erb",
-             :local => false,
-             :cookbook => nil,
-             :variables => {},
-             :inline_helper_blocks => {},
-             :inline_helper_modules => [],
-             :helper_modules => [])
+             cookbook_name: "openldap",
+             recipe_name: "default",
+             source_line: CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
+             source_line_file: CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb",
+             source_line_number: "2",
+             source: "helpers.erb",
+             name: "helpers.erb",
+             path: CHEF_SPEC_DATA + "/cookbooks/openldap/templates/default/helpers.erb",
+             local: false,
+             cookbook: nil,
+             variables: {},
+             inline_helper_blocks: {},
+             inline_helper_modules: [],
+             helper_modules: [])
     end
 
     it "creates the template with the rendered content" do
-      expect(IO.read(content.tempfile.path)).to eql <<EOF
-openldap
-default
-#{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb:2:in `from_file'
-#{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb
-2
-helpers.erb
-#{CHEF_SPEC_DATA}/cookbooks/openldap/templates/default/helpers.erb
-openldap
-default
-#{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb:2:in `from_file'
-#{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb
-2
-helpers.erb
-#{CHEF_SPEC_DATA}/cookbooks/openldap/templates/default/helpers.erb
+      expect(IO.read(content.tempfile.path)).to eql <<~EOF
+        openldap
+        default
+        #{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb:2:in `from_file'
+        #{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb
+        2
+        helpers.erb
+        #{CHEF_SPEC_DATA}/cookbooks/openldap/templates/default/helpers.erb
+        openldap
+        default
+        #{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb:2:in `from_file'
+        #{CHEF_SPEC_DATA}/cookbooks/openldap/recipes/default.rb
+        2
+        helpers.erb
+        #{CHEF_SPEC_DATA}/cookbooks/openldap/templates/default/helpers.erb
 EOF
     end
 

data/spec/unit/provider/template_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Provider::Template do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
   let(:logger) { double("Mixlib::Log::Child").as_null_object }
-  let(:run_context) { double("Chef::RunContext", :node => node, :events => events, :logger => logger) }
+  let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end
@@ -50,7 +50,7 @@ describe Chef::Provider::Template do
   end
 
   let(:content) do
-    content = double("Chef::Provider::File::Content::Template", :template_location => "/foo/bar/baz")
+    content = double("Chef::Provider::File::Content::Template", template_location: "/foo/bar/baz")
     allow(File).to receive(:exists?).with("/foo/bar/baz").and_return(true)
     content
   end

data/spec/unit/provider/user/aix_spec.rb

@@ -52,7 +52,7 @@ describe Chef::Provider::User::Aix do
     end
 
     it "should call chpasswd correctly" do
-      expect(provider).to receive(:shell_out!).with("echo 'adam:Ostagazuzulum' | chpasswd -e").and_return true
+      expect(provider).to receive(:shell_out_compacted!).with("echo 'adam:Ostagazuzulum' | chpasswd -e").and_return true
       provider.manage_user
     end
   end
@@ -61,7 +61,7 @@ describe Chef::Provider::User::Aix do
     context "with a system user" do
       before { new_resource.system(true) }
       it "should add the user to the system group" do
-        expect(provider).to receive(:shell_out!).with("useradd", "-g", "system", "adam")
+        expect(provider).to receive(:shell_out_compacted!).with("useradd", "-g", "system", "adam")
         provider.create_user
       end
     end
@@ -74,13 +74,13 @@ describe Chef::Provider::User::Aix do
       end
 
       it "should create the home directory" do
-        allow(provider).to receive(:shell_out!).with("usermod", "-d", "/home/adam", "adam")
+        allow(provider).to receive(:shell_out_compacted!).with("usermod", "-d", "/home/adam", "adam")
         expect(FileUtils).to receive(:mkdir_p).and_return(true)
         provider.manage_user
       end
 
       it "should move an existing home dir" do
-        allow(provider).to receive(:shell_out!).with("usermod", "-d", "/mnt/home/adam", "adam")
+        allow(provider).to receive(:shell_out_compacted!).with("usermod", "-d", "/mnt/home/adam", "adam")
         new_resource.home("/mnt/home/adam")
         allow(File).to receive(:directory?).with("/home/adam").and_return(true)
         expect(FileUtils).to receive(:mv).with("/home/adam", "/mnt/home/adam")
@@ -89,7 +89,7 @@ describe Chef::Provider::User::Aix do
 
       it "should not pass -m" do
         allow(FileUtils).to receive(:mkdir_p).and_return(true)
-        expect(provider).to receive(:shell_out!).with("usermod", "-d", "/home/adam", "adam")
+        expect(provider).to receive(:shell_out_compacted!).with("usermod", "-d", "/home/adam", "adam")
         provider.manage_user
       end
     end

data/spec/unit/provider/user/dscl_spec.rb

@@ -116,31 +116,31 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
   describe "when shelling out to dscl" do
     it "should run dscl with the supplied cmd /Path args" do
       shell_return = shellcmdresult.new("stdout", "err", 0)
-      expect(provider).to receive(:shell_out).with("dscl", ".", "-cmd", "/Path", "args").and_return(shell_return)
+      expect(provider).to receive(:shell_out_compacted).with("dscl", ".", "-cmd", "/Path", "args").and_return(shell_return)
       expect(provider.run_dscl("cmd", "/Path", "args")).to eq("stdout")
     end
 
     it "returns an empty string from delete commands" do
       shell_return = shellcmdresult.new("out", "err", 23)
-      expect(provider).to receive(:shell_out).with("dscl", ".", "-delete", "/Path", "args").and_return(shell_return)
+      expect(provider).to receive(:shell_out_compacted).with("dscl", ".", "-delete", "/Path", "args").and_return(shell_return)
       expect(provider.run_dscl("delete", "/Path", "args")).to eq("")
     end
 
     it "should raise an exception for any other command" do
       shell_return = shellcmdresult.new("out", "err", 23)
-      expect(provider).to receive(:shell_out).with("dscl", ".", "-cmd", "/Path", "arguments").and_return(shell_return)
+      expect(provider).to receive(:shell_out_compacted).with("dscl", ".", "-cmd", "/Path", "arguments").and_return(shell_return)
       expect { provider.run_dscl("cmd", "/Path", "arguments") }.to raise_error(Chef::Exceptions::DsclCommandFailed)
     end
 
     it "raises an exception when dscl reports 'no such key'" do
       shell_return = shellcmdresult.new("No such key: ", "err", 23)
-      expect(provider).to receive(:shell_out).with("dscl", ".", "-cmd", "/Path", "args").and_return(shell_return)
+      expect(provider).to receive(:shell_out_compacted).with("dscl", ".", "-cmd", "/Path", "args").and_return(shell_return)
       expect { provider.run_dscl("cmd", "/Path", "args") }.to raise_error(Chef::Exceptions::DsclCommandFailed)
     end
 
     it "raises an exception when dscl reports 'eDSRecordNotFound'" do
       shell_return = shellcmdresult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", "err", -14136)
-      expect(provider).to receive(:shell_out).with("dscl", ".", "-cmd", "/Path", "args").and_return(shell_return)
+      expect(provider).to receive(:shell_out_compacted).with("dscl", ".", "-cmd", "/Path", "args").and_return(shell_return)
       expect { provider.run_dscl("cmd", "/Path", "args") }.to raise_error(Chef::Exceptions::DsclCommandFailed)
     end
   end
@@ -284,7 +284,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
     end
 
     it "should run createhomedir to create the user's new home folder" do
-      expect(provider).to receive(:shell_out!).with("/usr/sbin/createhomedir", "-c", "-u", "toor")
+      expect(provider).to receive(:shell_out_compacted!).with("/usr/sbin/createhomedir", "-c", "-u", "toor")
       provider.ditto_home
     end
 
@@ -399,8 +399,8 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
     let(:user_plist_file) { nil }
 
     before do
-      expect(provider).to receive(:shell_out).with("dscacheutil", "-flushcache")
-      expect(provider).to receive(:shell_out).with("plutil", "-convert", "xml1", "-o", "-", "/var/db/dslocal/nodes/Default/users/toor.plist") do
+      expect(provider).to receive(:shell_out_compacted).with("dscacheutil", "-flushcache")
+      expect(provider).to receive(:shell_out_compacted).with("plutil", "-convert", "xml1", "-o", "-", "/var/db/dslocal/nodes/Default/users/toor.plist") do
         if user_plist_file.nil?
           shellcmdresult.new("Can not find the file", "Sorry!!", 1)
         else
@@ -743,7 +743,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30")
       expect(provider).to receive(:prepare_password_shadow_info).and_return({})
       mock_shellout = double("Mock::Shellout")
       allow(mock_shellout).to receive(:run_command)
-      expect(provider).to receive(:shell_out).and_return(mock_shellout)
+      expect(provider).to receive(:shell_out_compacted).and_return(mock_shellout)
       expect(provider).to receive(:read_user_info)
       expect(provider).to receive(:dscl_set)
       expect(provider).to receive(:sleep).with(3)
@@ -812,7 +812,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30")
 
       it "should raise an exception when the group does not exist" do
         shell_return = shellcmdresult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", "err", -14136)
-        expect(provider).to receive(:shell_out).with("dscl", ".", "-read", "/Groups/newgroup", "PrimaryGroupID").and_return(shell_return)
+        expect(provider).to receive(:shell_out_compacted).with("dscl", ".", "-read", "/Groups/newgroup", "PrimaryGroupID").and_return(shell_return)
         expect { provider.dscl_set_gid }.to raise_error(Chef::Exceptions::GroupIDNotFound)
       end
     end
@@ -867,8 +867,8 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30")
 
   describe "when the user exists" do
     before do
-      expect(provider).to receive(:shell_out).with("dscacheutil", "-flushcache")
-      expect(provider).to receive(:shell_out).with("plutil", "-convert", "xml1", "-o", "-", "/var/db/dslocal/nodes/Default/users/toor.plist") do
+      expect(provider).to receive(:shell_out_compacted).with("dscacheutil", "-flushcache")
+      expect(provider).to receive(:shell_out_compacted).with("plutil", "-convert", "xml1", "-o", "-", "/var/db/dslocal/nodes/Default/users/toor.plist") do
         shellcmdresult.new(File.read(File.join(CHEF_SPEC_DATA, "mac_users/10.9.plist.xml")), "", 0)
       end
       provider.load_current_resource

data/spec/unit/provider/user/pw_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Stephen Haynes (<sh@nomitor.com>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,12 +81,12 @@ describe Chef::Provider::User::Pw do
 
   describe "create_user" do
     before(:each) do
-      allow(@provider).to receive(:shell_out!).and_return(true)
+      allow(@provider).to receive(:shell_out_compacted!).and_return(true)
       allow(@provider).to receive(:modify_password).and_return(true)
     end
 
     it "should run pw useradd with the return of set_options" do
-      expect(@provider).to receive(:shell_out!).with("pw", "useradd", "adam", "-m").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with( "pw", "useradd", "adam", "-m").and_return(true)
       @provider.create_user
     end
 
@@ -98,12 +98,12 @@ describe Chef::Provider::User::Pw do
 
   describe "manage_user" do
     before(:each) do
-      allow(@provider).to receive(:shell_out!).and_return(true)
+      allow(@provider).to receive(:shell_out_compacted!).and_return(true)
       allow(@provider).to receive(:modify_password).and_return(true)
     end
 
     it "should run pw usermod with the return of set_options" do
-      expect(@provider).to receive(:shell_out!).with("pw", "usermod", "adam", "-m").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with( "pw", "usermod", "adam", "-m").and_return(true)
       @provider.manage_user
     end
 
@@ -116,12 +116,12 @@ describe Chef::Provider::User::Pw do
   describe "remove_user" do
     it "should run pw userdel with the new resources user name" do
       @new_resource.manage_home false
-      expect(@provider).to receive(:shell_out!).with("pw", "userdel", @new_resource.username).and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with( "pw", "userdel", @new_resource.username).and_return(true)
       @provider.remove_user
     end
 
     it "should run pw userdel with the new resources user name and -r if manage_home is true" do
-      expect(@provider).to receive(:shell_out!).with("pw", "userdel", @new_resource.username, "-r").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with( "pw", "userdel", @new_resource.username, "-r").and_return(true)
       @provider.remove_user
     end
   end
@@ -140,14 +140,14 @@ describe Chef::Provider::User::Pw do
 
   describe "when locking the user" do
     it "should run pw lock with the new resources username" do
-      expect(@provider).to receive(:shell_out!).with("pw", "lock", @new_resource.username)
+      expect(@provider).to receive(:shell_out_compacted!).with( "pw", "lock", @new_resource.username)
       @provider.lock_user
     end
   end
 
   describe "when unlocking the user" do
     it "should run pw unlock with the new resources username" do
-      expect(@provider).to receive(:shell_out!).with("pw", "unlock", @new_resource.username)
+      expect(@provider).to receive(:shell_out_compacted!).with( "pw", "unlock", @new_resource.username)
       @provider.unlock_user
     end
   end
@@ -155,7 +155,7 @@ describe Chef::Provider::User::Pw do
   describe "when modifying the password" do
     before(:each) do
       @status = double("Status", exitstatus: 0)
-      allow(@provider).to receive(:shell_out!).and_return(@status)
+      allow(@provider).to receive(:shell_out_compacted!).and_return(@status)
     end
 
     describe "and the new password has not been specified" do
@@ -202,12 +202,12 @@ describe Chef::Provider::User::Pw do
       end
 
       it "should run pw usermod with the username and the option -H 0" do
-        expect(@provider).to receive(:shell_out!).with("pw usermod adam -H 0", { :input => "abracadabra" }).and_return(@status)
+        expect(@provider).to receive(:shell_out_compacted!).with( "pw usermod adam -H 0", { input: "abracadabra" }).and_return(@status)
         @provider.modify_password
       end
 
       it "should raise an exception if pw usermod fails" do
-        expect(@provider).to receive(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
+        expect(@provider).to receive(:shell_out_compacted!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
         expect { @provider.modify_password }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
       end