chef 16.2.44-universal-mingw32 → 16.4.35-universal-mingw32

data/spec/support/shared/integration/knife_support.rb

@@ -39,10 +39,7 @@ module KnifeSupport
 
     # Work on machines where we can't access /var
     Dir.mktmpdir("checksums") do |checksums_cache_dir|
-      Chef::Config[:cache_options] = {
-        path: checksums_cache_dir,
-        skip_expires: true,
-      }
+      Chef::Config[:syntax_check_cache_path] = checksums_cache_dir
 
       # This is Chef::Knife.run without load_commands--we'll load stuff
       # ourselves, thank you very much
@@ -55,8 +52,6 @@ module KnifeSupport
                 STDIN
               end
 
-      old_loggers = Chef::Log.loggers
-      old_log_level = Chef::Log.level
       begin
         puts "knife: #{args.join(" ")}" if DEBUG
         subcommand_class = Chef::Knife.subcommand_class_from(args)
@@ -115,9 +110,7 @@ module KnifeSupport
       rescue SystemExit => e
         exit_code = e.status
       ensure
-        Chef::Log.use_log_devices(old_loggers)
-        Chef::Log.level = old_log_level
-        Chef::Config.delete(:cache_options)
+        Chef::Config.delete(:syntax_check_cache_path)
         Chef::Config.delete(:concurrency)
       end
 

data/spec/support/shared/unit/application_dot_d.rb

@@ -41,7 +41,6 @@ shared_examples_for "an application that loads a dot d" do
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_return("foo 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_return("bar 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_return("strings 0")
-      allow(app).to receive(:apply_config).with(anything, Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_call_original.ordered
       expect(app).to receive(:apply_config).with("foo 0", Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("bar 0", Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("strings 0", Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_call_original.ordered

data/spec/support/shared/unit/provider/file.rb

@@ -484,19 +484,23 @@ shared_examples_for Chef::Provider::File do
 
         it "raises an exception if any verification fails" do
           allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false)
-          provider.new_resource.verify windows? ? "REM" : "true"
-          provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false"
-          msg = "Proposed content for #{provider.new_resource.path} failed verification #{windows? ? "cmd.exe /c exit 1" : "false"}"
-          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, /#{msg}/)
+          allow(provider).to receive(:tempfile).and_return(tempfile)
+          provider.new_resource.verify windows? ? "cmd.exe c exit 1" : "false"
+          provider.new_resource.verify.each do |v|
+            allow(v).to receive(:verify).and_return(false)
+          end
+          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed)
         end
 
         it "does not show verification for sensitive resources" do
           allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false)
-          provider.new_resource.verify windows? ? "REM" : "true"
-          provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false"
+          allow(provider).to receive(:tempfile).and_return(tempfile)
           provider.new_resource.sensitive true
-          msg = "Proposed content for #{provider.new_resource.path} failed verification [sensitive]\nTemporary file moved to #{backupfile}"
-          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, msg)
+          provider.new_resource.verify windows? ? "cmd.exe c exit 1" : "false"
+          provider.new_resource.verify.each do |v|
+            allow(v).to receive(:verify).and_return(false)
+          end
+          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, /sensitive/)
         end
       end
     end

data/spec/support/shared/unit/script_resource.rb

@@ -47,21 +47,6 @@ shared_examples_for "a script resource" do
   end
 
   describe "when executing guards" do
-    let(:resource) do
-      resource = script_resource
-      resource.run_context = run_context
-      resource.code "echo hi"
-      resource
-    end
-    let(:node) do
-      node = Chef::Node.new
-      node.automatic[:platform] = "debian"
-      node.automatic[:platform_version] = "6.0"
-      node
-    end
-    let(:events) { Chef::EventDispatch::Dispatcher.new }
-    let(:run_context) { Chef::RunContext.new(node, {}, events) }
-
     it "inherits exactly the :cwd, :environment, :group, :path, :user, and :umask attributes from a parent resource class" do
       inherited_difference = Chef::Resource::Script.guard_inherited_attributes -
         %i{cwd environment group path user umask}
@@ -73,16 +58,17 @@ shared_examples_for "a script resource" do
       expect_any_instance_of(Chef::Resource::Conditional).not_to receive(:evaluate_block)
       expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).not_to receive(:evaluate_action)
       expect_any_instance_of(Chef::GuardInterpreter::DefaultGuardInterpreter).to receive(:evaluate).and_return(true)
-      resource.only_if "echo hi"
-      expect(resource.should_skip?(:run)).to eq(nil)
+      script_resource.only_if "echo hi"
+      expect(script_resource.should_skip?(:run)).to eq(nil)
     end
 
     it "when a valid guard_interpreter resource is specified, a block should be used to evaluate the guard" do
+      expect_any_instance_of(Chef::Resource::Conditional).not_to receive(:evaluate_block)
       expect_any_instance_of(Chef::GuardInterpreter::DefaultGuardInterpreter).not_to receive(:evaluate)
       expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(true)
-      resource.guard_interpreter :script
-      resource.only_if "echo hi"
-      expect(resource.should_skip?(:run)).to eq(nil)
+      script_resource.guard_interpreter :script
+      script_resource.only_if "echo hi"
+      expect(script_resource.should_skip?(:run)).to eq(nil)
     end
   end
 end

data/spec/support/shared/unit/windows_script_resource.rb

@@ -20,59 +20,46 @@ require "support/shared/unit/execute_resource"
 require "support/shared/unit/script_resource"
 
 shared_examples_for "a Windows script resource" do
-  before(:each) do
-    node = Chef::Node.new
-
-    node.default["kernel"] = {}
-    node.default["kernel"][:machine] = :x86_64.to_s
-
-    run_context = Chef::RunContext.new(node, nil, nil)
-
-    @resource = resource_instance
-
-  end
-
   it "should be a kind of Chef::Resource::WindowsScript" do
-    expect(@resource).to be_a_kind_of(Chef::Resource)
-    expect(@resource).to be_a_kind_of(Chef::Resource::WindowsScript)
+    expect(windows_script_resource).to be_a_kind_of(Chef::Resource)
+    expect(windows_script_resource).to be_a_kind_of(Chef::Resource::WindowsScript)
   end
 
   context "when evaluating guards" do
     it "should have a default_guard_interpreter attribute that is the same as the resource" do
-      expect(@resource.default_guard_interpreter).to eq(@resource.resource_name)
+      expect(windows_script_resource.default_guard_interpreter).to eq(windows_script_resource.resource_name)
     end
 
     it "should default to using guard_interpreter attribute that is the same as the resource" do
-      expect(@resource.guard_interpreter).to eq(@resource.resource_name)
+      expect(windows_script_resource.guard_interpreter).to eq(windows_script_resource.resource_name)
     end
 
     it "should use a resource to evaluate the guard when guard_interpreter is not specified" do
       expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(true)
       expect_any_instance_of(Chef::GuardInterpreter::DefaultGuardInterpreter).not_to receive(:evaluate)
-      @resource.only_if "echo hi"
-      expect(@resource.should_skip?(:run)).to eq(nil)
+      windows_script_resource.only_if "echo hi"
+      expect(windows_script_resource.should_skip?(:run)).to eq(nil)
     end
 
     describe "when the guard is given a ruby block" do
       it "should evaluate the guard if the guard_interpreter is set to its default value" do
-        @resource.only_if { true }
-        expect(@resource.should_skip?(:run)).to eq(nil)
+        windows_script_resource.only_if { true }
+        expect(windows_script_resource.should_skip?(:run)).to eq(nil)
       end
 
       it "should raise an exception if the guard_interpreter is overridden from its default value" do
-        @resource.guard_interpreter :bash
-        @resource.only_if { true }
-        expect { @resource.should_skip?(:run) }.to raise_error(ArgumentError)
+        windows_script_resource.guard_interpreter :bash
+        windows_script_resource.only_if { true }
+        expect { windows_script_resource.should_skip?(:run) }.to raise_error(ArgumentError)
       end
     end
   end
 
   context "script with a default guard interpreter" do
-    let(:script_resource) do
-      resource_instance.guard_interpreter :default
-      resource_instance
-    end
+    let(:script_resource) { windows_script_resource }
+
+    before { windows_script_resource.guard_interpreter :default }
+
     it_should_behave_like "a script resource"
   end
-
 end

data/spec/unit/application/solo_spec.rb

@@ -164,6 +164,8 @@ describe Chef::Application::Solo do
   end
 
   context "in local mode" do
+    let(:root_path) { windows? ? "C:/var/chef" : "/var/chef" }
+
     before do
       Chef::Config[:solo_legacy_mode] = false
     end
@@ -197,10 +199,10 @@ describe Chef::Application::Solo do
     end
 
     it "sets the repo path" do
-      expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/chef")
+      expect(Chef::Config).to receive(:find_chef_repo_path).and_return(root_path)
       app.reconfigure
       expect(Chef::Config.key?(:chef_repo_path)).to be_truthy
-      expect(Chef::Config[:chef_repo_path]).to eq ("/var/chef")
+      expect(Chef::Config[:chef_repo_path]).to eq (root_path)
     end
 
     it "runs chef-client in local mode" do

data/spec/unit/application_spec.rb

@@ -22,12 +22,10 @@ describe Chef::Application do
   before do
     @original_argv = ARGV.dup
     ARGV.clear
-    Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
     allow(@app).to receive(:trap)
     allow(Dir).to receive(:chdir).and_return(0)
     allow(@app).to receive(:reconfigure)
-    Chef::Log.init(STDERR)
   end
 
   after do
@@ -254,6 +252,10 @@ describe Chef::Application do
       end
 
       context "when log_level is not set" do
+        before do
+          Chef::Config.delete(:log_level)
+        end
+
         it_behaves_like "log_level_is_auto"
       end
 

data/spec/unit/chef_fs/config_spec.rb

@@ -203,8 +203,8 @@ describe Chef::ChefFS::Config do
         })
       end
 
-      let (:path) { "/roles/foo.json" }
-      let (:entry) { Entry.new(path) }
+      let(:path) { "/roles/foo.json" }
+      let(:entry) { Entry.new(path) }
 
       it "returns the entry's path if the cwd isn't in the config" do
         cfg = Chef::ChefFS::Config.new(config, "/my_repo/cookbooks")

data/spec/unit/chef_fs/diff_spec.rb

@@ -20,17 +20,17 @@ require "spec_helper"
 require "chef/chef_fs/file_pattern"
 require "chef/chef_fs/command_line"
 
-# Removes the date stamp from the diff and replaces it with ' DATE'
-# example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
-# windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
-def remove_os_differences(diff)
-  diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
-  diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS")
-end
-
 describe "diff", uses_diff: true do
   include FileSystemSupport
 
+  # Removes the date stamp from the diff and replaces it with ' DATE'
+  # example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
+  # windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
+  def remove_os_differences(diff)
+    diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
+    diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS")
+  end
+
   context "with two filesystems with all types of difference" do
     let(:a) do
       memory_fs("a", {

data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb

@@ -25,11 +25,9 @@ describe Chef::ChefFS::FileSystem::OperationFailedError do
 
     context "has a cause attribute and HTTP result code is 400" do
       it "include error cause" do
-        allow_message_expectations_on_nil
         response_body = '{"error":["Invalid key test in request body"]}'
-        allow(@response).to receive(:code).and_return("400")
-        allow(@response).to receive(:body).and_return(response_body)
-        exception = Net::HTTPClientException.new("(exception) unauthorized", @response)
+        response = double(:response, code: "400", body: response_body)
+        exception = Net::HTTPClientException.new("(exception) unauthorized", response)
         expect do
           raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, exception), error_message
         end.to raise_error(Chef::ChefFS::FileSystem::OperationFailedError, "#{error_message} cause: #{response_body}")

data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb}

@@ -405,7 +405,7 @@ describe Chef::ChefFS::Parallelizer do
         expect do
           b = enum.enum_for(:each)
           b.next
-        end.to raise_error
+        end.to raise_error(RuntimeError, "each() called on parallel enumerable twice simultaneously! Bad mojo")
       end
     end
   end

data/spec/unit/client_spec.rb

@@ -749,9 +749,12 @@ describe Chef::Client do
 
     context "when any directory of cookbook_path contains no cookbook" do
       it "raises CookbookNotFound error" do
+        invalid_cookbook_path = windows? ? "C:/path/to/invalid/cookbook_path" : "/path/to/invalid/cookbook_path"
+        msg = "None of the cookbook paths set in Chef::Config[:cookbook_path], [\"#{invalid_cookbook_path}\"], contain any cookbooks"
+
         expect do
           client.send(:assert_cookbook_path_not_empty, nil)
-        end.to raise_error(Chef::Exceptions::CookbookNotFound, 'None of the cookbook paths set in Chef::Config[:cookbook_path], ["/path/to/invalid/cookbook_path"], contain any cookbooks')
+        end.to raise_error(Chef::Exceptions::CookbookNotFound, msg)
       end
     end
   end

data/spec/unit/cookbook/gem_installer_spec.rb

@@ -95,7 +95,8 @@ describe Chef::Cookbook::GemInstaller do
 
   it "skip metadata installation when Chef::Config[:skip_gem_metadata_installation] is set to true" do
     Chef::Config[:skip_gem_metadata_installation] = true
-    expect(gem_installer.install).to_not receive(:shell_out!)
+    expect(gem_installer).to_not receive(:shell_out!)
+    expect(gem_installer.install).to be_nil
   end
 
   it "install metadata when Chef::Config[:skip_gem_metadata_installation] is not true" do

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -217,6 +217,8 @@ describe Chef::CookbookSynchronizer do
       path: "/tmp/cookbook_a_template_default_tempfile")
   end
 
+  let(:root) { windows? ? "C:/file-cache/cookbooks/cookbook_a" : "/file-cache/cookbooks/cookbook_a" }
+
   def setup_common_files_missing_expectations
     # Files are not in the cache:
     expect(file_cache).to receive(:key?)
@@ -234,7 +236,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_recipes_default_rb", "cookbooks/cookbook_a/recipes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
 
     # Fetch and copy default.rb attribute file
     expect(server_api).to receive(:streaming_request)
@@ -244,7 +246,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_attributes_default_rb", "cookbooks/cookbook_a/attributes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
   end
 
   def setup_no_lazy_files_and_templates_missing_expectations
@@ -262,7 +264,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_file_default_tempfile", "cookbooks/cookbook_a/files/default/megaman.conf")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
 
     expect(server_api).to receive(:streaming_request)
       .with("http://chef.example.com/ffffff")
@@ -271,7 +273,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_template_default_tempfile", "cookbooks/cookbook_a/templates/default/apache2.conf.erb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
   end
 
   def setup_common_files_chksum_mismatch_expectations
@@ -292,11 +294,11 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
 
     # Current file has fff000, want abc123
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .with("#{root}/recipes/default.rb")
       .and_return("fff000").at_least(:once)
 
     # Fetch and copy default.rb attribute file
@@ -308,11 +310,11 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
 
     # Current file has fff000, want abc456
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .with("#{root}/attributes/default.rb")
       .and_return("fff000").at_least(:once)
   end
 
@@ -334,7 +336,7 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
 
     # Fetch and copy apache2.conf template
     expect(server_api).to receive(:streaming_request)
@@ -345,16 +347,16 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
 
     # Current file has fff000
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .with("#{root}/default/megaman.conf")
       .and_return("fff000")
 
     # Current file has fff000
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .with("#{root}/templates/default/apache2.conf.erb")
       .and_return("fff000")
   end
 
@@ -369,23 +371,23 @@ describe Chef::CookbookSynchronizer do
 
     # Current file has abc123, want abc123
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .with("#{root}/recipes/default.rb")
       .and_return("abc123").at_least(:once)
 
     # Current file has abc456, want abc456
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .with("#{root}/attributes/default.rb")
       .and_return("abc456").at_least(:once)
 
     # :load called twice
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
   end
 
   def setup_no_lazy_files_and_templates_present_expectations
@@ -399,23 +401,23 @@ describe Chef::CookbookSynchronizer do
 
     # Current file has abc124, want abc124
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .with("#{root}/default/megaman.conf")
       .and_return("abc124")
 
     # Current file has abc125, want abc125
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .with("#{root}/templates/default/apache2.conf.erb")
       .and_return("abc125")
 
     # :load called twice
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
   end
 
   describe "#server_api" do
@@ -535,19 +537,19 @@ describe Chef::CookbookSynchronizer do
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/recipes/default.rb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+          .and_return("#{root}/recipes/default.rb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/attributes/default.rb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+          .and_return("#{root}/attributes/default.rb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+          .and_return("#{root}/templates/default/apache2.conf.erb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/files/default/megaman.conf")
+          .and_return("#{root}/files/default/megaman.conf")
         expect(Chef::Log).to receive(:warn)
           .with("skipping cookbook synchronization! DO NOT LEAVE THIS ENABLED IN PRODUCTION!!!")
           .once