Merge branch '11-stable' of github.com:opscode/chef into 11-stable

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
index 3771b853a1..0a246037fb 100644
--- a/spec/unit/config_spec.rb
+++ b/spec/unit/config_spec.rb
@@ -183,8 +183,14 @@ describe Chef::Config do
       Chef::Config[:ssl_ca_path].should be_nil
     end
 
-    it "Chef::Config[:ssl_ca_file] defaults to nil" do
-      Chef::Config[:ssl_ca_file].should be_nil
+    describe "when on UNIX" do
+      before do
+        Chef::Config.stub(:on_windows?).and_return(false)
+      end
+
+      it "Chef::Config[:ssl_ca_file] defaults to nil" do
+        Chef::Config[:ssl_ca_file].should be_nil
+      end
     end
 
     it "Chef::Config[:data_bag_path] defaults to /var/chef/data_bags" do