chef 11.10.0.rc.0 → 11.10.0.rc.1

data/spec/unit/provider/group/dscl_spec.rb

@@ -27,12 +27,12 @@ describe Chef::Provider::Group::Dscl do
     @current_resource = Chef::Resource::Group.new("aj")
     @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
-    @status = mock("Process::Status", :exitstatus => 0)
+    @status = double("Process::Status", :exitstatus => 0)
     @pid = 2342
     @stdin = StringIO.new
     @stdout = StringIO.new("\n")
     @stderr = StringIO.new("")
-    @provider.stub!(:popen4).and_yield(@pid,@stdin,@stdout,@stderr).and_return(@status)
+    @provider.stub(:popen4).and_yield(@pid,@stdin,@stdout,@stderr).and_return(@status)
   end
 
   it "should run popen4 with the supplied array of arguments appended to the dscl command" do
@@ -50,7 +50,7 @@ describe Chef::Provider::Group::Dscl do
     before do
       @node = Chef::Node.new
       @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
-      @provider.stub!(:dscl).and_return(["cmd", @status, "stdout", "stderr"])
+      @provider.stub(:dscl).and_return(["cmd", @status, "stdout", "stderr"])
     end
 
     it "should run dscl with the supplied cmd /Path args" do
@@ -60,8 +60,8 @@ describe Chef::Provider::Group::Dscl do
 
     describe "with the dscl command returning a non zero exit status for a delete" do
       before do
-        @status = mock("Process::Status", :exitstatus => 1)
-        @provider.stub!(:dscl).and_return(["cmd", @status, "stdout", "stderr"])
+        @status = double("Process::Status", :exitstatus => 1)
+        @provider.stub(:dscl).and_return(["cmd", @status, "stdout", "stderr"])
       end
 
       it "should return an empty string of standard output for a delete" do
@@ -77,7 +77,7 @@ describe Chef::Provider::Group::Dscl do
 
     describe "with the dscl command returning no such key" do
       before do
-        @provider.stub!(:dscl).and_return(["cmd", @status, "No such key: ", "stderr"])
+        @provider.stub(:dscl).and_return(["cmd", @status, "No such key: ", "stderr"])
       end
 
       it "should raise an exception" do
@@ -98,7 +98,7 @@ describe Chef::Provider::Group::Dscl do
     before do
       @node = Chef::Node.new
       @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
-      @provider.stub!(:safe_dscl).and_return("\naj      200\njt      201\n")
+      @provider.stub(:safe_dscl).and_return("\naj      200\njt      201\n")
     end
 
     it "should run safe_dscl with list /Groups gid" do
@@ -120,7 +120,7 @@ describe Chef::Provider::Group::Dscl do
     before do
       @node = Chef::Node.new
       @provider = Chef::Provider::Group::Dscl.new(@node, @new_resource)
-      @provider.stub!(:safe_dscl).and_return("\naj      500\n")
+      @provider.stub(:safe_dscl).and_return("\naj      500\n")
     end
 
     it "should run safe_dscl with list /Groups gid" do
@@ -144,7 +144,7 @@ describe Chef::Provider::Group::Dscl do
   describe "set_gid" do
     describe "with the new resource and a gid number which is already in use" do
       before do
-        @provider.stub!(:gid_used?).and_return(true)
+        @provider.stub(:gid_used?).and_return(true)
       end
 
       it "should raise an exception if the new resources gid is already in use" do
@@ -162,7 +162,7 @@ describe Chef::Provider::Group::Dscl do
     describe "with blank gid number for the new resources" do
       before do
         @new_resource.instance_variable_set(:@gid, nil)
-        @new_resource.stub!(:safe_dscl)
+        @new_resource.stub(:safe_dscl)
       end
 
       it "should run get_free_gid and return a valid, unused gid number" do
@@ -185,9 +185,9 @@ describe Chef::Provider::Group::Dscl do
 
     describe "with existing members in the current resource and append set to false in the new resource" do
       before do
-        @new_resource.stub!(:members).and_return([])
-        @new_resource.stub!(:append).and_return(false)
-        @current_resource.stub!(:members).and_return(["all", "your", "base"])
+        @new_resource.stub(:members).and_return([])
+        @new_resource.stub(:append).and_return(false)
+        @current_resource.stub(:members).and_return(["all", "your", "base"])
       end
 
       it "should log an appropriate message" do
@@ -236,6 +236,7 @@ describe Chef::Provider::Group::Dscl do
 
   describe "when loading the current system state" do
     before (:each) do
+      @provider.action = :create
       @provider.load_current_resource
       @provider.define_resource_requirements
     end
@@ -246,8 +247,8 @@ describe Chef::Provider::Group::Dscl do
     end
 
     it "doesn't raise an error if /usr/bin/dscl exists" do
-      File.stub!(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      File.stub(:exists?).and_return(true)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 

data/spec/unit/provider/group/gpasswd_spec.rb

@@ -27,11 +27,12 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
     @new_resource.members %w{lobster rage fist}
     @new_resource.append false
     @provider = Chef::Provider::Group::Gpasswd.new(@new_resource, @run_context)
-    #@provider.stub!(:run_command).and_return(true)
+    #@provider.stub(:run_command).and_return(true)
   end
 
   describe "when determining the current group state" do
     before (:each) do
+      @provider.action = :create
       @provider.load_current_resource
       @provider.define_resource_requirements
     end
@@ -40,14 +41,14 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
     # for Chef::Provider::Group - no need to repeat it here.  We'll
     # include only what's specific to this provider.
     it "should raise an error if the required binary /usr/bin/gpasswd doesn't exist" do
-      File.stub!(:exists?).and_return(true)
+      File.stub(:exists?).and_return(true)
       File.should_receive(:exists?).with("/usr/bin/gpasswd").and_return(false)
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Group)
     end
 
     it "shouldn't raise an error if the required binaries exist" do
-      File.stub!(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      File.stub(:exists?).and_return(true)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 
@@ -85,7 +86,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
     describe "when the resource specifies group members" do
       it "should log an appropriate debug message" do
         Chef::Log.should_receive(:debug).with("group[wheel] setting group members to: lobster, rage, fist")
-        @provider.stub!(:shell_out!)
+        @provider.stub(:shell_out!)
         @provider.modify_group_members
       end
 

data/spec/unit/provider/group/groupadd_spec.rb

@@ -48,7 +48,7 @@ describe Chef::Provider::Group::Groupadd, "set_options" do
         @provider.set_options
     end
     it "should set the option for #{attribute} if the new resources #{attribute} is not null" do
-      @new_resource.stub!(attribute).and_return("wowaweea")
+      @new_resource.stub(attribute).and_return("wowaweea")
       @provider.set_options.should eql(" #{option} '#{@new_resource.send(attribute)}' #{@new_resource.group_name}")
     end
   end
@@ -56,7 +56,7 @@ describe Chef::Provider::Group::Groupadd, "set_options" do
   it "should combine all the possible options" do
     match_string = ""
     field_list.sort{ |a,b| a[0] <=> b[0] }.each do |attribute, option|
-      @new_resource.stub!(attribute).and_return("hola")
+      @new_resource.stub(attribute).and_return("hola")
       match_string << " #{option} 'hola'"
     end
     match_string << " aj"
@@ -93,10 +93,10 @@ describe Chef::Provider::Group::Groupadd, "create_group" do
     @node = Chef::Node.new
     @new_resource = Chef::Resource::Group.new("aj")
     @provider = Chef::Provider::Group::Groupadd.new(@node, @new_resource)
-    @provider.stub!(:run_command).and_return(true)
-    @provider.stub!(:set_options).and_return(" monkey")
-    @provider.stub!(:groupadd_options).and_return("")
-    @provider.stub!(:modify_group_members).and_return(true)
+    @provider.stub(:run_command).and_return(true)
+    @provider.stub(:set_options).and_return(" monkey")
+    @provider.stub(:groupadd_options).and_return("")
+    @provider.stub(:modify_group_members).and_return(true)
   end
 
   it "should run groupadd with the return of set_options" do
@@ -117,14 +117,14 @@ describe Chef::Provider::Group::Groupadd do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Group.new("aj")
     @provider = Chef::Provider::Group::Groupadd.new(@new_resource, @run_context)
-    @provider.stub!(:run_command).and_return(true)
-    @provider.stub!(:set_options).and_return(" monkey")
+    @provider.stub(:run_command).and_return(true)
+    @provider.stub(:set_options).and_return(" monkey")
   end
 
   describe "manage group" do
 
     it "should run groupmod with the return of set_options" do
-      @provider.stub!(:modify_group_members).and_return(true)
+      @provider.stub(:modify_group_members).and_return(true)
       @provider.should_receive(:run_command).with({ :command => "groupmod monkey" }).and_return(true)
       @provider.manage_group
     end
@@ -151,7 +151,7 @@ describe Chef::Provider::Group::Groupadd do
 
   describe "load_current_resource" do
     before do
-      File.stub!(:exists?).and_return(false)
+      File.stub(:exists?).and_return(false)
       @provider.define_resource_requirements
     end
     it "should raise an error if the required binary /usr/sbin/groupadd doesn't exist" do

data/spec/unit/provider/group/groupmod_spec.rb

@@ -43,8 +43,8 @@ describe Chef::Provider::Group::Groupmod do
       end
 
       it "shouldn't raise an error if the required binaries exist" do
-        File.stub!(:exists?).and_return(true)
-        lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Group)
+        File.stub(:exists?).and_return(true)
+        lambda { @provider.load_current_resource }.should_not raise_error
       end
     end
 
@@ -89,7 +89,7 @@ describe Chef::Provider::Group::Groupmod do
         end
 
         it "updates group membership correctly" do
-          Chef::Log.stub!(:debug)
+          Chef::Log.stub(:debug)
           @provider.should_receive(:shell_out!).with("group mod -n wheel_bak wheel")
           @provider.should_receive(:shell_out!).with("user mod -G wheel lobster")
           @provider.should_receive(:shell_out!).with("group add -g '123' -o wheel")

data/spec/unit/provider/group/pw_spec.rb

@@ -77,8 +77,8 @@ describe Chef::Provider::Group::Pw do
 
     describe "with an empty members array in both the new and current resource" do
       before do
-        @new_resource.stub!(:members).and_return([])
-        @current_resource.stub!(:members).and_return([])
+        @new_resource.stub(:members).and_return([])
+        @current_resource.stub(:members).and_return([])
       end
 
       it "should set no options" do
@@ -88,8 +88,8 @@ describe Chef::Provider::Group::Pw do
 
     describe "with an empty members array in the new resource and existing members in the current resource" do
       before do
-        @new_resource.stub!(:members).and_return([])
-        @current_resource.stub!(:members).and_return(["all", "your", "base"])
+        @new_resource.stub(:members).and_return([])
+        @current_resource.stub(:members).and_return(["all", "your", "base"])
       end
 
       it "should log an appropriate message" do
@@ -104,8 +104,8 @@ describe Chef::Provider::Group::Pw do
 
     describe "with supplied members array in the new resource and an empty members array in the current resource" do
       before do
-        @new_resource.stub!(:members).and_return(["all", "your", "base"])
-        @current_resource.stub!(:members).and_return([])
+        @new_resource.stub(:members).and_return(["all", "your", "base"])
+        @current_resource.stub(:members).and_return([])
       end
 
       it "should log an appropriate debug message" do
@@ -121,6 +121,7 @@ describe Chef::Provider::Group::Pw do
 
   describe"load_current_resource" do
     before (:each) do
+      @provider.action = :create
       @provider.load_current_resource
       @provider.define_resource_requirements
     end
@@ -130,8 +131,8 @@ describe Chef::Provider::Group::Pw do
     end
 
     it "shouldn't raise an error if /usr/sbin/pw exists" do
-      File.stub!(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      File.stub(:exists?).and_return(true)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 end

data/spec/unit/provider/group/usermod_spec.rb

@@ -27,15 +27,15 @@ describe Chef::Provider::Group::Usermod do
     @new_resource.members [ "all", "your", "base" ]
     @new_resource.excluded_members [ ]
     @provider = Chef::Provider::Group::Usermod.new(@new_resource, @run_context)
-    @provider.stub!(:run_command)
+    @provider.stub(:run_command)
   end
 
   describe "modify_group_members" do
 
     describe "with an empty members array" do
       before do
-        @new_resource.stub!(:append).and_return(true)
-        @new_resource.stub!(:members).and_return([])
+        @new_resource.stub(:append).and_return(true)
+        @new_resource.stub(:members).and_return([])
       end
 
       it "should log an appropriate message" do
@@ -55,8 +55,8 @@ describe Chef::Provider::Group::Usermod do
       }
 
       before do
-        @new_resource.stub!(:members).and_return(["all", "your", "base"])
-        File.stub!(:exists?).and_return(true)
+        @new_resource.stub(:members).and_return(["all", "your", "base"])
+        File.stub(:exists?).and_return(true)
       end
 
       it "should raise an error when setting the entire group directly" do
@@ -72,8 +72,8 @@ describe Chef::Provider::Group::Usermod do
         @provider.load_current_resource
         @provider.instance_variable_set("@group_exists", true)
         @provider.action = :modify
-        @new_resource.stub!(:append).and_return(true)
-        @new_resource.stub!(:excluded_members).and_return(["someone"])
+        @new_resource.stub(:append).and_return(true)
+        @new_resource.stub(:excluded_members).and_return(["someone"])
         lambda { @provider.run_action(@provider.process_resource_requirements) }.should raise_error(Chef::Exceptions::Group, "excluded_members is not supported by #{@provider.to_s}")
       end
 
@@ -83,7 +83,7 @@ describe Chef::Provider::Group::Usermod do
           current_resource.members([ ])
           @provider.current_resource = current_resource
           @node.automatic_attrs[:platform] = platform
-          @new_resource.stub!(:append).and_return(true)
+          @new_resource.stub(:append).and_return(true)
           @provider.should_receive(:shell_out!).with("usermod #{flags} wheel all")
           @provider.should_receive(:shell_out!).with("usermod #{flags} wheel your")
           @provider.should_receive(:shell_out!).with("usermod #{flags} wheel base")
@@ -95,19 +95,20 @@ describe Chef::Provider::Group::Usermod do
 
   describe "when loading the current resource" do
     before(:each) do
-      File.stub!(:exists?).and_return(false)
+      File.stub(:exists?).and_return(false)
+      @provider.action = :create
       @provider.define_resource_requirements
     end
 
     it "should raise an error if the required binary /usr/sbin/usermod doesn't exist" do
-      File.stub!(:exists?).and_return(true)
+      File.stub(:exists?).and_return(true)
       File.should_receive(:exists?).with("/usr/sbin/usermod").and_return(false)
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Group)
     end
 
     it "shouldn't raise an error if the required binaries exist" do
-      File.stub!(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      File.stub(:exists?).and_return(true)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 end

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

@@ -33,8 +33,8 @@ describe Chef::Provider::Group::Windows do
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Group.new("staff")
-    @net_group = mock("Chef::Util::Windows::NetGroup")
-    Chef::Util::Windows::NetGroup.stub!(:new).and_return(@net_group)
+    @net_group = double("Chef::Util::Windows::NetGroup")
+    Chef::Util::Windows::NetGroup.stub(:new).and_return(@net_group)
     @provider = Chef::Provider::Group::Windows.new(@new_resource, @run_context)
   end
 
@@ -52,21 +52,21 @@ describe Chef::Provider::Group::Windows do
       @current_resource = Chef::Resource::Group.new("staff")
       @current_resource.members [ "all", "your", "base" ]
 
-      Chef::Util::Windows::NetGroup.stub!(:new).and_return(@net_group)
-      @net_group.stub!(:local_add_members)
-      @net_group.stub!(:local_set_members)
+      Chef::Util::Windows::NetGroup.stub(:new).and_return(@net_group)
+      @net_group.stub(:local_add_members)
+      @net_group.stub(:local_set_members)
       @provider.stub(:local_group_name_to_sid)
       @provider.current_resource = @current_resource
     end
 
     it "should call @net_group.local_set_members" do
-      @new_resource.stub!(:append).and_return(false)
+      @new_resource.stub(:append).and_return(false)
       @net_group.should_receive(:local_set_members).with(@new_resource.members)
       @provider.manage_group
     end
 
     it "should call @net_group.local_add_members" do
-      @new_resource.stub!(:append).and_return(true)
+      @new_resource.stub(:append).and_return(true)
       @net_group.should_receive(:local_add_members).with(@new_resource.members)
       @provider.manage_group
     end
@@ -75,8 +75,8 @@ describe Chef::Provider::Group::Windows do
 
   describe "remove_group" do
     before do
-      Chef::Util::Windows::NetGroup.stub!(:new).and_return(@net_group)
-      @provider.stub!(:run_command).and_return(true)
+      Chef::Util::Windows::NetGroup.stub(:new).and_return(@net_group)
+      @provider.stub(:run_command).and_return(true)
     end
 
     it "should call @net_group.local_delete" do

data/spec/unit/provider/group_spec.rb

@@ -36,12 +36,12 @@ describe Chef::Provider::User do
 
     @provider.current_resource = @current_resource
 
-    @pw_group = mock("Struct::Group",
+    @pw_group = double("Struct::Group",
       :name => "wheel",
       :gid => 20,
       :mem => [ "root", "aj" ]
       )
-    Etc.stub!(:getgrnam).with('wheel').and_return(@pw_group)
+    Etc.stub(:getgrnam).with('wheel').and_return(@pw_group)
   end
 
   it "assumes the group exists by default" do
@@ -74,7 +74,7 @@ describe Chef::Provider::User do
     end
 
     it "should flip the value of exists if it cannot be found in /etc/group" do
-      Etc.stub!(:getgrnam).and_raise(ArgumentError)
+      Etc.stub(:getgrnam).and_raise(ArgumentError)
       @provider.load_current_resource
       @provider.group_exists.should be_false
     end
@@ -87,7 +87,7 @@ describe Chef::Provider::User do
   describe "when determining if the system is already in the target state" do
     [ :gid, :members ].each do |attribute|
       it "should return true if #{attribute} doesn't match" do
-        @current_resource.stub!(attribute).and_return("looooooooooooooooooool")
+        @current_resource.stub(attribute).and_return("looooooooooooooooooool")
         @provider.compare_group.should be_true
       end
     end
@@ -98,26 +98,26 @@ describe Chef::Provider::User do
 
     it "should return false if append is true and the group member(s) already exists" do
       @current_resource.members << "extra_user"
-      @new_resource.stub!(:append).and_return(true)
+      @new_resource.stub(:append).and_return(true)
       @provider.compare_group.should be_false
     end
 
     it "should return true if append is true and the group member(s) do not already exist" do
       @new_resource.members << "extra_user"
-      @new_resource.stub!(:append).and_return(true)
+      @new_resource.stub(:append).and_return(true)
       @provider.compare_group.should be_true
     end
 
     it "should return false if append is true and excluded_members include a non existing member" do
       @new_resource.excluded_members << "extra_user"
-      @new_resource.stub!(:append).and_return(true)
+      @new_resource.stub(:append).and_return(true)
       @provider.compare_group.should be_false
     end
 
     it "should return true if the append is true and excluded_members include an existing user" do
       @new_resource.members.each {|m| @new_resource.excluded_members << m }
       @new_resource.members.clear
-      @new_resource.stub!(:append).and_return(true)
+      @new_resource.stub(:append).and_return(true)
       @provider.compare_group.should be_true
     end
 
@@ -132,32 +132,32 @@ describe Chef::Provider::User do
 
     it "should set the new_resources updated flag when it creates the group" do
       @provider.group_exists = false
-      @provider.stub!(:create_group)
+      @provider.stub(:create_group)
       @provider.run_action(:create)
       @provider.new_resource.should be_updated
     end
 
     it "should check to see if the group has mismatched attributes if the group exists" do
       @provider.group_exists = true
-      @provider.stub!(:compare_group).and_return(false)
-      @provider.stub!(:change_desc).and_return([ ])
+      @provider.stub(:compare_group).and_return(false)
+      @provider.stub(:change_desc).and_return([ ])
       @provider.run_action(:create)
       @provider.new_resource.should_not be_updated
     end
 
     it "should call manage_group if the group exists and has mismatched attributes" do
       @provider.group_exists = true
-      @provider.stub!(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return([ ])
+      @provider.stub(:compare_group).and_return(true)
+      @provider.stub(:change_desc).and_return([ ])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:create)
     end
 
     it "should set the new_resources updated flag when it creates the group if we call manage_group" do
       @provider.group_exists = true
-      @provider.stub!(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
-      @provider.stub!(:manage_group).and_return(true)
+      @provider.stub(:compare_group).and_return(true)
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:manage_group).and_return(true)
       @provider.run_action(:create)
       @new_resource.should be_updated
     end
@@ -183,20 +183,20 @@ describe Chef::Provider::User do
   describe "when updating a group" do
     before(:each) do
       @provider.group_exists = true
-      @provider.stub!(:manage_group).and_return(true)
+      @provider.stub(:manage_group).and_return(true)
     end
 
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:manage)
     end
 
     it "should set the new resources updated flag to true if manage_group is called" do
-      @provider.stub!(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
-      @provider.stub!(:manage_group).and_return(true)
+      @provider.stub(:compare_group).and_return(true)
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:manage_group).and_return(true)
       @provider.run_action(:manage)
       @new_resource.should be_updated
     end
@@ -209,7 +209,7 @@ describe Chef::Provider::User do
 
     it "should not run manage_group if the group exists but has no differing attributes" do
       @provider.should_receive(:compare_group).and_return(false)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:manage)
     end
@@ -218,27 +218,27 @@ describe Chef::Provider::User do
   describe "when modifying the group" do
     before(:each) do
       @provider.group_exists = true
-      @provider.stub!(:manage_group).and_return(true)
+      @provider.stub(:manage_group).and_return(true)
     end
 
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:modify)
     end
 
     it "should set the new resources updated flag to true if manage_group is called" do
-      @provider.stub!(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
-      @provider.stub!(:manage_group).and_return(true)
+      @provider.stub(:compare_group).and_return(true)
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:manage_group).and_return(true)
       @provider.run_action(:modify)
       @new_resource.should be_updated
     end
 
     it "should not run manage_group if the group exists but has no differing attributes" do
       @provider.should_receive(:compare_group).and_return(false)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
+      @provider.stub(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:modify)
     end
@@ -253,20 +253,20 @@ describe Chef::Provider::User do
     it "should report which group members are missing if members are missing and appending to the group" do
        @new_resource.members << "user1"
        @new_resource.members << "user2"
-       @new_resource.stub!(:append).and_return true
+       @new_resource.stub(:append).and_return true
        @provider.compare_group.should be_true
        @provider.change_desc.should == [ "add missing member(s): user1, user2" ]
     end
 
     it "should report that the group members will be overwritten if not appending" do
        @new_resource.members << "user1"
-       @new_resource.stub!(:append).and_return false
+       @new_resource.stub(:append).and_return false
        @provider.compare_group.should be_true
        @provider.change_desc.should == [ "replace group members with new list of members" ]
     end
 
     it "should report the gid will be changed when it does not match" do
-      @current_resource.stub!(:gid).and_return("BADF00D")
+      @current_resource.stub(:gid).and_return("BADF00D")
       @provider.compare_group.should be_true
       @provider.change_desc.should == [ "change gid #{@current_resource.gid} to #{@new_resource.gid}" ]