Fix bug where it thought you were in "cookbooks1" when you were really in "cookbooks123"

1 files changed, 9 insertions, 4 deletions

diff --git a/spec/support/shared/integration/integration_helper.rb b/spec/support/shared/integration/integration_helper.rb
index b15e90c440..843bf7d0c5 100644
--- a/spec/support/shared/integration/integration_helper.rb
+++ b/spec/support/shared/integration/integration_helper.rb
@@ -33,20 +33,25 @@ module IntegrationSupport
         raise "Can only create one directory per test" if @repository_dir
         @repository_dir = Dir.mktmpdir('chef_repo')
         @old_chef_repo_path = Chef::Config.chef_repo_path
-        @old_cookbook_path = Chef::Config.cookbook_path
+        @old_paths = {}
         Chef::Config.chef_repo_path = @repository_dir
-        Chef::Config.cookbook_path = File.join(@repository_dir, 'cookbooks')
+        %w(client cookbook data_bag environment node role user).each do |object_name|
+          @old_paths[object_name] = Chef::Config["#{object_name}_path".to_sym]
+          Chef::Config["#{object_name}_path".to_sym] = nil
+        end
       end
 
       after :each do
         if @repository_dir
           begin
+            %w(client cookbook data_bag environment node role user).each do |object_name|
+              Chef::Config["#{object_name}_path".to_sym] = @old_paths[object_name]
+            end
             Chef::Config.chef_repo_path = @old_chef_repo_path
-            Chef::Config.cookbook_path = @old_cookbook_path
             FileUtils.remove_entry_secure(@repository_dir)
           ensure
             @old_chef_repo_path = nil
-            @old_cookbook_path = nil
+            @old_paths = nil
             @repository_dir = nil
           end
         end