summaryrefslogtreecommitdiff
path: root/spec/unit/provider/subversion_spec.rb
diff options
context:
space:
mode:
authorNitz <nitz.raz@gmail.com>2014-12-14 11:32:54 +0200
committerNitz <nitz.raz@gmail.com>2014-12-14 17:04:01 +0200
commit7b26c360c4b8ad5206bcdf44e7a63fdf9b12df3a (patch)
tree51916ddff94f42c92ddbf5ea7d0ace48e88d470c /spec/unit/provider/subversion_spec.rb
parent16b1b5f977f6858d914d5b1fe748b4d6a4cff7f4 (diff)
downloadchef-7b26c360c4b8ad5206bcdf44e7a63fdf9b12df3a.tar.gz
Subversion failes with "option ':command' is not a valid option for Mixlib::ShellOut"
Improper use of `shell_out!`, which uses Mixlib Fixed #2633
Diffstat (limited to 'spec/unit/provider/subversion_spec.rb')
-rw-r--r--spec/unit/provider/subversion_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/unit/provider/subversion_spec.rb b/spec/unit/provider/subversion_spec.rb
index b372f0df7a..9ca11b8d82 100644
--- a/spec/unit/provider/subversion_spec.rb
+++ b/spec/unit/provider/subversion_spec.rb
@@ -198,7 +198,7 @@ describe Chef::Provider::Subversion do
it "runs an export with the --force option" do
allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
expected_cmd = "svn export --force -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
- expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+ expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
@provider.run_action(:force_export)
expect(@resource).to be_updated
end
@@ -206,7 +206,7 @@ describe Chef::Provider::Subversion do
it "runs the checkout command for action_checkout" do
allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
expected_cmd = "svn checkout -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
- expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+ expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
@provider.run_action(:checkout)
expect(@resource).to be_updated
end
@@ -230,7 +230,7 @@ describe Chef::Provider::Subversion do
@resource.user "whois"
@resource.group "thisis"
expected_cmd = "svn checkout -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
- expect(@provider).to receive(:shell_out!).with(command: expected_cmd, user: "whois", group: "thisis")
+ expect(@provider).to receive(:shell_out!).with(expected_cmd, {user: "whois", group: "thisis"})
@provider.run_action(:checkout)
expect(@resource).to be_updated
end
@@ -255,7 +255,7 @@ describe Chef::Provider::Subversion do
allow(@provider).to receive(:find_current_revision).and_return("11410")
allow(@provider).to receive(:current_revision_matches_target_revision?).and_return(false)
expected_cmd = "svn update -q -r12345 /my/deploy/dir"
- expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+ expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
@provider.run_action(:sync)
expect(@resource).to be_updated
end
@@ -272,7 +272,7 @@ describe Chef::Provider::Subversion do
it "runs the export_command on action_export" do
allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
expected_cmd = "svn export --force -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
- expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+ expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
@provider.run_action(:export)
expect(@resource).to be_updated
end