diff options
author | Bryan McLellan <btm@loftninjas.org> | 2016-10-05 12:35:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-05 12:35:23 -0400 |
commit | 742ff23beb39383b0e55eb3e7fde766face6f4a5 (patch) | |
tree | 43eb6d23af5f7b0c4011385574f9f4f222336707 /spec | |
parent | 1cdd613855778050dee83fbc17cced869e9a7c5c (diff) | |
parent | af13c7a425e990232d6ff0a1739ff81ed12b55cd (diff) | |
download | chef-742ff23beb39383b0e55eb3e7fde766face6f4a5.tar.gz |
Merge pull request #5381 from MsysTechnologiesllc/nim/double_quotes_parsing_error
Handling double quotes in powershell_out
Diffstat (limited to 'spec')
-rw-r--r-- | spec/functional/mixin/powershell_out_spec.rb | 6 | ||||
-rw-r--r-- | spec/unit/mixin/powershell_out_spec.rb | 45 |
2 files changed, 14 insertions, 37 deletions
diff --git a/spec/functional/mixin/powershell_out_spec.rb b/spec/functional/mixin/powershell_out_spec.rb index 66214cb0c7..31bf397569 100644 --- a/spec/functional/mixin/powershell_out_spec.rb +++ b/spec/functional/mixin/powershell_out_spec.rb @@ -25,10 +25,6 @@ describe Chef::Mixin::PowershellOut, windows_only: true do it "runs a powershell command and collects stdout" do expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/ end - - it "does not raise exceptions when the command is invalid" do - powershell_out("this-is-not-a-valid-command").run_command - end end describe "#powershell_out!" do @@ -37,7 +33,7 @@ describe Chef::Mixin::PowershellOut, windows_only: true do end it "raises exceptions when the command is invalid" do - expect { powershell_out!("this-is-not-a-valid-command").run_command }.to raise_exception(Mixlib::ShellOut::ShellCommandFailed) + expect { powershell_out!("this-is-not-a-valid-command").run_command }.to raise_error(Mixlib::ShellOut::ShellCommandFailed) end end end diff --git a/spec/unit/mixin/powershell_out_spec.rb b/spec/unit/mixin/powershell_out_spec.rb index 8e5f3588ce..9524557c4c 100644 --- a/spec/unit/mixin/powershell_out_spec.rb +++ b/spec/unit/mixin/powershell_out_spec.rb @@ -18,7 +18,7 @@ require "spec_helper" require "chef/mixin/powershell_out" -describe Chef::Mixin::PowershellOut do +describe Chef::Mixin::PowershellOut, :windows_only do let(:shell_out_class) { Class.new { include Chef::Mixin::PowershellOut } } subject(:object) { shell_out_class.new } let(:architecture) { "something" } @@ -28,43 +28,24 @@ describe Chef::Mixin::PowershellOut do describe "#powershell_out" do it "runs a command and returns the shell_out object" do - ret = double("Mixlib::ShellOut") - expect(object).to receive(:shell_out).with( - "powershell.exe #{flags} -Command \"Get-Process\"", - {} - ).and_return(ret) - expect(object.powershell_out("Get-Process")).to eql(ret) + result = object.powershell_out("Get-Process") + expect(result.stderr).to be == "" end it "passes options" do - ret = double("Mixlib::ShellOut") - expect(object).to receive(:shell_out).with( - "powershell.exe #{flags} -Command \"Get-Process\"", - timeout: 600 - ).and_return(ret) - expect(object.powershell_out("Get-Process", timeout: 600)).to eql(ret) + result = object.powershell_out("Get-Process", timeout: 600) + expect(result.stderr).to be == "" end - end - describe "#powershell_out!" do - it "runs a command and returns the shell_out object" do - mixlib_shellout = double("Mixlib::ShellOut") - expect(object).to receive(:shell_out).with( - "powershell.exe #{flags} -Command \"Get-Process\"", - {} - ).and_return(mixlib_shellout) - expect(mixlib_shellout).to receive(:error!) - expect(object.powershell_out!("Get-Process")).to eql(mixlib_shellout) - 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") + expect(result.stderr).to be == "" + end - it "passes options" do - mixlib_shellout = double("Mixlib::ShellOut") - expect(object).to receive(:shell_out).with( - "powershell.exe #{flags} -Command \"Get-Process\"", - timeout: 600 - ).and_return(mixlib_shellout) - expect(mixlib_shellout).to receive(:error!) - expect(object.powershell_out!("Get-Process", timeout: 600)).to eql(mixlib_shellout) + it "raises error if double quote is passed with double escape characters" do + expect { object.powershell_out("Write-Verbose \\\"Some String\\\" -Verbose") }.to raise_error(Mixlib::ShellOut::ShellCommandFailed) + end end end end |