diff options
| author | Matthew Kent <mkent@magoazul.com> | 2010-04-06 23:54:41 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2010-04-30 15:48:24 -0700 |
| commit | 54b299692aae8f2e1dc819b540404bda99c49d22 (patch) | |
| tree | 9dc9a6c5ac5508e7c99db6a1588fb08bd659b986 /chef/spec/unit/rest_spec.rb | |
| parent | 279b9dcc5c9b85e6483dc90f4d633120e5f337b2 (diff) | |
| download | chef-54b299692aae8f2e1dc819b540404bda99c49d22.tar.gz | |
CHEF-1092: Expanded paths in the wrong order on the first attempt. Also missed a
bunch of references.
Diffstat (limited to 'chef/spec/unit/rest_spec.rb')
| -rw-r--r-- | chef/spec/unit/rest_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chef/spec/unit/rest_spec.rb b/chef/spec/unit/rest_spec.rb index 9f1051c27d..be49e89652 100644 --- a/chef/spec/unit/rest_spec.rb +++ b/chef/spec/unit/rest_spec.rb @@ -204,14 +204,14 @@ EOH end it "should set the CA path if that is set in the configuration" do - Chef::Config[:ssl_ca_path] = File.join(File.dirname(File.expand_path(__FILE__)), "..", "data", "ssl") + Chef::Config[:ssl_ca_path] = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "ssl")) @http_mock.should_receive(:ca_path=).with(Chef::Config[:ssl_ca_path]).and_return(true) do_run_request Chef::Config[:ssl_ca_path] = nil end it "should set the CA file if that is set in the configuration" do - Chef::Config[:ssl_ca_file] = File.join(File.dirname(File.expand_path(__FILE__)), "..", "data", "ssl", "5e707473.0") + Chef::Config[:ssl_ca_file] = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "ssl", "5e707473.0")) @http_mock.should_receive(:ca_file=).with(Chef::Config[:ssl_ca_file]).and_return(true) do_run_request Chef::Config[:ssl_ca_file] = nil |