chef 16.5.64-universal-mingw32 → 16.8.14-universal-mingw32

data/spec/unit/knife/client_create_spec.rb

@@ -81,7 +81,7 @@ describe Chef::Knife::ClientCreate do
 
         it "prints a relevant error message" do
           expect { knife.run }.to raise_error(SystemExit)
-          expect(stderr.string).to match /You cannot pass --public-key and --prevent-keygen/
+          expect(stderr.string).to match(/You cannot pass --public-key and --prevent-keygen/)
         end
       end
 
@@ -93,7 +93,7 @@ describe Chef::Knife::ClientCreate do
       it "should print a message upon creation" do
         expect(knife).to receive(:create_client)
         knife.run
-        expect(stderr.string).to match /Created client.*adam/i
+        expect(stderr.string).to match(/Created client.*adam/i)
       end
 
       it "should set the Client name" do

data/spec/unit/knife/configure_client_spec.rb

@@ -59,21 +59,21 @@ describe Chef::Knife::ConfigureClient do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
         expect(@client_file.string).to match %r{chef_server_url\s+'https\://chef\.example\.com'}
-        expect(@client_file.string).to match /validation_client_name\s+'chef-validator'/
+        expect(@client_file.string).to match(/validation_client_name\s+'chef-validator'/)
       end
 
       it "should write out the validation.pem file" do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
-        expect(@validation_file.string).to match /foo_bar_baz/
+        expect(@validation_file.string).to match(/foo_bar_baz/)
       end
 
       it "should print information on what is being configured" do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
-        expect(@stderr.string).to match /creating client configuration/i
-        expect(@stderr.string).to match /writing client\.rb/i
-        expect(@stderr.string).to match /writing validation\.pem/i
+        expect(@stderr.string).to match(/creating client configuration/i)
+        expect(@stderr.string).to match(/writing client\.rb/i)
+        expect(@stderr.string).to match(/writing validation\.pem/i)
       end
     end
   end

data/spec/unit/knife/configure_spec.rb

@@ -157,9 +157,9 @@ describe Chef::Knife::Configure do
     expect(::File).to receive(:open).with("/home/you/.chef/credentials", "w").and_yield config_file
     @knife.config[:repository] = "/home/you/chef-repo"
     @knife.run
-    expect(config_file.string).to match(/^client_name[\s]+=[\s]+'#{Etc.getlogin}'$/)
-    expect(config_file.string).to match(%r{^client_key[\s]+=[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
-    expect(config_file.string).to match(/^chef_server_url\s+=[\s]+'#{default_server_url}'$/)
+    expect(config_file.string).to match(/^client_name\s+=\s+'#{Etc.getlogin}'$/)
+    expect(config_file.string).to match(%r{^client_key\s+=\s+'/home/you/.chef/#{Etc.getlogin}.pem'$})
+    expect(config_file.string).to match(/^chef_server_url\s+=\s+'#{default_server_url}'$/)
   end
 
   it "creates a new client when given the --initial option" do

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -152,7 +152,7 @@ describe Chef::Knife::CookbookDelete do
 
       it "should print an error" do
         @knife.available_versions
-        expect(@stderr.string).to match /error.+cannot find a cookbook named foobar/i
+        expect(@stderr.string).to match(/error.+cannot find a cookbook named foobar/i)
       end
 
       it "should return nil" do
@@ -204,7 +204,7 @@ describe Chef::Knife::CookbookDelete do
     it "should output that the cookbook was deleted" do
       allow(@knife).to receive(:delete_request)
       @knife.delete_version_without_confirmation("1.0.0")
-      expect(@stderr.string).to match /deleted cookbook\[foobar\]\[1.0.0\]/im
+      expect(@stderr.string).to match(/deleted cookbook\[foobar\]\[1.0.0\]/im)
     end
 
     describe "with --print-after" do

data/spec/unit/knife/cookbook_download_spec.rb

@@ -138,9 +138,9 @@ describe Chef::Knife::CookbookDownload do
             expect(File).to receive(:exist?).with("/var/tmp/chef/foobar-1.0.0").and_return(false)
             @knife.run
             %w{attributes recipes templates}.each do |segment|
-              expect(@stderr.string).to match /downloading #{segment}/im
+              expect(@stderr.string).to match(/downloading #{segment}/im)
             end
-            expect(@stderr.string).to match /downloading foobar cookbook version 1\.0\.0/im
+            expect(@stderr.string).to match(/downloading foobar cookbook version 1\.0\.0/im)
             expect(@stderr.string).to match %r{cookbook downloaded to /var/tmp/chef/foobar-1\.0\.0}im
           end
 

data/spec/unit/knife/cookbook_list_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife::CookbookList do
         .and_return(@cookbook_data)
       @knife.run
       @cookbook_names.each do |item|
-        expect(@stdout.string).to match /#{item}\s+1\.0\.1/
+        expect(@stdout.string).to match(/#{item}\s+1\.0\.1/)
       end
     end
 
@@ -79,7 +79,7 @@ describe Chef::Knife::CookbookList do
           .and_return(@cookbook_data)
         @knife.run
         @cookbook_names.each do |item|
-          expect(@stdout.string).to match /#{item}\s+1\.0\.1\s+1\.0\.0/
+          expect(@stdout.string).to match(/#{item}\s+1\.0\.1\s+1\.0\.0/)
         end
       end
     end

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -145,20 +145,20 @@ describe Chef::Knife::CookbookMetadata do
       create_metadata_rb(name: "foobar", version: "1.0.0", depends: [ "foo:bar", ">> 0.2" ])
       expect(Chef::Cookbook::Metadata).not_to receive(:validate_json)
       expect { knife.run }.to raise_error(SystemExit)
-      expect(stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
+      expect(stderr.string).to match(/error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im)
     end
 
     it "should fail for obsolete format in metadata.rb (sadly)" do
       create_metadata_rb(name: "foobar", version: "1.0.0", depends: [ "foo:bar", "> 0.2", "< 1.0" ])
       expect(Chef::Cookbook::Metadata).not_to receive(:validate_json)
       expect { knife.run }.to raise_error(SystemExit)
-      expect(stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
+      expect(stderr.string).to match(/error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im)
     end
 
     it "should fail for obsolete operators in metadata.json" do
       create_metadata_json(name: "foobar", version: "1.0.0", dependencies: { "foo:bar" => ">> 0.2" })
       expect { knife.run }.to raise_error(SystemExit)
-      expect(stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
+      expect(stderr.string).to match(/error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im)
     end
 
     it "should not fail for unknown field in metadata.rb" do

data/spec/unit/knife/core/node_editor_spec.rb

@@ -74,7 +74,7 @@ describe Chef::Knife::NodeEditor do
 
         expect(ui).to have_received(:warn)
           .with "Changing the name of a node results in a new node being " +
-          "created, test_node will not be modified or removed."
+            "created, test_node will not be modified or removed."
 
         expect(ui).to have_received(:confirm)
           .with("Proceed with creation of new node")

data/spec/unit/knife/environment_compare_spec.rb

@@ -62,7 +62,7 @@ describe Chef::Knife::EnvironmentCompare do
       @knife.config[:format] = "summary"
       @knife.run
       @environments.each_key do |item|
-        expect(@stdout.string).to(match /#{item}/) && expect(@stdout.string.lines.count).to(be 4)
+        expect(@stdout.string).to(match(/#{item}/)) && expect(@stdout.string.lines.count).to(be 4)
       end
     end
 
@@ -79,7 +79,7 @@ describe Chef::Knife::EnvironmentCompare do
       @knife.config[:mismatch] = true
       @knife.run
       @constraints.each_value do |ver|
-        expect(@stdout.string).to match /#{ver[1]}/
+        expect(@stdout.string).to match(/#{ver[1]}/)
       end
     end
 
@@ -97,7 +97,7 @@ describe Chef::Knife::EnvironmentCompare do
       @knife.config[:all] = true
       @knife.run
       @constraints.each_value do |ver|
-        expect(@stdout.string).to match /#{ver[1]}/
+        expect(@stdout.string).to match(/#{ver[1]}/)
       end
     end
 

data/spec/unit/knife/supermarket_download_spec.rb

@@ -86,8 +86,8 @@ describe Chef::Knife::SupermarketDownload do
               .with(/.+deprecated.+replaced by other_apache2.+/i)
             expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
             @knife.run
-            expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+            expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+            expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
           end
 
         end
@@ -95,8 +95,8 @@ describe Chef::Knife::SupermarketDownload do
         it "should download the latest version" do
           expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+          expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+          expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
         end
 
         context "with -f or --file" do
@@ -108,8 +108,8 @@ describe Chef::Knife::SupermarketDownload do
 
           it "should download the cookbook to the desired file" do
             @knife.run
-            expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+            expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+            expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
           end
         end
 
@@ -140,8 +140,8 @@ describe Chef::Knife::SupermarketDownload do
             .and_return(@temp_file)
           expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+          expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+          expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
         end
       end
 

data/spec/unit/knife/supermarket_list_spec.rb

@@ -52,7 +52,7 @@ describe Chef::Knife::SupermarketList do
     it "should display all supermarket cookbooks" do
       knife.run
       cookbooks_data.each do |item|
-        expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+        expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
       end
     end
 
@@ -61,8 +61,8 @@ describe Chef::Knife::SupermarketList do
         knife.config[:with_uri] = true
         knife.run
         cookbooks_data.each do |item|
-          expect(stdout.string).to match /#{item["cookbook_name"]}\s/
-          expect(stdout.string).to match /#{item["cookbook"]}\s/
+          expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
+          expect(stdout.string).to match(/#{item["cookbook"]}\s/)
         end
       end
     end

data/spec/unit/knife/supermarket_search_spec.rb

@@ -65,7 +65,7 @@ describe Chef::Knife::SupermarketSearch do
         knife.name_args = ["mysql"]
         knife.run
         cookbooks_data.each do |item|
-          expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+          expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
         end
       end
     end

data/spec/unit/knife/tag_create_spec.rb

@@ -17,7 +17,7 @@ describe Chef::Knife::TagCreate do
     it "can create tags on a node" do
       @knife.run
       expect(@node.tags).to eq(["happytag"])
-      expect(@stderr.string).to match /created tags happytag.+node webmonkey.example.com/i
+      expect(@stderr.string).to match(/created tags happytag.+node webmonkey.example.com/i)
     end
   end
 end

data/spec/unit/knife/tag_delete_spec.rb

@@ -19,7 +19,7 @@ describe Chef::Knife::TagDelete do
       expect(@node.tags).to eq(%w{sadtag happytag})
       @knife.run
       expect(@node.tags).to eq(["happytag"])
-      expect(@stderr.string).to match /deleted.+sadtag/i
+      expect(@stderr.string).to match(/deleted.+sadtag/i)
     end
   end
 end

data/spec/unit/knife/user_create_spec.rb

@@ -112,7 +112,7 @@ describe Chef::Knife::UserCreate do
 
       it "prints a relevant error message" do
         expect { knife.run }.to raise_error(SystemExit)
-        expect(stderr.string).to match /You cannot pass --user-key and --prevent-keygen/
+        expect(stderr.string).to match(/You cannot pass --user-key and --prevent-keygen/)
       end
     end
 

data/spec/unit/mixin/powershell_exec_spec.rb

@@ -19,13 +19,42 @@
 require "spec_helper"
 require "chef/mixin/powershell_exec"
 
-describe Chef::Mixin::PowershellExec, :windows_only, :windows_gte_10 do
+describe Chef::Mixin::PowershellExec, :windows_only do
   let(:powershell_mixin) { Class.new { include Chef::Mixin::PowershellExec } }
   subject(:object) { powershell_mixin.new }
 
   describe "#powershell_exec" do
-    it "runs a basic command and returns a Chef::PowerShell object" do
-      expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
+    context "not specifying an interpreter" do
+      it "runs a basic command and returns a Chef::PowerShell object" do
+        expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
+      end
+
+      it "uses less than version 6" do
+        execution = object.powershell_exec("$PSVersionTable")
+        expect(execution.result["PSVersion"].to_s.to_i).to be < 6
+      end
+    end
+
+    context "using pwsh interpreter" do
+      it "runs a basic command and returns a Chef::PowerShell object" do
+        expect(object.powershell_exec("$PSVersionTable", :pwsh)).to be_kind_of(Chef::Pwsh)
+      end
+
+      it "uses greater than version 6" do
+        execution = object.powershell_exec("$PSVersionTable", :pwsh)
+        expect(execution.result["PSVersion"]["Major"]).to be > 6
+      end
+    end
+
+    context "using powershell interpreter" do
+      it "runs a basic command and returns a Chef::PowerShell object" do
+        expect(object.powershell_exec("$PSVersionTable", :powershell)).to be_kind_of(Chef::PowerShell)
+      end
+
+      it "uses less than version 6" do
+        execution = object.powershell_exec("$PSVersionTable", :powershell)
+        expect(execution.result["PSVersion"].to_s.to_i).to be < 6
+      end
     end
 
     it "runs a command that fails with a non-terminating error and can trap the error via .error?" do
@@ -37,7 +66,11 @@ describe Chef::Mixin::PowershellExec, :windows_only, :windows_gte_10 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("Runtime exception: this-should-error")
+      expect(execution.errors[0]).to include("The term 'this-should-error' is not recognized")
+    end
+
+    it "raises an error if the interpreter is invalid" do
+      expect { object.powershell_exec("this-should-error", :powerfart) }.to raise_error(ArgumentError)
     end
   end
 
@@ -49,5 +82,9 @@ describe Chef::Mixin::PowershellExec, :windows_only, :windows_gte_10 do
     it "raises an error if the command fails" do
       expect { object.powershell_exec!("this-should-error") }.to raise_error(Chef::PowerShell::CommandFailed)
     end
+
+    it "raises an error if the interpreter is invalid" do
+      expect { object.powershell_exec!("this-should-error", :powerfart) }.to raise_error(ArgumentError)
+    end
   end
 end

data/spec/unit/mixin/powershell_out_spec.rb

@@ -44,6 +44,20 @@ describe Chef::Mixin::PowershellOut, :windows_only do
       expect(object.powershell_out("Get-Process", timeout: 600)).to eql(ret)
     end
 
+    it "uses pwsh.exe when given :pwsh interpreter" do
+      ret = double("Mixlib::ShellOut")
+      expect(object).to receive(:shell_out).with(
+        "pwsh.exe #{flags} -Command \"Get-Process\"",
+        timeout: 600
+      ).and_return(ret)
+      expect(object.powershell_out("Get-Process", :pwsh, timeout: 600)).to eql(ret)
+    end
+
+    it "raises error if interpreter is invalid" do
+      ret = double("Mixlib::ShellOut")
+      expect { object.powershell_out("Get-Process", :blah, timeout: 600) }.to raise_error(ArgumentError)
+    end
+
     context "when double quote is passed in the powershell command" do
       it "passes if double quote is appended with single escape" do
         result = object.powershell_out("Write-Verbose \"Some String\" -Verbose")

data/spec/unit/mixin/which.rb

@@ -93,7 +93,7 @@ describe Chef::Mixin::Which do
       end
 
       test_which("arrays with blocks", "foo1", "foo2", finds: "/dir2/foo1", others: [ "/dir1/foo2" ]) do |f|
-        raise "bad arg to block" unless f == "/dir2/foo1" || f == "/dir1/foo2"
+        raise "bad arg to block" unless ["/dir2/foo1", "/dir1/foo2"].include?(f)
 
         true
       end

data/spec/unit/platform/query_helpers_spec.rb

@@ -41,24 +41,23 @@ end
 
 describe "Chef::Platform#dsc_refresh_mode_disabled?" do
   let(:node) { instance_double("Chef::Node") }
-  let(:cmdlet) { instance_double("Chef::Util::Powershell::Cmdlet") }
-  let(:cmdlet_result) { instance_double("Chef::Util::Powershell::CmdletResult") }
+  let(:powershell) { instance_double("Chef::PowerShell") }
 
   it "returns true when RefreshMode is Disabled" do
-    expect(Chef::Util::Powershell::Cmdlet).to receive(:new)
-      .with(node, "Get-DscLocalConfigurationManager", :object)
-      .and_return(cmdlet)
-    expect(cmdlet).to receive(:run!).and_return(cmdlet_result)
-    expect(cmdlet_result).to receive(:return_value).and_return({ "RefreshMode" => "Disabled" })
+    expect(Chef::PowerShell).to receive(:new)
+      .with("Get-DscLocalConfigurationManager")
+      .and_return(powershell)
+    expect(powershell).to receive(:error!)
+    expect(powershell).to receive(:result).and_return({ "RefreshMode" => "Disabled" })
     expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be true
   end
 
   it "returns false when RefreshMode is not Disabled" do
-    expect(Chef::Util::Powershell::Cmdlet).to receive(:new)
-      .with(node, "Get-DscLocalConfigurationManager", :object)
-      .and_return(cmdlet)
-    expect(cmdlet).to receive(:run!).and_return(cmdlet_result)
-    expect(cmdlet_result).to receive(:return_value).and_return({ "RefreshMode" => "LaLaLa" })
+    expect(Chef::PowerShell).to receive(:new)
+      .with("Get-DscLocalConfigurationManager")
+      .and_return(powershell)
+    expect(powershell).to receive(:error!)
+    expect(powershell).to receive(:result).and_return({ "RefreshMode" => "LaLaLa" })
     expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be false
   end
 end

data/spec/unit/provider/dsc_resource_spec.rb

@@ -85,14 +85,13 @@ describe Chef::Provider::DscResource do
       node.automatic[:languages][:powershell][:version] = "5.0.10018.0"
       node
     end
-    let(:resource_result) { double("CmdletResult", return_value: { "InDesiredState" => true }, stream: "description") }
-    let(:invoke_dsc_resource) { double("cmdlet", run!: resource_result) }
+    let(:resource_result) { double("PowerShell", result: { "InDesiredState" => true }, verbose: ["description"]) }
     let(:store) { double("ResourceStore", find: resource_records) }
     let(:resource_records) { [] }
 
     before do
       allow(Chef::Util::DSC::ResourceStore).to receive(:instance).and_return(store)
-      allow(Chef::Util::Powershell::Cmdlet).to receive(:new).and_return(invoke_dsc_resource)
+      allow(provider).to receive(:powershell_exec!).and_return(resource_result)
       allow(provider).to receive(:dsc_refresh_mode_disabled?).and_return(true)
     end
 
@@ -112,9 +111,8 @@ describe Chef::Provider::DscResource do
     it "flags the resource as reboot required when required" do
       expect(provider).to receive(:test_resource).and_return(false)
       expect(provider).to receive(:invoke_resource)
-        .and_return(double(stdout: "", return_value: nil))
+        .and_return(double(result: { "RebootRequired" => true }))
       expect(provider).to receive(:add_dsc_verbose_log)
-      expect(provider).to receive(:return_dsc_resource_result).and_return(true)
       expect(provider).to receive(:create_reboot_resource)
       provider.run_action(:run)
     end
@@ -122,9 +120,8 @@ describe Chef::Provider::DscResource do
     it "does not flag the resource as reboot required when not required" do
       expect(provider).to receive(:test_resource).and_return(false)
       expect(provider).to receive(:invoke_resource)
-        .and_return(double(stdout: "", return_value: nil))
+        .and_return(double(stdout: "", result: {}))
       expect(provider).to receive(:add_dsc_verbose_log)
-      expect(provider).to receive(:return_dsc_resource_result).and_return(false)
       expect(provider).to_not receive(:create_reboot_resource)
       provider.run_action(:run)
     end
@@ -142,9 +139,7 @@ describe Chef::Provider::DscResource do
         let(:resource_records) { [{}] }
 
         it "returns the default dsc resource module" do
-          expect(Chef::Util::Powershell::Cmdlet).to receive(:new) do |node, cmdlet, format|
-            expect(cmdlet).to match(/Module PSDesiredStateConfiguration /)
-          end.and_return(invoke_dsc_resource)
+          expect(provider).to receive(:powershell_exec!).with(/Module PSDesiredStateConfiguration /).and_return(resource_result)
           provider.run_action(:run)
         end
       end
@@ -153,9 +148,7 @@ describe Chef::Provider::DscResource do
         let(:resource_records) { [{ "Module" => { "Name" => "ModuleName" } }] }
 
         it "returns the default dsc resource module" do
-          expect(Chef::Util::Powershell::Cmdlet).to receive(:new) do |node, cmdlet, format|
-            expect(cmdlet).to match(/Module ModuleName /)
-          end.and_return(invoke_dsc_resource)
+          expect(provider).to receive(:powershell_exec!).with(/Module ModuleName /).and_return(resource_result)
           provider.run_action(:run)
         end
       end
@@ -286,8 +279,6 @@ describe Chef::Provider::DscResource do
   end
 
   describe "invoke_resource" do
-    let(:cmdlet) { double(run!: nil) }
-
     before(:each) do
       allow(provider).to receive(:translate_type).and_return("my_properties")
       provider.instance_variable_set(:@new_resource, double(
@@ -301,12 +292,8 @@ describe Chef::Provider::DscResource do
       end
 
       it "invokes Invoke-DscResource command with module name" do
-        expect(Chef::Util::Powershell::Cmdlet).to receive(:new).with(
-          node,
-          "Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module my_module -Verbose",
-          "my_output_format"
-        ).and_return(cmdlet)
-        provider.send(:invoke_resource, "my_method", "my_output_format")
+        expect(provider).to receive(:powershell_exec!).with("Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module my_module -Verbose").and_return(nil)
+        provider.send(:invoke_resource, "my_method")
       end
     end
 
@@ -318,12 +305,8 @@ describe Chef::Provider::DscResource do
       end
 
       it "invokes Invoke-DscResource command with module info object" do
-        expect(Chef::Util::Powershell::Cmdlet).to receive(:new).with(
-          node,
-          "Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module @{ModuleName='my_module';ModuleVersion='my_module_version'} -Verbose",
-          "my_output_format"
-        ).and_return(cmdlet)
-        provider.send(:invoke_resource, "my_method", "my_output_format")
+        expect(provider).to receive(:powershell_exec!).with("Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module @{ModuleName='my_module';ModuleVersion='my_module_version'} -Verbose").and_return(nil)
+        provider.send(:invoke_resource, "my_method")
       end
     end
   end