diff options
| -rw-r--r-- | spec/support/shared/functional/file_resource.rb | 6 | ||||
| -rw-r--r-- | spec/unit/config_spec.rb | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/spec/support/shared/functional/file_resource.rb b/spec/support/shared/functional/file_resource.rb index 804830fcdc..72b72912bd 100644 --- a/spec/support/shared/functional/file_resource.rb +++ b/spec/support/shared/functional/file_resource.rb @@ -284,6 +284,7 @@ shared_examples_for "a file resource" do before do Chef::Config[:why_run] = true + Chef::Config[:ssl_verify_mode] = :verify_none end after do @@ -333,6 +334,10 @@ shared_examples_for "file resource not pointing to a real file" do !symlink?(file_path) && File.file?(file_path) end + before do + Chef::Config[:ssl_verify_mode] = :verify_none + end + describe "when force_unlink is set to true" do it ":create unlinks the target" do real_file?(path).should be_false @@ -363,6 +368,7 @@ shared_examples_for "a configured file resource" do before do Chef::Log.level = :info + Chef::Config[:ssl_verify_mode] = :verify_none end # note the stripping of the drive letter from the tmpdir on windows diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb index af71c43b77..41411669e6 100644 --- a/spec/unit/config_spec.rb +++ b/spec/unit/config_spec.rb @@ -242,8 +242,8 @@ describe Chef::Config do Chef::Config[:file_backup_path].should == backup_path end - it "Chef::Config[:ssl_verify_mode] defaults to :verify_none" do - Chef::Config[:ssl_verify_mode].should == :verify_none + it "Chef::Config[:ssl_verify_mode] defaults to :verify_peer" do + Chef::Config[:ssl_verify_mode].should == :verify_peer end it "Chef::Config[:ssl_ca_path] defaults to nil" do |