chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/spec/unit/run_context/cookbook_compiler_spec.rb

@@ -62,7 +62,7 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("dependency1::default")
 
       compiler.compile_attributes
-      node[:attr_load_order].should == ["dependency1::default", "dependency1::aa_first", "dependency1::zz_last"]
+      expect(node[:attr_load_order]).to eq(["dependency1::default", "dependency1::aa_first", "dependency1::zz_last"])
     end
 
     it "loads dependencies before loading the depending cookbook's attributes" do
@@ -73,11 +73,11 @@ describe Chef::RunContext::CookbookCompiler do
       compiler.compile_attributes
 
       # dependencies are stored in a hash so therefore unordered, but they should be loaded in sort order
-      node[:attr_load_order].should == ["dependency1::default",
+      expect(node[:attr_load_order]).to eq(["dependency1::default",
                                         "dependency1::aa_first",
                                         "dependency1::zz_last",
                                         "dependency2::default",
-                                        "test-with-deps::default"]
+                                        "test-with-deps::default"])
     end
 
     it "does not follow infinite dependency loops" do
@@ -86,7 +86,7 @@ describe Chef::RunContext::CookbookCompiler do
       # Circular deps should not cause infinite loops
       compiler.compile_attributes
 
-      node[:attr_load_order].should == ["circular-dep2::default", "circular-dep1::default", "test-with-circular-deps::default"]
+      expect(node[:attr_load_order]).to eq(["circular-dep2::default", "circular-dep1::default", "test-with-circular-deps::default"])
     end
 
     it "loads attributes from cookbooks that don't have a default.rb attribute file" do
@@ -94,7 +94,7 @@ describe Chef::RunContext::CookbookCompiler do
 
       compiler.compile_attributes
 
-      node[:attr_load_order].should == ["no-default-attr::server"]
+      expect(node[:attr_load_order]).to eq(["no-default-attr::server"])
     end
   end
 
@@ -108,7 +108,7 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_libraries
-      LibraryLoadOrder.load_order.should == ["dependency1", "dependency2", "test-with-deps", "circular-dep2", "circular-dep1", "test-with-circular-deps"]
+      expect(LibraryLoadOrder.load_order).to eq(["dependency1", "dependency2", "test-with-deps", "circular-dep2", "circular-dep1", "test-with-circular-deps"])
     end
   end
 
@@ -122,7 +122,7 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_lwrps
-      LibraryLoadOrder.load_order.should == ["dependency1-provider",
+      expect(LibraryLoadOrder.load_order).to eq(["dependency1-provider",
                                              "dependency1-resource",
                                              "dependency2-provider",
                                              "dependency2-resource",
@@ -133,7 +133,7 @@ describe Chef::RunContext::CookbookCompiler do
                                              "circular-dep1-provider",
                                              "circular-dep1-resource",
                                              "test-with-circular-deps-provider",
-                                             "test-with-circular-deps-resource"]
+                                             "test-with-circular-deps-resource"])
     end
   end
 
@@ -148,12 +148,12 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_resource_definitions
-      LibraryLoadOrder.load_order.should == ["dependency1-definition",
+      expect(LibraryLoadOrder.load_order).to eq(["dependency1-definition",
                                              "dependency2-definition",
                                              "test-with-deps-definition",
                                              "circular-dep2-definition",
                                              "circular-dep1-definition",
-                                             "test-with-circular-deps-definition"]
+                                             "test-with-circular-deps-definition"])
     end
 
   end
@@ -166,19 +166,19 @@ describe Chef::RunContext::CookbookCompiler do
     it "should return an array of cookbook names as symbols without duplicates" do
       node.run_list("test-with-circular-deps::default", "circular-dep1::default", "circular-dep2::default")
 
-      compiler.cookbook_order.should == [:"circular-dep2",
+      expect(compiler.cookbook_order).to eq([:"circular-dep2",
                                          :"circular-dep1",
-                                         :"test-with-circular-deps"]
+                                         :"test-with-circular-deps"])
     end
 
     it "determines if a cookbook is in the list of cookbooks reachable by dependency" do
       node.run_list("test-with-deps::default", "test-with-deps::server")
-      compiler.cookbook_order.should == [:dependency1, :dependency2, :"test-with-deps"]
-      compiler.unreachable_cookbook?(:dependency1).should be_false
-      compiler.unreachable_cookbook?(:dependency2).should be_false
-      compiler.unreachable_cookbook?(:'test-with-deps').should be_false
-      compiler.unreachable_cookbook?(:'circular-dep1').should be_true
-      compiler.unreachable_cookbook?(:'circular-dep2').should be_true
+      expect(compiler.cookbook_order).to eq([:dependency1, :dependency2, :"test-with-deps"])
+      expect(compiler.unreachable_cookbook?(:dependency1)).to be_falsey
+      expect(compiler.unreachable_cookbook?(:dependency2)).to be_falsey
+      expect(compiler.unreachable_cookbook?(:'test-with-deps')).to be_falsey
+      expect(compiler.unreachable_cookbook?(:'circular-dep1')).to be_truthy
+      expect(compiler.unreachable_cookbook?(:'circular-dep2')).to be_truthy
     end
 
 

data/spec/unit/run_context_spec.rb

@@ -21,8 +21,6 @@
 require 'spec_helper'
 require 'support/lib/library_load_order'
 
-Chef::Log.level = :debug
-
 describe Chef::RunContext do
   let(:chef_repo_path) { File.expand_path(File.join(CHEF_SPEC_DATA, "run_context", "cookbooks")) }
   let(:cookbook_collection) {
@@ -38,12 +36,21 @@ describe Chef::RunContext do
   let(:events) { Chef::EventDispatch::Dispatcher.new }
   let(:run_context) { Chef::RunContext.new(node, cookbook_collection, events) }
 
+  before(:each) do
+    @original_log_level = Chef::Log.level
+    Chef::Log.level = :debug
+  end
+
+  after(:each) do
+    Chef::Log.level = @original_log_level
+  end
+
   it "has a cookbook collection" do
-    run_context.cookbook_collection.should == cookbook_collection
+    expect(run_context.cookbook_collection).to eq(cookbook_collection)
   end
 
   it "has a node" do
-    run_context.node.should == node
+    expect(run_context.node).to eq(node)
   end
 
   describe "loading cookbooks for a run list" do
@@ -56,47 +63,52 @@ describe Chef::RunContext do
       end
 
       node.run_list << "test" << "test::one" << "test::two"
-      node.should_receive(:loaded_recipe).with(:test, "default")
-      node.should_receive(:loaded_recipe).with(:test, "one")
-      node.should_receive(:loaded_recipe).with(:test, "two")
+      expect(node).to receive(:loaded_recipe).with(:test, "default")
+      expect(node).to receive(:loaded_recipe).with(:test, "one")
+      expect(node).to receive(:loaded_recipe).with(:test, "two")
       run_context.load(node.run_list.expand('_default'))
     end
 
     it "should load all the definitions in the cookbooks for this node" do
-      run_context.definitions.should have_key(:new_cat)
-      run_context.definitions.should have_key(:new_badger)
-      run_context.definitions.should have_key(:new_dog)
+      expect(run_context.definitions).to have_key(:new_cat)
+      expect(run_context.definitions).to have_key(:new_badger)
+      expect(run_context.definitions).to have_key(:new_dog)
     end
 
     it "should load all the recipes specified for this node" do
-      run_context.resource_collection[0].to_s.should == "cat[einstein]"
-      run_context.resource_collection[1].to_s.should == "cat[loulou]"
-      run_context.resource_collection[2].to_s.should == "cat[birthday]"
-      run_context.resource_collection[3].to_s.should == "cat[peanut]"
-      run_context.resource_collection[4].to_s.should == "cat[fat peanut]"
+      expect(run_context.resource_collection[0].to_s).to eq("cat[einstein]")
+      expect(run_context.resource_collection[1].to_s).to eq("cat[loulou]")
+      expect(run_context.resource_collection[2].to_s).to eq("cat[birthday]")
+      expect(run_context.resource_collection[3].to_s).to eq("cat[peanut]")
+      expect(run_context.resource_collection[4].to_s).to eq("cat[fat peanut]")
     end
 
     it "loads all the attribute files in the cookbook collection" do
-      run_context.loaded_fully_qualified_attribute?("test", "george").should be_true
-      node[:george].should == "washington"
+      expect(run_context.loaded_fully_qualified_attribute?("test", "george")).to be_truthy
+      expect(node[:george]).to eq("washington")
     end
 
     it "registers attributes files as loaded so they won't be reloaded" do
       # This test unfortunately is pretty tightly intertwined with the
       # implementation of how nodes load attribute files, but is the only
       # convenient way to test this behavior.
-      node.should_not_receive(:from_file)
+      expect(node).not_to receive(:from_file)
       node.include_attribute("test::george")
     end
 
     it "raises an error when attempting to include_recipe from a cookbook not reachable by run list or dependencies" do
-      node.should_receive(:loaded_recipe).with(:ancient, "aliens")
-      lambda do
+      expect(node).to receive(:loaded_recipe).with(:ancient, "aliens")
+      expect do
         run_context.include_recipe("ancient::aliens")
       # In CHEF-5120, this becomes a Chef::Exceptions::MissingCookbookDependency error:
-      end.should raise_error(Chef::Exceptions::CookbookNotFound)
+      end.to raise_error(Chef::Exceptions::CookbookNotFound)
     end
 
+    it "raises an error on a recipe with a leading :: with no current_cookbook" do
+      expect do
+        run_context.include_recipe("::aliens")
+      end.to raise_error(RuntimeError)
+    end
   end
 
   describe "querying the contents of cookbooks" do
@@ -110,8 +122,8 @@ describe Chef::RunContext do
     }
 
     it "queries whether a given cookbook has a specific template" do
-      run_context.should have_template_in_cookbook("openldap", "test.erb")
-      run_context.should_not have_template_in_cookbook("openldap", "missing.erb")
+      expect(run_context).to have_template_in_cookbook("openldap", "test.erb")
+      expect(run_context).not_to have_template_in_cookbook("openldap", "missing.erb")
     end
 
     it "errors when querying for a template in a not-available cookbook" do
@@ -121,8 +133,8 @@ describe Chef::RunContext do
     end
 
     it "queries whether a given cookbook has a specific cookbook_file" do
-      run_context.should have_cookbook_file_in_cookbook("java", "java.response")
-      run_context.should_not have_cookbook_file_in_cookbook("java", "missing.txt")
+      expect(run_context).to have_cookbook_file_in_cookbook("java", "java.response")
+      expect(run_context).not_to have_cookbook_file_in_cookbook("java", "missing.txt")
     end
 
     it "errors when querying for a cookbook_file in a not-available cookbook" do
@@ -140,52 +152,11 @@ describe Chef::RunContext do
     it "stores and deletes the reboot request" do
       run_context.request_reboot(expected)
       expect(run_context.reboot_info).to eq(expected)
-      expect(run_context.reboot_requested?).to be_true
+      expect(run_context.reboot_requested?).to be_truthy
 
       run_context.cancel_reboot
       expect(run_context.reboot_info).to eq({})
-      expect(run_context.reboot_requested?).to be_false
-    end
-  end
-
-  describe "notifications" do
-    let(:notification) { Chef::Resource::Notification.new(nil, nil, notifying_resource) }
-
-    shared_context "notifying resource is a Chef::Resource" do
-      let(:notifying_resource)  { Chef::Resource.new("gerbil") }
-
-      it "should be keyed off the resource name" do
-        run_context.send(setter, notification)
-        expect(run_context.send(getter, notifying_resource)).to eq([notification])
-      end
-    end
-
-    shared_context "notifying resource is a subclass of Chef::Resource" do
-      let(:declared_type) { :alpaca }
-      let(:notifying_resource)  {
-        r = Class.new(Chef::Resource).new("guinea pig")
-        r.declared_type = declared_type
-        r
-      }
-
-      it "should be keyed off the resource declared key" do
-        run_context.send(setter, notification)
-        expect(run_context.send(getter, notifying_resource)).to eq([notification])
-      end
-    end
-
-    describe "of the immediate kind" do
-      let(:setter) { :notifies_immediately }
-      let(:getter) { :immediate_notifications }
-      include_context "notifying resource is a Chef::Resource"
-      include_context "notifying resource is a subclass of Chef::Resource"
-    end
-
-    describe "of the delayed kind" do
-      let(:setter) { :notifies_delayed }
-      let(:getter) { :delayed_notifications }
-      include_context "notifying resource is a Chef::Resource"
-      include_context "notifying resource is a subclass of Chef::Resource"
+      expect(run_context.reboot_requested?).to be_falsey
     end
   end
 end

data/spec/unit/run_list/run_list_expansion_spec.rb

@@ -27,23 +27,23 @@ describe Chef::RunList::RunListExpansion do
 
   describe "before expanding the run list" do
     it "has an array of run list items" do
-      @expansion.run_list_items.should == @run_list.run_list_items
+      expect(@expansion.run_list_items).to eq(@run_list.run_list_items)
     end
 
     it "has default_attrs" do
-      @expansion.default_attrs.should == Mash.new
+      expect(@expansion.default_attrs).to eq(Mash.new)
     end
 
     it "has override attrs" do
-      @expansion.override_attrs.should == Mash.new
+      expect(@expansion.override_attrs).to eq(Mash.new)
     end
 
     it "it has an empty list of recipes" do
-      @expansion.should have(0).recipes
+      expect(@expansion.recipes.size).to eq(0)
     end
 
     it "has not applied its roles" do
-      @expansion.applied_role?('rage').should be_false
+      expect(@expansion.applied_role?('rage')).to be_falsey
     end
   end
 
@@ -54,28 +54,28 @@ describe Chef::RunList::RunListExpansion do
         r.env_run_lists('_default' => [], "prod" => ["recipe[prod-only]"])
       end
       @expansion = Chef::RunList::RunListExpansion.new("prod", @run_list.run_list_items)
-      @expansion.should_receive(:fetch_role).and_return(@rage_role)
+      expect(@expansion).to receive(:fetch_role).and_return(@rage_role)
       @expansion.expand
     end
 
     it "has the correct list of recipes for the given environment" do
-      @expansion.recipes.should == ["lobster", "prod-only", "fist"]
+      expect(@expansion.recipes).to eq(["lobster", "prod-only", "fist"])
     end
 
   end
 
   describe "after applying a role" do
     before do
-      @expansion.stub(:fetch_role).and_return(Chef::Role.new)
+      allow(@expansion).to receive(:fetch_role).and_return(Chef::Role.new)
       @expansion.inflate_role('rage', "role[base]")
     end
 
     it "tracks the applied role" do
-      @expansion.applied_role?('rage').should be_true
+      expect(@expansion.applied_role?('rage')).to be_truthy
     end
 
     it "does not inflate the role again" do
-      @expansion.inflate_role('rage', "role[base]").should be_false
+      expect(@expansion.inflate_role('rage', "role[base]")).to be_falsey
     end
   end
 
@@ -89,39 +89,39 @@ describe Chef::RunList::RunListExpansion do
       @second_role.run_list('recipe[crabrevenge]')
       @second_role.default_attributes({'foo' => 'boo'})
       @second_role.override_attributes({'baz' => 'bux'})
-      @expansion.stub(:fetch_role).and_return(@first_role, @second_role)
+      allow(@expansion).to receive(:fetch_role).and_return(@first_role, @second_role)
       @expansion.expand
     end
 
     it "has the ordered list of recipes" do
-      @expansion.recipes.should == ['lobster', 'crabrevenge', 'fist']
+      expect(@expansion.recipes).to eq(['lobster', 'crabrevenge', 'fist'])
     end
 
-    it "has the merged attributes from the roles with outer roles overridding inner" do
-      @expansion.default_attrs.should == {'foo' => 'bar'}
-      @expansion.override_attrs.should == {'baz' => 'qux'}
+    it "has the merged attributes from the roles with outer roles overriding inner" do
+      expect(@expansion.default_attrs).to eq({'foo' => 'bar'})
+      expect(@expansion.override_attrs).to eq({'baz' => 'qux'})
     end
 
     it "has the list of all roles applied" do
       # this is the correct order, but 1.8 hash order is not stable
-      @expansion.roles.should =~ ['rage', 'mollusk']
+      expect(@expansion.roles).to match_array(['rage', 'mollusk'])
     end
 
   end
 
-  describe "after expanding a run list with a non existant role" do
+  describe "after expanding a run list with a non existent role" do
     before do
-      @expansion.stub(:fetch_role) { @expansion.role_not_found('crabrevenge', "role[base]") }
+      allow(@expansion).to receive(:fetch_role) { @expansion.role_not_found('crabrevenge', "role[base]") }
       @expansion.expand
     end
 
     it "is invalid" do
-      @expansion.should be_invalid
-      @expansion.errors?.should be_true # aliases
+      expect(@expansion).to be_invalid
+      expect(@expansion.errors?).to be_truthy # aliases
     end
 
     it "has a list of invalid role names" do
-      @expansion.errors.should include('crabrevenge')
+      expect(@expansion.errors).to include('crabrevenge')
     end
 
   end

data/spec/unit/run_list/run_list_item_spec.rb

@@ -22,16 +22,16 @@ describe Chef::RunList::RunListItem do
 
   describe "when creating from a Hash" do
     it "raises an exception when the hash doesn't have a :type key" do
-      lambda {Chef::RunList::RunListItem.new(:name => "tatft")}.should raise_error(ArgumentError)
+      expect {Chef::RunList::RunListItem.new(:name => "tatft")}.to raise_error(ArgumentError)
     end
 
     it "raises an exception when the hash doesn't have an :name key" do
-      lambda {Chef::RunList::RunListItem.new(:type => 'R') }.should raise_error(ArgumentError)
+      expect {Chef::RunList::RunListItem.new(:type => 'R') }.to raise_error(ArgumentError)
     end
 
     it "sets the name and type as given in the hash" do
       item = Chef::RunList::RunListItem.new(:type => 'fuuu', :name => 'uuuu')
-      item.to_s.should == 'fuuu[uuuu]'
+      expect(item.to_s).to eq('fuuu[uuuu]')
     end
 
   end
@@ -39,47 +39,47 @@ describe Chef::RunList::RunListItem do
   describe "when creating an item from a string" do
     it "parses a qualified recipe" do
       item = Chef::RunList::RunListItem.new("recipe[rage]")
-      item.should be_a_recipe
-      item.should_not be_a_role
-      item.to_s.should == 'recipe[rage]'
-      item.name.should == 'rage'
+      expect(item).to be_a_recipe
+      expect(item).not_to be_a_role
+      expect(item.to_s).to eq('recipe[rage]')
+      expect(item.name).to eq('rage')
     end
 
     it "parses a qualified recipe with a version" do
       item = Chef::RunList::RunListItem.new("recipe[rage@0.1.0]")
-      item.should be_a_recipe
-      item.should_not be_a_role
-      item.to_s.should == 'recipe[rage@0.1.0]'
-      item.name.should == 'rage'
-      item.version.should == '0.1.0'
+      expect(item).to be_a_recipe
+      expect(item).not_to be_a_role
+      expect(item.to_s).to eq('recipe[rage@0.1.0]')
+      expect(item.name).to eq('rage')
+      expect(item.version).to eq('0.1.0')
     end
 
     it "parses a qualified role" do
       item = Chef::RunList::RunListItem.new("role[fist]")
-      item.should be_a_role
-      item.should_not be_a_recipe
-      item.to_s.should == 'role[fist]'
-      item.name.should == 'fist'
+      expect(item).to be_a_role
+      expect(item).not_to be_a_recipe
+      expect(item.to_s).to eq('role[fist]')
+      expect(item.name).to eq('fist')
     end
 
     it "parses an unqualified recipe" do
       item = Chef::RunList::RunListItem.new("lobster")
-      item.should be_a_recipe
-      item.should_not be_a_role
-      item.to_s.should == 'recipe[lobster]'
-      item.name.should == 'lobster'
+      expect(item).to be_a_recipe
+      expect(item).not_to be_a_role
+      expect(item.to_s).to eq('recipe[lobster]')
+      expect(item.name).to eq('lobster')
     end
 
     it "raises an exception when the string has typo on the type part" do
-      lambda {Chef::RunList::RunListItem.new("Recipe[lobster]") }.should raise_error(ArgumentError)
+      expect {Chef::RunList::RunListItem.new("Recipe[lobster]") }.to raise_error(ArgumentError)
     end
 
     it "raises an exception when the string has extra space between the type and the name" do
-      lambda {Chef::RunList::RunListItem.new("recipe [lobster]") }.should raise_error(ArgumentError)
+      expect {Chef::RunList::RunListItem.new("recipe [lobster]") }.to raise_error(ArgumentError)
     end
 
     it "raises an exception when the string does not close the bracket" do
-      lambda {Chef::RunList::RunListItem.new("recipe[lobster") }.should raise_error(ArgumentError)
+      expect {Chef::RunList::RunListItem.new("recipe[lobster") }.to raise_error(ArgumentError)
     end
   end
 
@@ -87,31 +87,31 @@ describe Chef::RunList::RunListItem do
     it "is equal to another run list item that has the same name and type" do
       item1 = Chef::RunList::RunListItem.new('recipe[lrf]')
       item2 = Chef::RunList::RunListItem.new('recipe[lrf]')
-      item1.should == item2
+      expect(item1).to eq(item2)
     end
 
     it "is not equal to another run list item with the same name and different type" do
       item1 = Chef::RunList::RunListItem.new('recipe[lrf]')
       item2 = Chef::RunList::RunListItem.new('role[lrf]')
-      item1.should_not == item2
+      expect(item1).not_to eq(item2)
     end
 
     it "is not equal to another run list item with the same type and different name" do
       item1 = Chef::RunList::RunListItem.new('recipe[lrf]')
       item2 = Chef::RunList::RunListItem.new('recipe[lobsterragefist]')
-      item1.should_not == item2
+      expect(item1).not_to eq(item2)
     end
 
     it "is not equal to another run list item with the same name and type but different version" do
       item1 = Chef::RunList::RunListItem.new('recipe[lrf,0.1.0]')
       item2 = Chef::RunList::RunListItem.new('recipe[lrf,0.2.0]')
-      item1.should_not == item2
+      expect(item1).not_to eq(item2)
     end
   end
 
   describe "comparing to strings" do
     it "is equal to a string if that string matches its to_s representation" do
-      Chef::RunList::RunListItem.new('recipe[lrf]').should == 'recipe[lrf]'
+      expect(Chef::RunList::RunListItem.new('recipe[lrf]')).to eq('recipe[lrf]')
     end
   end
 end