diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-12 15:30:15 -0600 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-12 15:30:15 -0600 |
| commit | e143d8d8b315e7025a605665b46c3c2293fd96eb (patch) | |
| tree | 788b2c34564992eea06c5bf175c086437a8476f5 | |
| parent | fad249bf39ce6b452184d23dc9905f7b27be7ab7 (diff) | |
| parent | 7c81a3871801c36e23bc8bde22fe568e6fbed122 (diff) | |
| download | chef-e143d8d8b315e7025a605665b46c3c2293fd96eb.tar.gz | |
Merge pull request #2886 from chef/jdm/windows-jenkins
Fix broken tests in jenkins
| -rw-r--r-- | spec/unit/application/client_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb index 894836198f..ea2ad473e5 100644 --- a/spec/unit/application/client_spec.rb +++ b/spec/unit/application/client_spec.rb @@ -26,7 +26,7 @@ describe Chef::Application::Client, "reconfigure" do before do allow(Kernel).to receive(:trap).and_return(:ok) - allow(::File).to receive(:read).with("/etc/chef/client.rb").and_return("") + allow(::File).to receive(:read).with(Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_return("") @original_argv = ARGV.dup ARGV.clear @@ -262,7 +262,7 @@ describe Chef::Application::Client, "configure_chef" do before do @original_argv = ARGV.dup ARGV.clear - allow(::File).to receive(:read).with("/etc/chef/client.rb").and_return("") + allow(::File).to receive(:read).with(Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_return("") app.configure_chef end |