knife-essentials 0.8.3 → 0.8.4

data/spec/integration/chef_repository_file_system_spec.rb

@@ -1,7 +1,8 @@
 require 'support/integration_helper'
 require 'chef/knife/list_essentials'
+require 'chef/knife/show_essentials'
 
-describe 'knife list' do
+describe 'General chef_repo file system checks' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -11,21 +12,12 @@ describe 'knife list' do
       directory "environments"
       directory "data_bags/bag1"
 
-      it "knife list --local -R / returns them" do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-data_bags
-environments
-roles
-
-/data_bags:
-bag1
-
-/data_bags/bag1:
-
-/environments:
-
-/roles:
+      it "knife list --local -Rfp / returns them" do
+        knife('list --local -Rfp /').should_succeed <<EOM
+/data_bags/
+/data_bags/bag1/
+/environments/
+/roles/
 EOM
       end
     end
@@ -41,12 +33,9 @@ EOM
     when_the_repository "has an empty cookbook directory" do
       directory 'cookbooks/cookbook1'
 
-      it "knife list --local -R / does not return it" do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
+      it "knife list --local -Rfp / does not return it" do
+        knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
+/cookbooks/
 EOM
       end
     end
@@ -54,12 +43,9 @@ EOM
     when_the_repository "has only empty cookbook subdirectories" do
       directory 'cookbooks/cookbook1/recipes'
 
-      it "knife list --local -R / does not return it" do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
+      it "knife list --local -Rfp / does not return it" do
+        knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
+/cookbooks/
 EOM
       end
     end
@@ -68,22 +54,13 @@ EOM
       directory 'cookbooks/cookbook1/recipes'
       file 'cookbooks/cookbook1/templates/default/x.txt', ''
 
-      it "knife list --local -R / does not return the empty ones" do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-cookbook1
-
-/cookbooks/cookbook1:
-templates
-
-/cookbooks/cookbook1/templates:
-default
-
-/cookbooks/cookbook1/templates/default:
-x.txt
+      it "knife list --local -Rfp / does not return the empty ones" do
+        knife('list --local -Rfp /').should_succeed <<EOM
+/cookbooks/
+/cookbooks/cookbook1/
+/cookbooks/cookbook1/templates/
+/cookbooks/cookbook1/templates/default/
+/cookbooks/cookbook1/templates/default/x.txt
 EOM
       end
     end
@@ -91,12 +68,9 @@ EOM
     when_the_repository "has only empty cookbook sub-sub-directories" do
       directory 'cookbooks/cookbook1/templates/default'
 
-      it "knife list --local -R / does not return it" do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
+      it "knife list --local -Rfp / does not return it" do
+        knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
+/cookbooks/
 EOM
       end
     end
@@ -106,22 +80,13 @@ EOM
       directory 'cookbooks/cookbook1/templates/rhel'
       directory 'cookbooks/cookbook1/files/default'
 
-      it "knife list --local -R / does not return the empty ones" do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-cookbook1
-
-/cookbooks/cookbook1:
-templates
-
-/cookbooks/cookbook1/templates:
-default
-
-/cookbooks/cookbook1/templates/default:
-x.txt
+      it "knife list --local -Rfp / does not return the empty ones" do
+        knife('list --local -Rfp /').should_succeed <<EOM
+/cookbooks/
+/cookbooks/cookbook1/
+/cookbooks/cookbook1/templates/
+/cookbooks/cookbook1/templates/default/
+/cookbooks/cookbook1/templates/default/x.txt
 EOM
       end
     end
@@ -131,8 +96,8 @@ EOM
         file "_default.json", {}
       end
 
-      it "knife list --local -R / should NOT return it" do
-        knife('list --local -R /').should_succeed ""
+      it "knife list --local -Rfp / should NOT return it" do
+        knife('list --local -Rfp /').should_succeed ""
       end
     end
 
@@ -153,31 +118,22 @@ EOM
         file "subdir/environment.json", {}
       end
 
-      it "knife list --local -R / should NOT return them" do
+      it "knife list --local -Rfp / should NOT return them" do
         pending "Decide whether this is a good/bad idea" do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-data_bags
-environments
-roles
-
-/data_bags:
-bag1
-
-/data_bags/bag1:
-item1.json
-
-/environments:
-environment1.json
-
-/roles:
-role1.json
+          knife('list --local -Rfp /').should_succeed <<EOM
+/data_bags/
+/data_bags/bag1/
+/data_bags/bag1/item1.json
+/environments/
+/environments/environment1.json
+/roles/
+/roles/role1.json
 EOM
         end
       end
     end
 
-    when_the_repository "has extraneous subdirectories and files under cookbooks" do
+    when_the_repository "has extraneous subdirectories and files under a cookbook" do
       directory 'cookbooks/cookbook1' do
         file 'a.rb', ''
         file 'blarghle/blah.rb', ''
@@ -231,69 +187,40 @@ EOM
         end
       end
 
-      it "knife list --local -R / should NOT return them" do
+      it "knife list --local -Rfp / should NOT return them" do
         pending "Decide whether this is a good idea" do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-cookbook1
-
-/cookbooks/cookbook1:
-a.rb
-attributes
-definitions
-files
-libraries
-providers
-recipes
-resources
-templates
-
-/cookbooks/cookbook1/attributes:
-a.rb
-
-/cookbooks/cookbook1/definitions:
-a.rb
-
-/cookbooks/cookbook1/files:
-a.rb
-b.json
-c
-
-/cookbooks/cookbook1/files/c:
-d.rb
-e.json
-
-/cookbooks/cookbook1/libraries:
-a.rb
-
-/cookbooks/cookbook1/providers:
-a.rb
-c
-
-/cookbooks/cookbook1/providers/c:
-d.rb
-
-/cookbooks/cookbook1/recipes:
-a.rb
-
-/cookbooks/cookbook1/resources:
-a.rb
-c
-
-/cookbooks/cookbook1/resources/c:
-d.rb
-
-/cookbooks/cookbook1/templates:
-a.rb
-b.json
-c
-
-/cookbooks/cookbook1/templates/c:
-d.rb
-e.json
+          knife('list --local -Rfp /').should_succeed <<EOM
+/cookbooks/
+/cookbooks/cookbook1/
+/cookbooks/cookbook1/a.rb
+/cookbooks/cookbook1/attributes/
+/cookbooks/cookbook1/attributes/a.rb
+/cookbooks/cookbook1/definitions/
+/cookbooks/cookbook1/definitions/a.rb
+/cookbooks/cookbook1/files/
+/cookbooks/cookbook1/files/a.rb
+/cookbooks/cookbook1/files/b.json
+/cookbooks/cookbook1/files/c/
+/cookbooks/cookbook1/files/c/d.rb
+/cookbooks/cookbook1/files/c/e.json
+/cookbooks/cookbook1/libraries/
+/cookbooks/cookbook1/libraries/a.rb
+/cookbooks/cookbook1/providers/
+/cookbooks/cookbook1/providers/a.rb
+/cookbooks/cookbook1/providers/c/
+/cookbooks/cookbook1/providers/c/d.rb
+/cookbooks/cookbook1/recipes/
+/cookbooks/cookbook1/recipes/a.rb
+/cookbooks/cookbook1/resources/
+/cookbooks/cookbook1/resources/a.rb
+/cookbooks/cookbook1/resources/c/
+/cookbooks/cookbook1/resources/c/d.rb
+/cookbooks/cookbook1/templates/
+/cookbooks/cookbook1/templates/a.rb
+/cookbooks/cookbook1/templates/b.json
+/cookbooks/cookbook1/templates/c/
+/cookbooks/cookbook1/templates/c/d.rb
+/cookbooks/cookbook1/templates/c/e.json
 EOM
         end
       end
@@ -301,580 +228,22 @@ EOM
 
     when_the_repository "has a file in cookbooks/" do
       file 'cookbooks/file', ''
-      it 'does not show up in list -R' do
-        pending "don't show files when only directories are allowed" do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
+      it 'does not show up in list -Rfp' do
+        knife('list --local -Rfp /').should_succeed <<EOM
+/cookbooks/
 EOM
-        end
       end
     end
 
     when_the_repository "has a file in data_bags/" do
       file 'data_bags/file', ''
-      it 'does not show up in list -R' do
+      it 'does not show up in list -Rfp' do
         pending "don't show files when only directories are allowed" do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-data_bags
-
-/data_bags:
+          knife('list --local -Rfp /').should_succeed <<EOM
+/data_bags/
 EOM
         end
       end
     end
   end
-
-  context 'chefignore tests' do
-    when_the_repository "has lots of stuff in it" do
-      file 'roles/x.json', {}
-      file 'environments/x.json', {}
-      file 'data_bags/bag1/x.json', {}
-      file 'cookbooks/cookbook1/x.json', {}
-
-      context "and has a chefignore everywhere except cookbooks" do
-        chefignore = "x.json\nroles/x.json\nenvironments/x.json\ndata_bags/bag1/x.json\nbag1/x.json\ncookbooks/cookbook1/x.json\ncookbook1/x.json\n"
-        file 'chefignore', chefignore
-        file 'roles/chefignore', chefignore
-        file 'environments/chefignore', chefignore
-        file 'data_bags/chefignore', chefignore
-        file 'data_bags/bag1/chefignore', chefignore
-        file 'cookbooks/cookbook1/chefignore', chefignore
-
-        it 'nothing is ignored' do
-          # NOTE: many of the "chefignore" files should probably not show up
-          # themselves, but we have other tests that talk about that
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-data_bags
-environments
-roles
-
-/cookbooks:
-cookbook1
-
-/cookbooks/cookbook1:
-chefignore
-x.json
-
-/data_bags:
-bag1
-chefignore
-
-/data_bags/bag1:
-chefignore
-x.json
-
-/environments:
-chefignore
-x.json
-
-/roles:
-chefignore
-x.json
-EOM
-        end
-      end
-    end
-
-    when_the_repository 'has a cookbook with only chefignored files' do
-      file 'cookbooks/cookbook1/templates/default/x.rb', ''
-      file 'cookbooks/cookbook1/libraries/x.rb', ''
-      file 'cookbooks/chefignore', "libraries/x.rb\ntemplates/default/x.rb\n"
-
-      it 'the cookbook is not listed' do
-        knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-EOM
-      end
-    end
-
-    when_the_repository "has multiple cookbooks" do
-      file 'cookbooks/cookbook1/x.json', {}
-      file 'cookbooks/cookbook1/y.json', {}
-      file 'cookbooks/cookbook2/x.json', {}
-      file 'cookbooks/cookbook2/y.json', {}
-
-      context 'and has a chefignore with filenames' do
-        file 'cookbooks/chefignore', "x.json\n"
-
-        it 'matching files and directories get ignored in all cookbooks' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-y.json
-
-/cookbooks/cookbook2:
-y.json
-EOM
-        end
-      end
-
-      context "and has a chefignore with wildcards" do
-        file 'cookbooks/chefignore', "x.*\n"
-        file 'cookbooks/cookbook1/x.rb', ''
-
-        it 'matching files and directories get ignored in all cookbooks' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-y.json
-
-/cookbooks/cookbook2:
-y.json
-EOM
-        end
-      end
-
-      context "and has a chefignore with relative paths" do
-        file 'cookbooks/cookbook1/recipes/x.rb', ''
-        file 'cookbooks/cookbook2/recipes/y.rb', ''
-        file 'cookbooks/chefignore', "recipes/x.rb\n"
-
-        it 'matching directories get ignored' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-x.json
-y.json
-
-/cookbooks/cookbook2:
-recipes
-x.json
-y.json
-
-/cookbooks/cookbook2/recipes:
-y.rb
-EOM
-        end
-      end
-
-      context "and has a chefignore with subdirectories" do
-        file 'cookbooks/cookbook1/recipes/y.rb', ''
-        file 'cookbooks/chefignore', "recipes\n"
-
-        it 'matching directories do NOT get ignored' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-recipes
-x.json
-y.json
-
-/cookbooks/cookbook1/recipes:
-y.rb
-
-/cookbooks/cookbook2:
-x.json
-y.json
-EOM
-        end
-      end
-
-      context "and has a chefignore that ignores all files in a subdirectory" do
-        file 'cookbooks/cookbook1/templates/default/x.rb', ''
-        file 'cookbooks/cookbook1/libraries/x.rb', ''
-        file 'cookbooks/chefignore', "libraries/x.rb\ntemplates/default/x.rb\n"
-
-        it 'ignores the subdirectory entirely' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-x.json
-y.json
-
-/cookbooks/cookbook2:
-x.json
-y.json
-EOM
-        end
-      end
-
-      context "and has an empty chefignore" do
-        file 'cookbooks/chefignore', "\n"
-
-        it 'nothing is ignored' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-x.json
-y.json
-
-/cookbooks/cookbook2:
-x.json
-y.json
-EOM
-        end
-      end
-
-      context "and has a chefignore with comments and empty lines" do
-        file 'cookbooks/chefignore', "\n\n # blah\n#\nx.json\n\n"
-
-        it 'matching files and directories get ignored in all cookbooks' do
-          knife('list --local -R /').should_succeed <<EOM
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-cookbook1
-cookbook2
-
-/cookbooks/cookbook1:
-y.json
-
-/cookbooks/cookbook2:
-y.json
-EOM
-        end
-      end
-    end
-
-    when_the_repository "has multiple cookbook paths" do
-      before :each do
-        Chef::Config.cookbook_path = [
-          File.join(Chef::Config.chef_repo_path, 'cookbooks1'),
-          File.join(Chef::Config.chef_repo_path, 'cookbooks2')
-        ]
-      end
-
-      file 'cookbooks1/mycookbook/metadata.rb', ''
-      file 'cookbooks1/mycookbook/x.json', {}
-      file 'cookbooks2/yourcookbook/metadata.rb', ''
-      file 'cookbooks2/yourcookbook/x.json', ''
-
-      context "and multiple chefignores" do
-        file 'cookbooks1/chefignore', "metadata.rb\n"
-        file 'cookbooks2/chefignore', "x.json\n"
-        it "chefignores apply only to the directories they are in" do
-          knife('list --local -R /').should_succeed(<<EOM, :stderr => "WARN: Child with name 'chefignore' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks2/chefignore and #{Chef::Config.chef_repo_path}/cookbooks1/chefignore\n")
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-mycookbook
-yourcookbook
-
-/cookbooks/mycookbook:
-x.json
-
-/cookbooks/yourcookbook:
-metadata.rb
-EOM
-        end
-
-        context "and conflicting cookbooks" do
-          file 'cookbooks1/yourcookbook/metadata.rb', ''
-          file 'cookbooks1/yourcookbook/x.json', ''
-          file 'cookbooks1/yourcookbook/onlyincookbooks1.rb', ''
-          file 'cookbooks2/yourcookbook/onlyincookbooks2.rb', ''
-
-          it "chefignores apply only to the winning cookbook" do
-            knife('list --local -R /').should_succeed(<<EOM, :stderr => "WARN: Child with name 'chefignore' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks2/chefignore and #{Chef::Config.chef_repo_path}/cookbooks1/chefignore\nWARN: Child with name 'yourcookbook' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks2/yourcookbook and #{Chef::Config.chef_repo_path}/cookbooks1/yourcookbook\n")
-/:
-cookbooks
-
-/cookbooks:
-chefignore
-mycookbook
-yourcookbook
-
-/cookbooks/mycookbook:
-x.json
-
-/cookbooks/yourcookbook:
-onlyincookbooks1.rb
-x.json
-EOM
-          end
-        end
-      end
-    end
-  end
-
-  # TODO alternate repo_path / *_path
-  context 'alternate *_path' do
-    when_the_repository 'has clients and clients2, cookbooks and cookbooks2, etc.' do
-      file 'clients/client1.json', {}
-      file 'cookbooks/cookbook1/metadata.rb', ''
-      file 'data_bags/bag/item.json', {}
-      file 'environments/env1.json', {}
-      file 'nodes/node1.json', {}
-      file 'roles/role1.json', {}
-      file 'users/user1.json', {}
-
-      file 'clients2/client1.json', {}
-      file 'cookbooks2/cookbook2/metadata.rb', ''
-      file 'data_bags2/bag2/item2.json', {}
-      file 'environments2/env2.json', {}
-      file 'nodes2/node2.json', {}
-      file 'roles2/role2.json', {}
-      file 'users2/user2.json', {}
-
-      directory 'chef_repo2' do
-        file 'clients/client3.json', {}
-        file 'cookbooks/cookbook3/metadata.rb', ''
-        file 'data_bags/bag3/item3.json', {}
-        file 'environments/env3.json', {}
-        file 'nodes/node3.json', {}
-        file 'roles/role3.json', {}
-        file 'users/user3.json', {}
-      end
-
-      context 'when all _paths are set to alternates' do
-        before :each do
-          %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = File.join(Chef::Config.chef_repo_path, "#{object_name}s2")
-          end
-          Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
-        end
-
-        context 'when cwd is at the top level' do
-          cwd '.'
-          it 'knife list --local -R fails' do
-            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
-          end
-        end
-
-        context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
-          it 'knife list --local -R fails' do
-            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
-          end
-        end
-
-        context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
-          it 'knife list --local -R lists everything' do
-            knife('list --local -R').should_succeed <<EOM
-.:
-cookbooks
-data_bags
-environments
-roles
-
-cookbooks:
-cookbook2
-
-cookbooks/cookbook2:
-metadata.rb
-
-data_bags:
-bag2
-
-data_bags/bag2:
-item2.json
-
-environments:
-env2.json
-
-roles:
-role2.json
-EOM
-          end
-        end
-
-        context 'when cwd is inside data_bags2' do
-          cwd 'data_bags2'
-          it 'knife list --local -R lists data bags' do
-            knife('list --local -R').should_succeed <<EOM
-.:
-bag2
-
-bag2:
-item2.json
-EOM
-          end
-          it 'knife list --local -R ../roles lists roles' do
-            knife('list --local -R ../roles').should_succeed "/roles/role2.json\n"
-          end
-        end
-      end
-
-      context 'when all _paths except chef_repo_path are set to alternates' do
-        before :each do
-          %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = File.join(Chef::Config.chef_repo_path, "#{object_name}s2")
-          end
-        end
-
-        context 'when cwd is at the top level' do
-          cwd '.'
-          it 'knife list --local -R lists everything' do
-            knife('list --local -R').should_succeed <<EOM
-.:
-cookbooks
-data_bags
-environments
-roles
-
-cookbooks:
-cookbook2
-
-cookbooks/cookbook2:
-metadata.rb
-
-data_bags:
-bag2
-
-data_bags/bag2:
-item2.json
-
-environments:
-env2.json
-
-roles:
-role2.json
-EOM
-          end
-        end
-
-        context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
-          it 'knife list --local -R fails' do
-            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
-          end
-        end
-
-        context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
-          it 'knife list -R fails' do
-            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
-          end
-        end
-
-        context 'when cwd is inside data_bags2' do
-          cwd 'data_bags2'
-          it 'knife list --local -R lists data bags' do
-            knife('list --local -R').should_succeed <<EOM
-.:
-bag2
-
-bag2:
-item2.json
-EOM
-          end
-        end
-      end
-
-      context 'when only chef_repo_path is set to its alternate' do
-        before :each do
-          %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
-          end
-          Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
-        end
-
-        context 'when cwd is at the top level' do
-          cwd '.'
-          it 'knife list --local -R fails' do
-            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
-          end
-        end
-
-        context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
-          it 'knife list --local -R fails' do
-            knife('list --local -R').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
-          end
-        end
-
-        context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
-          it 'knife list --local -R lists everything' do
-            knife('list --local -R').should_succeed <<EOM
-.:
-cookbooks
-data_bags
-environments
-roles
-
-cookbooks:
-cookbook3
-
-cookbooks/cookbook3:
-metadata.rb
-
-data_bags:
-bag3
-
-data_bags/bag3:
-item3.json
-
-environments:
-env3.json
-
-roles:
-role3.json
-EOM
-          end
-        end
-      end
-
-      context 'when paths are set to point to both versions of each' do
-        before :each do
-          %w(client cookbooks data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = [
-              File.join(Chef::Config.chef_repo_path, "#{object_name}s"),
-              File.join(Chef::Config.chef_repo_path, "#{object_name}s2")
-            ]
-          end
-          Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo_top')
-        end
-      end
-    end
-  end
-
-  # TODO nonexistent repo_path / *_path
 end