Merge branch 'master' into show_chef_version_on_shell

1 files changed, 3 insertions, 1 deletions

diff --git a/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index 4d5581d4d6..e6d11da523 100644
--- a/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
@@ -43,6 +43,8 @@ describe Shell do
   before do
     Shell.irb_conf = {}
     allow(Shell::ShellSession.instance).to receive(:reset!)
+    allow(Chef::Platform).to receive(:windows?).and_return(false)
+    allow(Chef::Util::PathHelper).to receive(:home).and_return('/home/foo')
   end
 
   describe "reporting its status" do
@@ -56,7 +58,7 @@ describe Shell do
   describe "configuring IRB" do
     it "configures irb history" do
       Shell.configure_irb
-      expect(Shell.irb_conf[:HISTORY_FILE]).to eq("#{ENV['HOME']}/.chef/chef_shell_history")
+      expect(Shell.irb_conf[:HISTORY_FILE]).to eq(Chef::Util::PathHelper.home('.chef', 'chef_shell_history'))
       expect(Shell.irb_conf[:SAVE_HISTORY]).to eq(1000)
     end