fix stubs for windows

1 files changed, 12 insertions, 13 deletions

diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
index 779f97ab9e..c467d7d553 100644
--- a/spec/unit/config_spec.rb
+++ b/spec/unit/config_spec.rb
@@ -148,17 +148,18 @@ describe Chef::Config do
 
     def secondary_cache_path
       if windows?
-        "#{Chef::Config.env['SYSTEMDRIVE']}\\#{Chef::Config.env['HOMEPATH']}\\.chef"
+        "#{Chef::Config[:user_home]}\\.chef"
       else
-        "#{Chef::Config.env['HOME']}/.chef"
+        "#{Chef::Config[:user_home]}/.chef"
       end
     end
 
     before do
       if windows?
-        Chef::Config.stub(:env).and_return({'SYSTEMDRIVE' => "C:", 'HOMEPATH' => "KittenHome"})
+        Chef::Config.stub(:env).and_return({ 'SYSTEMDRIVE' => 'C:' })
+        Chef::Config[:user_home] = 'C:\Users\charlie'
       else
-        Chef::Config.stub(:env).and_return({'HOME' => "/Users/kitten"})
+        Chef::Config[:user_home] = '/Users/charlie'
       end
 
       Chef::Config.stub(:path_accessible?).and_return(false)
@@ -167,7 +168,7 @@ describe Chef::Config do
     describe "Chef::Config[:cache_path]" do
       context "when /var/chef exists and is accessible" do
         it "defaults to /var/chef" do
-          Chef::Config.stub(:path_accessible?).and_return(true)
+          Chef::Config.stub(:path_accessible?).with(Chef::Config.platform_specific_path("/var/chef")).and_return(true)
           Chef::Config[:cache_path].should == primary_cache_path
         end
       end
@@ -200,8 +201,8 @@ describe Chef::Config do
     end
 
     it "Chef::Config[:file_backup_path] defaults to /var/chef/backup" do
-      Chef::Config.stub(:cache_path).and_return(Chef::Config.platform_specific_path("/var/chef"))
-      backup_path = Chef::Config.platform_specific_path("#{Chef::Config.cache_path}/backup")
+      Chef::Config.stub(:cache_path).and_return(primary_cache_path)
+      backup_path = windows? ? "#{primary_cache_path}\\backup" : "#{primary_cache_path}/backup"
       Chef::Config[:file_backup_path].should == backup_path
     end
 
@@ -224,16 +225,14 @@ describe Chef::Config do
     end
 
     it "Chef::Config[:data_bag_path] defaults to /var/chef/data_bags" do
-      Chef::Config.stub(:cache_path).and_return(Chef::Config.platform_specific_path("/var/chef"))
-      data_bag_path =
-        Chef::Config.platform_specific_path("#{Chef::Config.cache_path}/data_bags")
+      Chef::Config.stub(:cache_path).and_return(primary_cache_path)
+      data_bag_path = windows? ? "#{primary_cache_path}\\data_bags" : "#{primary_cache_path}/data_bags"
       Chef::Config[:data_bag_path].should == data_bag_path
     end
 
     it "Chef::Config[:environment_path] defaults to /var/chef/environments" do
-      Chef::Config.stub(:cache_path).and_return(Chef::Config.platform_specific_path("/var/chef"))
-      environment_path = Chef::Config.platform_specific_path("#{Chef::Config.cache_path}/environments")
-
+      Chef::Config.stub(:cache_path).and_return(primary_cache_path)
+      environment_path = windows? ? "#{primary_cache_path}\\environments" : "#{primary_cache_path}/environments"
       Chef::Config[:environment_path].should == environment_path
     end