chef 11.10.0.rc.0-x86-mingw32 → 11.10.0.rc.1-x86-mingw32

data/spec/unit/provider/user/solaris_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Provider::User::Solaris do
     p.current_resource = @current_resource
 
     # Prevent the useradd-based provider tests from trying to write /etc/shadow
-    p.stub!(:write_shadow_file)
+    p.stub(:write_shadow_file)
     p
   end
 
@@ -52,12 +52,12 @@ describe Chef::Provider::User::Solaris do
       @new_resource.password "hocus-pocus"
 
       # Let these tests run #write_shadow_file
-      provider.unstub!(:write_shadow_file)
+      provider.unstub(:write_shadow_file)
     end
 
     it "should use its own shadow file writer to set the password" do
       provider.should_receive(:write_shadow_file)
-      provider.stub!(:shell_out!).and_return(true)
+      provider.stub(:shell_out!).and_return(true)
       provider.manage_user
     end
 
@@ -66,10 +66,10 @@ describe Chef::Provider::User::Solaris do
       password_file.puts "adam:existingpassword:15441::::::"
       password_file.close
       provider.password_file = password_file.path
-      provider.stub!(:shell_out!).and_return(true)
+      provider.stub(:shell_out!).and_return(true)
       # may not be able to write to /etc for tests...
       temp_file = Tempfile.new("shadow")
-      Tempfile.stub!(:new).with("shadow", "/etc").and_return(temp_file)
+      Tempfile.stub(:new).with("shadow", "/etc").and_return(temp_file)
       @new_resource.password "verysecurepassword"
       provider.manage_user
       ::File.open(password_file.path, "r").read.should =~ /adam:verysecurepassword:/

data/spec/unit/provider/user/windows_spec.rb

@@ -35,8 +35,8 @@ describe Chef::Provider::User::Windows do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @current_resource = Chef::Resource::User.new("monkey")
 
-    @net_user = mock("Chef::Util::Windows::NetUser")
-    Chef::Util::Windows::NetUser.stub!(:new).and_return(@net_user)
+    @net_user = double("Chef::Util::Windows::NetUser")
+    Chef::Util::Windows::NetUser.stub(:new).and_return(@net_user)
 
     @provider = Chef::Provider::User::Windows.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
@@ -120,7 +120,7 @@ describe Chef::Provider::User::Windows do
 
   describe "when creating the user" do
     it "should call @net_user.add with the return of set_options" do
-      @provider.stub!(:set_options).and_return(:name=> "monkey")
+      @provider.stub(:set_options).and_return(:name=> "monkey")
       @net_user.should_receive(:add).with(:name=> "monkey")
       @provider.create_user
     end
@@ -128,7 +128,7 @@ describe Chef::Provider::User::Windows do
 
   describe "manage_user" do
     before(:each) do
-      @provider.stub!(:set_options).and_return(:name=> "monkey")
+      @provider.stub(:set_options).and_return(:name=> "monkey")
     end
 
     it "should call @net_user.update with the return of set_options" do
@@ -150,19 +150,19 @@ describe Chef::Provider::User::Windows do
     end
 
     it "should return true if user is locked" do
-      @net_user.stub!(:check_enabled).and_return(true)
+      @net_user.stub(:check_enabled).and_return(true)
       @provider.check_lock.should eql(true)
     end
 
     it "should return false if user is not locked" do
-      @net_user.stub!(:check_enabled).and_return(false)
+      @net_user.stub(:check_enabled).and_return(false)
       @provider.check_lock.should eql(false)
     end
   end
 
   describe "locking the user" do
     it "should call @net_user.disable_account" do
-      @net_user.stub!(:check_enabled).and_return(true)
+      @net_user.stub(:check_enabled).and_return(true)
       @net_user.should_receive(:disable_account)
       @provider.lock_user
     end
@@ -170,7 +170,7 @@ describe Chef::Provider::User::Windows do
 
   describe "unlocking the user" do
     it "should call @net_user.enable_account" do
-      @net_user.stub!(:check_enabled).and_return(false)
+      @net_user.stub(:check_enabled).and_return(false)
       @net_user.should_receive(:enable_account)
       @provider.unlock_user
     end

data/spec/unit/provider/user_spec.rb

@@ -58,7 +58,7 @@ describe Chef::Provider::User do
   describe "executing load_current_resource" do
     before(:each) do
       @node = Chef::Node.new
-      #@new_resource = mock("Chef::Resource::User",
+      #@new_resource = double("Chef::Resource::User",
       #  :null_object => true,
       #  :username => "adam",
       #  :comment => "Adam Jacob",
@@ -69,7 +69,7 @@ describe Chef::Provider::User do
       #  :password => nil,
       #  :updated => nil
       #)
-      Chef::Resource::User.stub!(:new).and_return(@current_resource)
+      Chef::Resource::User.stub(:new).and_return(@current_resource)
       @pw_user = EtcPwnamIsh.new
       @pw_user.name = "adam"
       @pw_user.gid = 1000
@@ -78,7 +78,7 @@ describe Chef::Provider::User do
       @pw_user.dir = "/home/adam"
       @pw_user.shell = "/usr/bin/zsh"
       @pw_user.passwd = "*"
-      Etc.stub!(:getpwnam).and_return(@pw_user)
+      Etc.stub(:getpwnam).and_return(@pw_user)
     end
 
     it "should create a current resource with the same name as the new resource" do
@@ -129,7 +129,7 @@ describe Chef::Provider::User do
     end
 
     it "shouldn't try and convert the group gid if none has been supplied" do
-      @new_resource.stub!(:gid).and_return(nil)
+      @new_resource.stub(:gid).and_return(nil)
       @provider.should_not_receive(:convert_group_name)
       @provider.load_current_resource
     end
@@ -156,7 +156,7 @@ describe Chef::Provider::User do
         user.name = "root"
         user.passwd = "x"
         @new_resource.password "some new password"
-        Etc.stub!(:getpwnam).and_return(user)
+        Etc.stub(:getpwnam).and_return(user)
       end
 
       unless shadow_lib_unavail?
@@ -225,8 +225,8 @@ describe Chef::Provider::User do
 
   describe "action_create" do
     before(:each) do
-      @provider.stub!(:load_current_resource)
-      # @current_resource = mock("Chef::Resource::User",
+      @provider.stub(:load_current_resource)
+      # @current_resource = double("Chef::Resource::User",
       #   :null_object => true,
       #   :username => "adam",
       #   :comment => "Adam Jacob",
@@ -240,8 +240,8 @@ describe Chef::Provider::User do
       # @provider = Chef::Provider::User.new(@node, @new_resource)
       # @provider.current_resource = @current_resource
       # @provider.user_exists = false
-      # @provider.stub!(:create_user).and_return(true)
-      # @provider.stub!(:manage_user).and_return(true)
+      # @provider.stub(:create_user).and_return(true)
+      # @provider.stub(:manage_user).and_return(true)
     end
 
     it "should call create_user if the user does not exist" do
@@ -254,15 +254,15 @@ describe Chef::Provider::User do
 
     it "should call manage_user if the user exists and has mismatched attributes" do
       @provider.user_exists = true
-      @provider.stub!(:compare_user).and_return(true)
+      @provider.stub(:compare_user).and_return(true)
       @provider.should_receive(:manage_user).and_return(true)
       @provider.action_create
     end
 
     it "should set the new_resources updated flag when it creates the user if we call manage_user" do
       @provider.user_exists = true
-      @provider.stub!(:compare_user).and_return(true)
-      @provider.stub!(:manage_user).and_return(true)
+      @provider.stub(:compare_user).and_return(true)
+      @provider.stub(:manage_user).and_return(true)
       @provider.action_create
       @provider.set_updated_status
       @new_resource.should be_updated
@@ -271,7 +271,7 @@ describe Chef::Provider::User do
 
   describe "action_remove" do
     before(:each) do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
     end
 
     it "should not call remove_user if the user does not exist" do
@@ -297,18 +297,18 @@ describe Chef::Provider::User do
 
   describe "action_manage" do
     before(:each) do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User",
+      # @new_resource = double("Chef::Resource::User",
       #   :null_object => true
       # )
-      # @current_resource = mock("Chef::Resource::User",
+      # @current_resource = double("Chef::Resource::User",
       #   :null_object => true
       # )
       # @provider = Chef::Provider::User.new(@node, @new_resource)
       # @provider.current_resource = @current_resource
       # @provider.user_exists = true
-      # @provider.stub!(:manage_user).and_return(true)
+      # @provider.stub(:manage_user).and_return(true)
     end
 
     it "should run manage_user if the user exists and has mismatched attributes" do
@@ -318,8 +318,8 @@ describe Chef::Provider::User do
     end
 
     it "should set the new resources updated flag to true if manage_user is called" do
-      @provider.stub!(:compare_user).and_return(true)
-      @provider.stub!(:manage_user).and_return(true)
+      @provider.stub(:compare_user).and_return(true)
+      @provider.stub(:manage_user).and_return(true)
       @provider.action_manage
       @provider.set_updated_status
       @new_resource.should be_updated
@@ -340,18 +340,18 @@ describe Chef::Provider::User do
 
   describe "action_modify" do
     before(:each) do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User",
+      # @new_resource = double("Chef::Resource::User",
       #   :null_object => true
       # )
-      # @current_resource = mock("Chef::Resource::User",
+      # @current_resource = double("Chef::Resource::User",
       #   :null_object => true
       # )
       # @provider = Chef::Provider::User.new(@node, @new_resource)
       # @provider.current_resource = @current_resource
       # @provider.user_exists = true
-      # @provider.stub!(:manage_user).and_return(true)
+      # @provider.stub(:manage_user).and_return(true)
     end
 
     it "should run manage_user if the user exists and has mismatched attributes" do
@@ -361,8 +361,8 @@ describe Chef::Provider::User do
     end
 
     it "should set the new resources updated flag to true if manage_user is called" do
-      @provider.stub!(:compare_user).and_return(true)
-      @provider.stub!(:manage_user).and_return(true)
+      @provider.stub(:compare_user).and_return(true)
+      @provider.stub(:manage_user).and_return(true)
       @provider.action_modify
       @provider.set_updated_status
       @new_resource.should be_updated
@@ -383,16 +383,16 @@ describe Chef::Provider::User do
 
   describe "action_lock" do
     before(:each) do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
     end
     it "should lock the user if it exists and is unlocked" do
-      @provider.stub!(:check_lock).and_return(false)
+      @provider.stub(:check_lock).and_return(false)
       @provider.should_receive(:lock_user).and_return(true)
       @provider.action_lock
     end
 
     it "should set the new resources updated flag to true if lock_user is called" do
-      @provider.stub!(:check_lock).and_return(false)
+      @provider.stub(:check_lock).and_return(false)
       @provider.should_receive(:lock_user)
       @provider.action_lock
       @provider.set_updated_status
@@ -409,23 +409,23 @@ describe Chef::Provider::User do
 
   describe "action_unlock" do
     before(:each) do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User",
+      # @new_resource = double("Chef::Resource::User",
       #   :null_object => true
       # )
-      # @current_resource = mock("Chef::Resource::User",
+      # @current_resource = double("Chef::Resource::User",
       #   :null_object => true
       # )
       # @provider = Chef::Provider::User.new(@node, @new_resource)
       # @provider.current_resource = @current_resource
       # @provider.user_exists = true
-      # @provider.stub!(:check_lock).and_return(true)
-      # @provider.stub!(:unlock_user).and_return(true)
+      # @provider.stub(:check_lock).and_return(true)
+      # @provider.stub(:unlock_user).and_return(true)
     end
 
     it "should unlock the user if it exists and is locked" do
-      @provider.stub!(:check_lock).and_return(true)
+      @provider.stub(:check_lock).and_return(true)
       @provider.should_receive(:unlock_user).and_return(true)
       @provider.action_unlock
       @provider.set_updated_status

data/spec/unit/provider_spec.rb

@@ -93,15 +93,15 @@ describe Chef::Provider do
   it "does not re-load recipes when creating the temporary run context" do
     # we actually want to test that RunContext#load is never called, but we
     # can't stub all instances of an object with rspec's mocks. :/
-    Chef::RunContext.stub!(:new).and_raise("not supposed to happen")
+    Chef::RunContext.stub(:new).and_raise("not supposed to happen")
     snitch = Proc.new {temporary_collection = @run_context.resource_collection}
     @provider.send(:recipe_eval, &snitch)
   end
 
   context "when no converge actions are queued" do
     before do
-      @provider.stub!(:whyrun_supported?).and_return(true)
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:whyrun_supported?).and_return(true)
+      @provider.stub(:load_current_resource)
     end
 
     it "does not mark the new resource as updated" do

data/spec/unit/recipe_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Recipe do
     # Shell/ext.rb is on the run path, and it defines
     # Chef::Recipe#resources to call pp, which we don't want when
     # we're running tests.
-    @recipe.stub!(:pp)
+    @recipe.stub(:pp)
   end
 
   describe "method_missing" do
@@ -46,7 +46,7 @@ describe Chef::Recipe do
           @recipe.zen_master "monkey" do
             peace true
           end
-        end.should_not raise_error(ArgumentError)
+        end.should_not raise_error
       end
 
       it "should load a one word (cat) resource" do
@@ -54,7 +54,7 @@ describe Chef::Recipe do
           @recipe.cat "loulou" do
             pretty_kitty true
           end
-        end.should_not raise_error(ArgumentError)
+        end.should_not raise_error
       end
 
       it "should load a four word (one_two_three_four) resource" do
@@ -62,7 +62,7 @@ describe Chef::Recipe do
           @recipe.one_two_three_four "numbers" do
             i_can_count true
           end
-        end.should_not raise_error(ArgumentError)
+        end.should_not raise_error
       end
 
       it "should throw an error if you access a resource that we can't find" do
@@ -127,6 +127,81 @@ describe Chef::Recipe do
       end
     end
 
+    describe "creating resources via build_resource" do
+      let(:zm_resource) do
+        @recipe.build_resource(:zen_master, "klopp") do
+          something "bvb"
+        end
+      end
+
+      it "applies attributes from the block to the resource" do
+        zm_resource.something.should == "bvb"
+      end
+
+      it "sets contextual attributes on the resource" do
+        zm_resource.recipe_name.should == "test"
+        zm_resource.cookbook_name.should == "hjk"
+        zm_resource.source_line.should include(__FILE__)
+      end
+
+      it "does not add the resource to the resource collection" do
+        zm_resource # force let binding evaluation
+        expect { @run_context.resource_collection.resources(:zen_master => "klopp") }.to raise_error(Chef::Exceptions::ResourceNotFound)
+      end
+
+    end
+
+    describe "creating resources via declare_resource" do
+      let(:zm_resource) do
+        @recipe.declare_resource(:zen_master, "klopp") do
+          something "bvb"
+        end
+      end
+
+      it "applies attributes from the block to the resource" do
+        zm_resource.something.should == "bvb"
+      end
+
+      it "sets contextual attributes on the resource" do
+        zm_resource.recipe_name.should == "test"
+        zm_resource.cookbook_name.should == "hjk"
+        zm_resource.source_line.should include(__FILE__)
+      end
+
+      it "adds the resource to the resource collection" do
+        zm_resource # force let binding evaluation
+        @run_context.resource_collection.resources(:zen_master => "klopp").should == zm_resource
+      end
+
+    end
+
+    describe "when attempting to create a resource of an invalid type" do
+
+      it "gives a sane error message when using method_missing" do
+        lambda do
+          @recipe.no_such_resource("foo")
+        end.should raise_error(NoMethodError, %q[No resource or method named `no_such_resource' for `Chef::Recipe "test"'])
+      end
+
+      it "gives a sane error message when using method_missing 'bare'" do
+        lambda do
+          @recipe.instance_eval do
+            # Giving an argument will change this from NameError to NoMethodError
+            no_such_resource
+          end
+        end.should raise_error(NameError, %q[No resource, method, or local variable named `no_such_resource' for `Chef::Recipe "test"'])
+      end
+
+      it "gives a sane error message when using build_resource" do
+        expect { @recipe.build_resource(:no_such_resource, "foo") }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+      end
+
+      it "gives a sane error message when using declare_resource" do
+        expect { @recipe.declare_resource(:no_such_resource, "bar") }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+      end
+
+    end
+
     describe "resource definitions" do
       it "should execute defined resources" do
         crow_define = Chef::ResourceDefinition.new

data/spec/unit/registry_helper_spec.rb

@@ -43,8 +43,8 @@ describe Chef::Provider::RegistryKey do
 
     Win32::Registry::Error = Class.new(RuntimeError)
 
-    @hive_mock = mock("::Win32::Registry::HKEY_CURRENT_USER")
-    @reg_mock = mock("reg")
+    @hive_mock = double("::Win32::Registry::HKEY_CURRENT_USER")
+    @reg_mock = double("reg")
   end
 
   describe "get_values" do