chef 15.2.20 → 15.3.14

data/spec/spec_helper.rb

@@ -145,6 +145,7 @@ RSpec.configure do |config|
   config.filter_run_excluding not_supported_on_windows: true if windows?
   config.filter_run_excluding not_supported_on_macos: true if mac_osx?
   config.filter_run_excluding macos_only: true unless mac_osx?
+  config.filter_run_excluding macos_1014: true unless mac_osx_1014?
   config.filter_run_excluding not_supported_on_aix: true if aix?
   config.filter_run_excluding not_supported_on_solaris: true if solaris?
   config.filter_run_excluding not_supported_on_gce: true if gce?

data/spec/support/platform_helpers.rb

@@ -3,6 +3,7 @@ require "chef/mixin/shell_out"
 require "ohai/mixin/http_helper"
 require "ohai/mixin/gce_metadata"
 require "chef/mixin/powershell_out"
+require "chef/version_class"
 
 class ShellHelpers
   extend Chef::Mixin::ShellOut
@@ -110,6 +111,15 @@ def mac_osx_106?
   false
 end
 
+def mac_osx_1014?
+  if mac_osx?
+    ver = Chef::Version.new(ohai[:platform_version])
+    return ver.major == 10 && ver.minor == 14
+  end
+
+  false
+end
+
 def mac_osx?
   if File.exists? "/usr/bin/sw_vers"
     result = ShellHelpers.shell_out("/usr/bin/sw_vers")

data/spec/support/shared/integration/integration_helper.rb

@@ -1,7 +1,7 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
 # Author:: Ho-Sheng Hsiao (<hosh@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,6 @@ require "chef/config"
 require "chef/json_compat"
 require "chef/server_api"
 require "support/shared/integration/knife_support"
-require "support/shared/integration/app_server_support"
 require "cheffish/rspec/chef_run_support"
 require "spec_helper"
 

data/spec/unit/application/client_spec.rb

@@ -1,6 +1,6 @@
 
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,7 +85,6 @@ describe Chef::Application::Client, "reconfigure" do
 
     allow(app).to receive(:trap)
     allow(app).to receive(:configure_logging).and_return(true)
-    Chef::Config[:interval] = 10
 
     Chef::Config[:once] = false
 
@@ -162,7 +161,7 @@ describe Chef::Application::Client, "reconfigure" do
         it_behaves_like "sets the configuration", "--no-fork", client_fork: false
       end
 
-      context "with an interval" do
+      context "with an interval", :unix_only do
         it_behaves_like "sets the configuration", "--interval 1800", client_fork: true
       end
 
@@ -322,7 +321,7 @@ describe Chef::Application::Client, "reconfigure" do
       Chef::Config[:splay] = nil
     end
 
-    it "should terminal with message when interval is given" do
+    it "should terminate with message when interval is given" do
       Chef::Config[:interval] = 600
       allow(ChefConfig).to receive(:windows?).and_return(false)
       expect(Chef::Application).to receive(:fatal!).with(
@@ -340,8 +339,8 @@ Enable .* interval runs by setting `:client_fork = true` in your config file or
         allow(ChefConfig).to receive(:windows?).and_return(true)
       end
 
-      it "should not terminate" do
-        expect(Chef::Application).not_to receive(:fatal!)
+      it "should terminate" do
+        expect(Chef::Application).to receive(:fatal!)
         app.reconfigure
       end
     end

data/spec/unit/application/solo_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -64,18 +64,13 @@ describe Chef::Application::Solo do
           end
 
           it "should terminate with message" do
-            expect(Chef::Application).to receive(:fatal!).with(
-              /Unforked .* interval runs are disabled by default\.
-Configuration settings:
-  interval  = 600 seconds
-Enable .* interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options\./
-            )
+            expect(Chef::Application).to receive(:fatal!).with(/interval runs are (disabled|not supported)/)
             app.reconfigure
           end
         end
       end
 
-      describe "when in daemonized mode and no interval has been set" do
+      describe "when in daemonized mode and no interval has been set", :unix_only do
         before do
           Chef::Config[:daemonize] = true
         end

data/spec/unit/application_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@junglist.gen.nz>)
 # Author:: Mark Mzyk (mmzyk@chef.io)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/cookbook/gem_installer_spec.rb

@@ -59,23 +59,25 @@ describe Chef::Cookbook::GemInstaller do
     expect(File).to receive(:open).and_yield(gemfile)
     expect(gemfile).to receive(:path).and_return("")
     expect(IO).to receive(:read).and_return("")
-    expect(gem_installer).to receive(:shell_out!).and_return(shell_out)
 
   end
 
   it "generates a valid Gemfile" do
+    expect(gem_installer).to receive(:shell_out!).and_return(shell_out)
     expect { gem_installer.install }.to_not raise_error
 
     expect { bundler_dsl }.to_not raise_error
   end
 
   it "generate a Gemfile with all constraints" do
+    expect(gem_installer).to receive(:shell_out!).and_return(shell_out)
     expect { gem_installer.install }.to_not raise_error
 
     expect(bundler_dsl.dependencies.find { |d| d.name == "httpclient" }.requirements_list.length).to eql(2)
   end
 
   it "generates a valid Gemfile when Chef::Config[:rubygems_url] is set to a String" do
+    expect(gem_installer).to receive(:shell_out!).and_return(shell_out)
     Chef::Config[:rubygems_url] = "https://www.rubygems.org"
     expect { gem_installer.install }.to_not raise_error
 
@@ -83,10 +85,29 @@ describe Chef::Cookbook::GemInstaller do
   end
 
   it "generates a valid Gemfile when Chef::Config[:rubygems_url] is set to an Array" do
+    expect(gem_installer).to receive(:shell_out!).and_return(shell_out)
     Chef::Config[:rubygems_url] = [ "https://www.rubygems.org" ]
 
     expect { gem_installer.install }.to_not raise_error
 
     expect(bundler_dsl.dependencies.find { |d| d.name == "httpclient" }.requirements_list.length).to eql(2)
   end
+
+  it "skip metadata installation when Chef::Config[:skip_gem_metadata_installation] is set to true" do
+    Chef::Config[:skip_gem_metadata_installation] = true
+    expect(gem_installer.install).to_not receive(:shell_out!)
+  end
+
+  it "install metadata when Chef::Config[:skip_gem_metadata_installation] is not true" do
+    expect(gem_installer).to receive(:shell_out!).and_return(shell_out)
+    expect(Chef::Log).to receive(:info).and_return("")
+    expect(gem_installer.install).to be_nil
+  end
+
+  it "install from local cache when Chef::Config[:gem_installer_bundler_options] is set to local" do
+    Chef::Config[:gem_installer_bundler_options] = "--local"
+    expect(gem_installer).to receive(:shell_out!).with(["bundle", "install", "--local"], any_args).and_return(shell_out)
+    expect(Chef::Log).to receive(:info).and_return("")
+    expect(gem_installer.install).to be_nil
+  end
 end

data/spec/unit/knife/bootstrap/train_connector_spec.rb

@@ -162,16 +162,29 @@ describe Chef::Knife::Bootstrap::TrainConnector do
         allow(SecureRandom).to receive(:alphanumeric).with(6).and_return(random)
       end
 
-      it "uses the *nix command to create the temp dir and sets ownership to logged-in user" do
-        expected_command = "mkdir -p #{dir} && sudo chown user1 '#{dir}'"
-        expect(subject).to receive(:run_command!).with(expected_command)
-          .and_return double("result", stdout: "\r\n")
-        expect(subject.temp_dir).to eq(dir)
+      context "uses the *nix command to create the temp dir and sets ownership to logged-in" do
+        it "with sudo privilege" do
+          subject.config[:sudo] = true
+          expected_command1 = "mkdir -p '#{dir}'"
+          expected_command2 = "chown user1 '#{dir}'"
+          expect(subject).to receive(:run_command!).with(expected_command1)
+            .and_return double("result", stdout: "\r\n")
+          expect(subject).to receive(:run_command!).with(expected_command2)
+            .and_return double("result", stdout: "\r\n")
+          expect(subject.temp_dir).to eq(dir)
+        end
+
+        it "without sudo privilege" do
+          expected_command = "mkdir -p '#{dir}'"
+          expect(subject).to receive(:run_command!).with(expected_command)
+            .and_return double("result", stdout: "\r\n")
+          expect(subject.temp_dir).to eq(dir)
+        end
       end
 
       context "with noise in stderr" do
-        it "uses the *nix command to create the temp dir and sets ownership to logged-in user" do
-          expected_command = "mkdir -p #{dir} && sudo chown user1 '#{dir}'"
+        it "uses the *nix command to create the temp dir" do
+          expected_command = "mkdir -p '#{dir}'"
           expect(subject).to receive(:run_command!).with(expected_command)
             .and_return double("result", stdout: "sudo: unable to resolve host hostname.localhost\r\n" + "#{dir}\r\n")
           expect(subject.temp_dir).to eq(dir)

data/spec/unit/knife/bootstrap_spec.rb

@@ -1021,7 +1021,6 @@ describe Chef::Knife::Bootstrap do
                 verify_host_key: nil,
                 port: 9999,
                 non_interactive: true,
-                pty: true,
               }
             end
 
@@ -1076,7 +1075,6 @@ describe Chef::Knife::Bootstrap do
                 verify_host_key: nil, # Config
                 port: 12, # cli
                 non_interactive: true,
-                pty: true,
               }
             end
 
@@ -1128,7 +1126,6 @@ describe Chef::Knife::Bootstrap do
                 sudo_password: "blah",
                 verify_host_key: true,
                 non_interactive: true,
-                pty: true,
               }
             end
             it "generates a config hash using the CLI options and pulling nothing from Chef::Config" do
@@ -1152,7 +1149,6 @@ describe Chef::Knife::Bootstrap do
               sudo: false,
               verify_host_key: "always",
               non_interactive: true,
-              pty: true,
               connection_timeout: 60,
             }
           end
@@ -1504,7 +1500,6 @@ describe Chef::Knife::Bootstrap do
       let(:default_opts) do
         {
           non_interactive: true,
-          pty: true,
           forward_agent: false,
           connection_timeout: 60,
         }
@@ -2003,6 +1998,19 @@ describe Chef::Knife::Bootstrap do
       expect(connection).to receive(:connect!)
       knife.do_connect({})
     end
+
+    context "when sshd confgiured with requiretty" do
+      let(:pty_err_msg) { "Sudo requires a TTY. Please see the README on how to configure sudo to allow for non-interactive usage." }
+      let(:expected_error) { Train::UserError.new(pty_err_msg, :sudo_no_tty) }
+      before do
+        allow(connection).to receive(:connect!).and_raise(expected_error)
+      end
+      it "retry with pty true request option" do
+        expect(Chef::Knife::Bootstrap::TrainConnector).to receive(:new).and_return(connection).exactly(2).times
+        expect(knife.ui).to receive(:warn).with("#{pty_err_msg} - trying with pty request")
+        expect { knife.do_connect({}) }.to raise_error(expected_error)
+      end
+    end
   end
 
   describe "validate_winrm_transport_opts!" do

data/spec/unit/provider/ifconfig_spec.rb

@@ -94,6 +94,17 @@ describe Chef::Provider::Ifconfig do
       expect(@new_resource).not_to be_updated
     end
 
+    it "should add a bridge interface" do
+      allow(@provider).to receive(:load_current_resource)
+      @new_resource.device "br-1234"
+      command = "ifconfig br-1234 10.0.0.1 netmask 255.255.254.0 metric 1 mtu 1500"
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
+      expect(@provider).to receive(:generate_config)
+
+      @provider.run_action(:add)
+      expect(@new_resource).to be_updated
+    end
+
     # We are not testing this case with the assumption that anyone writing the cookbook would not make a typo == lo
     # it "should add a blank command if the #{@new_resource.device} == lo" do
     # end

data/spec/unit/provider/package/chocolatey_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software, Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,7 +46,7 @@ describe Chef::Provider::Package::Chocolatey do
     allow(provider).to receive(:choco_install_path).and_return(choco_install_path)
     allow(provider).to receive(:choco_exe).and_return(choco_exe)
     local_list_obj = double(stdout: local_list_stdout)
-    allow(provider).to receive(:shell_out_compacted!).with("#{choco_exe} list -l -r", { returns: [0], timeout: timeout }).and_return(local_list_obj)
+    allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-l", "-r", { returns: [0], timeout: timeout }).and_return(local_list_obj)
   end
 
   def allow_remote_list(package_names, args = nil)
@@ -60,7 +60,11 @@ describe Chef::Provider::Package::Chocolatey do
     EOF
     remote_list_obj = double(stdout: remote_list_stdout)
     package_names.each do |pkg|
-      allow(provider).to receive(:shell_out_compacted!).with("#{choco_exe} list -r #{pkg}#{args}", { returns: [0], timeout: timeout }).and_return(remote_list_obj)
+      if args
+        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, *args, { returns: [0], timeout: timeout }).and_return(remote_list_obj)
+      else
+        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, { returns: [0], timeout: timeout }).and_return(remote_list_obj)
+      end
     end
   end
 
@@ -182,7 +186,7 @@ describe Chef::Provider::Package::Chocolatey do
     it "should install a single package" do
       allow_remote_list(["git"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -193,7 +197,7 @@ describe Chef::Provider::Package::Chocolatey do
         allow_remote_list(["git"])
         new_resource.timeout(timeout)
         provider.load_current_resource
-        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { returns: [0], timeout: timeout }).and_return(double)
+        expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "git", { returns: [0], timeout: timeout }).and_return(double)
         provider.run_action(:install)
         expect(new_resource).to be_updated_by_last_action
       end
@@ -222,7 +226,7 @@ describe Chef::Provider::Package::Chocolatey do
       new_resource.package_name("ConEmu")
       new_resource.version("15.10.25.1")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "--version", "15.10.25.1", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -235,7 +239,7 @@ describe Chef::Provider::Package::Chocolatey do
       new_resource.package_name(%w{chocolatey ConEmu})
       new_resource.version([nil, "15.10.25.1"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "--version", "15.10.25.1", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -245,7 +249,7 @@ describe Chef::Provider::Package::Chocolatey do
       new_resource.package_name("conemu")
       new_resource.version("15.10.25.1")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "--version", "15.10.25.1", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -255,8 +259,8 @@ describe Chef::Provider::Package::Chocolatey do
       new_resource.package_name(%w{ConEmu git})
       new_resource.version(["15.10.25.1", nil])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y --version 15.10.25.1 conemu", { returns: [0], timeout: timeout }).and_return(double)
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "--version", "15.10.25.1", "conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -265,27 +269,27 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(%w{git munin-node})
       new_resource.package_name(%w{git munin-node})
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y git munin-node", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "git", "munin-node", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
 
     context "when passing a source argument" do
       it "should pass options into the install command" do
-        allow_remote_list(["git"], " -source localpackages")
+        allow_remote_list(["git"], ["-source", "localpackages"])
         new_resource.source("localpackages")
         provider.load_current_resource
-        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -source localpackages git", { returns: [0], timeout: timeout }).and_return(double)
+        expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "-source", "localpackages", "git", { returns: [0], timeout: timeout }).and_return(double)
         provider.run_action(:install)
         expect(new_resource).to be_updated_by_last_action
       end
     end
 
     it "should pass options into the install command" do
-      allow_remote_list(["git"], " -force")
+      allow_remote_list(["git"], "-force")
       new_resource.options("-force")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -force git", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "-force", "git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:install)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -306,7 +310,7 @@ describe Chef::Provider::Package::Chocolatey do
 
     context "alternate source" do
       it "installing a package that does not exist throws an error" do
-        allow_remote_list(["package-does-not-exist"], " -source alternate_source")
+        allow_remote_list(["package-does-not-exist"], ["-source", "alternate_source"])
         new_resource.package_name("package-does-not-exist")
         new_resource.source("alternate_source")
         provider.load_current_resource
@@ -316,7 +320,7 @@ describe Chef::Provider::Package::Chocolatey do
 
     context "private source" do
       it "installing a package without auth options throws an error" do
-        allow_remote_list(["package-without-auth"], " -source auth_source")
+        allow_remote_list(["package-without-auth"], ["-source", "auth_source"])
         new_resource.package_name("package-without-auth")
         new_resource.source("auth_source")
         provider.load_current_resource
@@ -324,7 +328,7 @@ describe Chef::Provider::Package::Chocolatey do
       end
 
       it "installing a package with invalid credentials throws an error" do
-        allow_remote_list(["package-invalid-auth"], " -source auth_source -u user -p password")
+        allow_remote_list(["package-invalid-auth"], [ "-source", "auth_source", "-u user -p password"])
         new_resource.package_name("package-invalid-auth")
         new_resource.source("auth_source")
         new_resource.options("-u user -p password")
@@ -333,11 +337,11 @@ describe Chef::Provider::Package::Chocolatey do
       end
 
       it "installing a package with valid credentials" do
-        allow_remote_list(["git"], " -source auth_source -u user -p password")
+        allow_remote_list(["git"], [ "-source", "auth_source", "-u user -p password" ])
         new_resource.source("auth_source")
         new_resource.options("-u user -p password")
         provider.load_current_resource
-        expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} install -y -u user -p password -source auth_source git", { returns: [0], timeout: timeout }).and_return(double)
+        expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "install", "-y", "-u user -p password", "-source", "auth_source", "git", { returns: [0], timeout: timeout }).and_return(double)
         provider.run_action(:install)
         expect(new_resource).to be_updated_by_last_action
       end
@@ -348,7 +352,7 @@ describe Chef::Provider::Package::Chocolatey do
     it "should install a package that is not installed" do
       allow_remote_list(["git"])
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y git", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "upgrade", "-y", "git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -357,7 +361,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(["ConEmu"])
       new_resource.package_name("ConEmu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "upgrade", "-y", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -366,7 +370,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(["conemu"])
       new_resource.package_name("conemu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "upgrade", "-y", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -375,7 +379,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(["chocolatey"])
       new_resource.package_name("chocolatey")
       provider.load_current_resource
-      expect(provider).not_to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y chocolatey", { returns: [0], timeout: timeout })
+      expect(provider).not_to receive(:shell_out_compacted!).with(choco_exe, "upgrade", "-y", "chocolatey", { returns: [0], timeout: timeout })
       provider.run_action(:upgrade)
       expect(new_resource).not_to be_updated_by_last_action
     end
@@ -384,7 +388,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(["git"])
       new_resource.version("2.6.2")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y --version 2.6.2 git", { returns: [0], timeout: timeout })
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "upgrade", "-y", "--version", "2.6.2", "git", { returns: [0], timeout: timeout })
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -392,7 +396,7 @@ describe Chef::Provider::Package::Chocolatey do
     it "upgrading multiple packages uses a single command" do
       allow_remote_list(%w{conemu git})
       new_resource.package_name(%w{conemu git})
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} upgrade -y conemu git", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "upgrade", "-y", "conemu", "git", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:upgrade)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -413,7 +417,7 @@ describe Chef::Provider::Package::Chocolatey do
 
     context "alternate source" do
       it "installing a package that does not exist throws an error" do
-        allow_remote_list(["package-does-not-exist"], " -source alternate_source")
+        allow_remote_list(["package-does-not-exist"], ["-source", "alternate_source"])
         new_resource.package_name("package-does-not-exist")
         new_resource.source("alternate_source")
         provider.load_current_resource
@@ -444,7 +448,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(["ConEmu"])
       new_resource.package_name("ConEmu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y ConEmu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "uninstall", "-y", "ConEmu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -453,7 +457,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(["conemu"])
       new_resource.package_name("conemu")
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "uninstall", "-y", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end
@@ -463,7 +467,7 @@ describe Chef::Provider::Package::Chocolatey do
       allow_remote_list(%w{git conemu})
       new_resource.package_name(%w{git conemu})
       provider.load_current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("#{choco_exe} uninstall -y conemu", { returns: [0], timeout: timeout }).and_return(double)
+      expect(provider).to receive(:shell_out_compacted!).with(choco_exe, "uninstall", "-y", "conemu", { returns: [0], timeout: timeout }).and_return(double)
       provider.run_action(:remove)
       expect(new_resource).to be_updated_by_last_action
     end