Revert "Merge branch 'CHEF-3307'"

This reverts commit 5713a002062c762e40e4378be6d7763eb3dd61a2, reversing
changes made to 4079a344f2001c1927132e7ed6b63453f459609f.

Conflicts:
	spec/unit/cookbook_loader_spec.rb

1 files changed, 1 insertions, 22 deletions

diff --git a/spec/unit/cookbook_loader_spec.rb b/spec/unit/cookbook_loader_spec.rb
index fd37aa1f08..c3303dd09a 100644
--- a/spec/unit/cookbook_loader_spec.rb
+++ b/spec/unit/cookbook_loader_spec.rb
@@ -68,8 +68,7 @@ describe Chef::CookbookLoader do
         seen[2].should == "borken"
         seen[3].should == "ignorken"
         seen[4].should == "java"
-        seen[5].should == "nginx"
-        seen[6].should == "openldap"
+        seen[5].should == "openldap"
       end
     end
   
@@ -156,26 +155,6 @@ describe Chef::CookbookLoader do
         end
         @cookbook_loader.load_cookbooks
       end
-
-      it "should index cookbooks by name, not pathname" do
-        @cookbook_loader.should_not have_key(:'not-nginx')
-        @cookbook_loader.should_not have_key(:'no-really-not-nginx')
-        @cookbook_loader.should have_key(:nginx)
-      end
-
-      it "should shadow cookbooks by name, not pathname" do
-        @cookbook_loader[:nginx].attribute_filenames.detect { |f|
-          f =~ /cookbooks\/not-nginx\/attributes\/default.rb/
-        }.should_not eql(nil)
-        @cookbook_loader[:nginx].attribute_filenames.detect { |f|
-          f =~ /kitchen\/no-really-not-nginx\/attributes\/default.rb/
-        }.should eql(nil)
-      end
-
-      it "should emit deprecation warning if name is not in metadata" do
-        Chef::Log.should_receive(:warn).at_least(:once).with(/Inferring cookbook name from directory name \([^)]+\) is deprecated, please set a name in the metadata./)
-        @cookbook_loader.load_cookbooks
-      end
     end # load_cookbooks
 
   end # loading all cookbooks