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

data/spec/unit/provider/deploy/revision_spec.rb

@@ -30,20 +30,19 @@ describe Chef::Provider::Deploy::Revision do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @provider = Chef::Provider::Deploy::Revision.new(@resource, @run_context)
     @provider.load_current_resource
-    @runner = mock("runnah")
-    Chef::Runner.stub!(:new).and_return(@runner)
+    @runner = double("runnah")
+    Chef::Runner.stub(:new).and_return(@runner)
     @expected_release_dir = "/my/deploy/dir/releases/8a3195bf3efa246f743c5dfa83683201880f935c"
   end
 
   after do
     # Make sure we don't keep any state in our tests
-    FileUtils.rspec_reset
     FileUtils.rm_rf @temp_dir if File.directory?( @temp_dir )
   end
 
 
   it "uses the resolved revision from the SCM as the release slug" do
-    @provider.scm_provider.stub!(:revision_slug).and_return("uglySlugly")
+    @provider.scm_provider.stub(:revision_slug).and_return("uglySlugly")
     @provider.send(:release_slug).should == "uglySlugly"
   end
 
@@ -52,10 +51,10 @@ describe Chef::Provider::Deploy::Revision do
   end
 
   it "stores the release dir in the file cache in the cleanup step" do
-    FileUtils.stub!(:mkdir_p)
-    FileUtils.stub!(:cp_r)
+    FileUtils.stub(:mkdir_p)
+    FileUtils.stub(:cp_r)
     @provider.cleanup!
-    @provider.stub!(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
+    @provider.stub(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
     @provider.load_current_resource
     @provider.cleanup!
     second_release = "/my/deploy/dir/releases/73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2"
@@ -64,17 +63,17 @@ describe Chef::Provider::Deploy::Revision do
   end
 
   it "removes a release from the file cache when it's used again in another release and append it to the end" do
-    FileUtils.stub!(:mkdir_p)
-    FileUtils.stub!(:cp_r)
+    FileUtils.stub(:mkdir_p)
+    FileUtils.stub(:cp_r)
     @provider.cleanup!
-    @provider.stub!(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
+    @provider.stub(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
     @provider.load_current_resource
     @provider.cleanup!
     second_release = "/my/deploy/dir/releases/73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2"
     @provider.all_releases.should == [@expected_release_dir,second_release]
     @provider.cleanup!
 
-    @provider.stub!(:release_slug).and_return("8a3195bf3efa246f743c5dfa83683201880f935c")
+    @provider.stub(:release_slug).and_return("8a3195bf3efa246f743c5dfa83683201880f935c")
     @provider.load_current_resource
     @provider.cleanup!
     @provider.all_releases.should == [second_release, @expected_release_dir]
@@ -89,7 +88,7 @@ describe Chef::Provider::Deploy::Revision do
     end
     @provider.all_releases.should == release_paths
 
-    FileUtils.stub!(:rm_rf)
+    FileUtils.stub(:rm_rf)
     @provider.cleanup!
 
     expected_release_paths = (%w{second third fourth fifth} << @resource.revision).map do |release_name|

data/spec/unit/provider/deploy/timestamped_spec.rb

@@ -22,15 +22,15 @@ describe Chef::Provider::Deploy::Timestamped do
 
   before do
     @release_time = Time.utc( 2004, 8, 15, 16, 23, 42)
-    Time.stub!(:now).and_return(@release_time)
+    Time.stub(:now).and_return(@release_time)
     @expected_release_dir = "/my/deploy/dir/releases/20040815162342"
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @timestamped_deploy = Chef::Provider::Deploy::Timestamped.new(@resource, @run_context)
-    @runner = mock("runnah")
-    Chef::Runner.stub!(:new).and_return(@runner)
+    @runner = double("runnah")
+    Chef::Runner.stub(:new).and_return(@runner)
   end
 
   it "gives a timestamp for release_slug" do

data/spec/unit/provider/deploy_spec.rb

@@ -22,15 +22,15 @@ describe Chef::Provider::Deploy do
 
   before do
     @release_time = Time.utc( 2004, 8, 15, 16, 23, 42)
-    Time.stub!(:now).and_return(@release_time)
+    Time.stub(:now).and_return(@release_time)
     @expected_release_dir = "/my/deploy/dir/releases/20040815162342"
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @provider = Chef::Provider::Deploy.new(@resource, @run_context)
-    @provider.stub!(:release_slug)
-    @provider.stub!(:release_path).and_return(@expected_release_dir)
+    @provider.stub(:release_slug)
+    @provider.stub(:release_path).and_return(@expected_release_dir)
   end
 
   it "loads scm resource" do
@@ -61,7 +61,7 @@ describe Chef::Provider::Deploy do
     before do
       FileUtils.should_receive(:mkdir_p).with(@resource.deploy_to).ordered
       FileUtils.should_receive(:mkdir_p).with(@resource.shared_path).ordered
-      ::File.stub!(:directory?).and_return(false)
+      ::File.stub(:directory?).and_return(false)
       @provider.stub(:symlink)
       @provider.stub(:migrate)
       @provider.stub(:copy_cached_repo)
@@ -77,7 +77,7 @@ describe Chef::Provider::Deploy do
   end
 
   it "does not create deploy_to dir if it exists" do
-    ::File.stub!(:directory?).and_return(true)
+    ::File.stub(:directory?).and_return(true)
     ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
     FileUtils.should_not_receive(:mkdir_p).with(@resource.deploy_to)
     FileUtils.should_not_receive(:mkdir_p).with(@resource.shared_path)
@@ -122,22 +122,22 @@ describe Chef::Provider::Deploy do
   end
 
   it "should not deploy if there is already a deploy at release_path, and it is the current release" do
-    @provider.stub!(:all_releases).and_return([@expected_release_dir])
-    @provider.stub!(:current_release?).with(@expected_release_dir).and_return(true)
+    @provider.stub(:all_releases).and_return([@expected_release_dir])
+    @provider.stub(:current_release?).with(@expected_release_dir).and_return(true)
     @provider.should_not_receive(:deploy)
     @provider.run_action(:deploy)
   end
 
   it "should call action_rollback if there is already a deploy of this revision at release_path, and it is not the current release" do
-    @provider.stub!(:all_releases).and_return([@expected_release_dir, "102021"])
-    @provider.stub!(:current_release?).with(@expected_release_dir).and_return(false)
+    @provider.stub(:all_releases).and_return([@expected_release_dir, "102021"])
+    @provider.stub(:current_release?).with(@expected_release_dir).and_return(false)
     @provider.should_receive(:rollback_to).with(@expected_release_dir)
     @provider.should_receive(:current_release?)
     @provider.run_action(:deploy)
   end
 
   it "calls deploy when deploying a new release" do
-    @provider.stub!(:all_releases).and_return([])
+    @provider.stub(:all_releases).and_return([])
     @provider.should_receive(:deploy)
     @provider.run_action(:deploy)
   end
@@ -149,22 +149,22 @@ describe Chef::Provider::Deploy do
   end
 
   it "Removes the old release before deploying when force deploying over it" do
-    @provider.stub!(:all_releases).and_return([@expected_release_dir])
+    @provider.stub(:all_releases).and_return([@expected_release_dir])
     FileUtils.should_receive(:rm_rf).with(@expected_release_dir)
     @provider.should_receive(:deploy)
     @provider.run_action(:force_deploy)
   end
 
   it "deploys as normal when force deploying and there's no prior release at the same path" do
-    @provider.stub!(:all_releases).and_return([])
+    @provider.stub(:all_releases).and_return([])
     @provider.should_receive(:deploy)
     @provider.run_action(:force_deploy)
   end
 
   it "dont care by default if error happens on deploy" do
-    @provider.stub!(:all_releases).and_return(['previous_release'])
-    @provider.stub!(:deploy).and_return{ raise "Unexpected error" }
-    @provider.stub!(:previous_release_path).and_return('previous_release')
+    @provider.stub(:all_releases).and_return(['previous_release'])
+    @provider.stub(:deploy).and_return{ raise "Unexpected error" }
+    @provider.stub(:previous_release_path).and_return('previous_release')
     @provider.should_not_receive(:rollback)
     lambda {
       @provider.run_action(:deploy)
@@ -173,9 +173,9 @@ describe Chef::Provider::Deploy do
 
   it "rollbacks to previous release if error happens on deploy" do
     @resource.rollback_on_error true
-    @provider.stub!(:all_releases).and_return(['previous_release'])
-    @provider.stub!(:deploy).and_return{ raise "Unexpected error" }
-    @provider.stub!(:previous_release_path).and_return('previous_release')
+    @provider.stub(:all_releases).and_return(['previous_release'])
+    @provider.stub(:deploy).and_return{ raise "Unexpected error" }
+    @provider.stub(:previous_release_path).and_return('previous_release')
     @provider.should_receive(:rollback)
     lambda {
       @provider.run_action(:deploy)
@@ -184,9 +184,9 @@ describe Chef::Provider::Deploy do
 
   describe "on systems without broken Dir.glob results" do
     it "sets the release path to the penultimate release when one is not specified, symlinks, and rm's the last release on rollback" do
-      @provider.stub!(:release_path).and_return("/my/deploy/dir/releases/3")
+      @provider.stub(:release_path).and_return("/my/deploy/dir/releases/3")
       all_releases = ["/my/deploy/dir/releases/1", "/my/deploy/dir/releases/2", "/my/deploy/dir/releases/3", "/my/deploy/dir/releases/4", "/my/deploy/dir/releases/5"]
-      Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
       @provider.should_receive(:symlink)
       FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/4")
       FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/5")
@@ -195,10 +195,10 @@ describe Chef::Provider::Deploy do
     end
 
     it "sets the release path to the specified release, symlinks, and rm's any newer releases on rollback" do
-      @provider.unstub!(:release_path)
+      @provider.unstub(:release_path)
       all_releases = ["/my/deploy/dir/releases/20040815162342", "/my/deploy/dir/releases/20040700000000",
                       "/my/deploy/dir/releases/20040600000000", "/my/deploy/dir/releases/20040500000000"].sort!
-      Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
       @provider.should_receive(:symlink)
       FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
       @provider.run_action(:rollback)
@@ -206,12 +206,12 @@ describe Chef::Provider::Deploy do
     end
 
     it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do
-      @provider.unstub!(:release_path)
+      @provider.unstub(:release_path)
       all_releases = [ "/my/deploy/dir/releases/20040815162342",
                        "/my/deploy/dir/releases/20040700000000",
                        "/my/deploy/dir/releases/20040600000000",
                        "/my/deploy/dir/releases/20040500000000"]
-      Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
       @provider.should_receive(:symlink)
       FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
       @provider.run_action(:rollback)
@@ -221,9 +221,9 @@ describe Chef::Provider::Deploy do
     describe "if there are no releases to fallback to" do
 
       it "an exception is raised when there is only 1 release" do
-        #@provider.unstub!(:release_path) -- unstub the release path on top to feed our own release path
+        #@provider.unstub(:release_path) -- unstub the release path on top to feed our own release path
         all_releases = [ "/my/deploy/dir/releases/20040815162342"]
-        Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+        Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
         #@provider.should_receive(:symlink)
         #FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
         #@provider.run_action(:rollback)
@@ -235,7 +235,7 @@ describe Chef::Provider::Deploy do
 
       it "an exception is raised when there are no releases" do
         all_releases = []
-        Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+        Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
         lambda {
           @provider.run_action(:rollback)
         }.should raise_exception(RuntimeError, "There is no release to rollback to!")
@@ -245,12 +245,12 @@ describe Chef::Provider::Deploy do
 
   describe "CHEF-628: on systems with broken Dir.glob results" do
     it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do
-      @provider.unstub!(:release_path)
+      @provider.unstub(:release_path)
       all_releases = [ "/my/deploy/dir/releases/20040500000000",
                        "/my/deploy/dir/releases/20040600000000",
                        "/my/deploy/dir/releases/20040700000000",
                        "/my/deploy/dir/releases/20040815162342" ]
-      Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
       @provider.should_receive(:symlink)
       FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
       @provider.run_action(:rollback)
@@ -260,13 +260,13 @@ describe Chef::Provider::Deploy do
 
   it "raises a runtime error when there's no release to rollback to" do
     all_releases = []
-    Dir.stub!(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+    Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
     lambda {@provider.run_action(:rollback)}.should raise_error(RuntimeError)
   end
 
   it "runs the new resource collection in the runner during a callback" do
-    @runner = mock("Runner")
-    Chef::Runner.stub!(:new).and_return(@runner)
+    @runner = double("Runner")
+    Chef::Runner.stub(:new).and_return(@runner)
     @runner.should_receive(:converge)
     callback_code = Proc.new { :noop }
     @provider.callback(:whatevs, callback_code)
@@ -342,8 +342,8 @@ describe Chef::Provider::Deploy do
   end
 
   it "calls the internal callback :release_created when cleaning up the releases" do
-    FileUtils.stub!(:mkdir_p)
-    FileUtils.stub!(:cp_r)
+    FileUtils.stub(:mkdir_p)
+    FileUtils.stub(:cp_r)
     @provider.should_receive(:release_created)
     @provider.cleanup!
   end
@@ -371,8 +371,8 @@ describe Chef::Provider::Deploy do
     FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/config/database.yml", @expected_release_dir + "/config/database.yml")
     @provider.should_receive(:enforce_ownership)
 
-    STDOUT.stub!(:tty?).and_return(true)
-    Chef::Log.stub!(:info?).and_return(true)
+    STDOUT.stub(:tty?).and_return(true)
+    Chef::Log.stub(:info?).and_return(true)
     @provider.should_receive(:run_command).with(:command => "migration_foo", :cwd => @expected_release_dir,
                                                 :user => "deployNinja", :group => "deployNinjas",
                                                 :log_level => :info, :live_stream => STDOUT,
@@ -462,7 +462,7 @@ describe Chef::Provider::Deploy do
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000",
                     "/my/deploy/dir/20040400000000", "/my/deploy/dir/20040300000000",
                     "/my/deploy/dir/20040200000000", "/my/deploy/dir/20040100000000"].sort!
-    @provider.stub!(:all_releases).and_return(all_releases)
+    @provider.stub(:all_releases).and_return(all_releases)
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040100000000")
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040200000000")
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040300000000")
@@ -475,7 +475,7 @@ describe Chef::Provider::Deploy do
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000",
                     "/my/deploy/dir/20040400000000", "/my/deploy/dir/20040300000000",
                     "/my/deploy/dir/20040200000000", "/my/deploy/dir/20040100000000"].sort!
-    @provider.stub!(:all_releases).and_return(all_releases)
+    @provider.stub(:all_releases).and_return(all_releases)
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040100000000")
     @provider.cleanup!
   end
@@ -484,8 +484,8 @@ describe Chef::Provider::Deploy do
     all_releases = ["/my/deploy/dir/20040815162342", "/my/deploy/dir/20040700000000",
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000",
                     "/my/deploy/dir/20040400000000", "/my/deploy/dir/20040300000000"].sort!
-    @provider.stub!(:all_releases).and_return(all_releases)
-    FileUtils.stub!(:rm_rf)
+    @provider.stub(:all_releases).and_return(all_releases)
+    FileUtils.stub(:rm_rf)
     @provider.should_receive(:release_deleted).with("/my/deploy/dir/20040300000000")
     @provider.cleanup!
   end
@@ -502,9 +502,9 @@ describe Chef::Provider::Deploy do
   end
 
   it "shouldn't give a no method error on migrate if the environment is nil" do
-    @provider.stub!(:enforce_ownership)
-    @provider.stub!(:run_symlinks_before_migrate)
-    @provider.stub!(:run_command)
+    @provider.stub(:enforce_ownership)
+    @provider.stub(:run_symlinks_before_migrate)
+    @provider.stub(:run_command)
     @provider.migrate
 
   end
@@ -543,7 +543,7 @@ describe Chef::Provider::Deploy do
     end
 
     it "defines run as a forwarder to execute, setting the user, group, cwd and environment to new_resource.user" do
-      mock_execution = mock("Resource::Execute")
+      mock_execution = double("Resource::Execute")
       @provider.should_receive(:execute).with("iGoToHell4this").and_return(mock_execution)
       @resource.user("notCoolMan")
       @resource.group("Ggroup")
@@ -572,7 +572,7 @@ describe Chef::Provider::Deploy do
     end
 
     it "defines run as a forwarder to execute, setting cwd and environment but not override" do
-      mock_execution = mock("Resource::Execute")
+      mock_execution = double("Resource::Execute")
       @provider.should_receive(:execute).with("iGoToHell4this").and_return(mock_execution)
       @resource.user("notCoolMan")
       mock_execution.should_receive(:user).with("notCoolMan")
@@ -583,8 +583,8 @@ describe Chef::Provider::Deploy do
 
 
     it "converts sudo and run to exec resources in hooks" do
-      runner = mock("tehRunner")
-      Chef::Runner.stub!(:new).and_return(runner)
+      runner = double("tehRunner")
+      Chef::Runner.stub(:new).and_return(runner)
 
       snitch = nil
       @resource.user("tehCat")
@@ -607,7 +607,7 @@ describe Chef::Provider::Deploy do
   describe "installing gems from a gems.yml" do
 
     before do
-      ::File.stub!(:exist?).with("#{@expected_release_dir}/gems.yml").and_return(true)
+      ::File.stub(:exist?).with("#{@expected_release_dir}/gems.yml").and_return(true)
       @gem_list = [{:name=>"eventmachine", :version=>"0.12.9"}]
     end
 
@@ -623,8 +623,8 @@ describe Chef::Provider::Deploy do
     end
 
     it "takes a list of gem providers converges them" do
-      IO.stub!(:read)
-      YAML.stub!(:load).and_return(@gem_list)
+      IO.stub(:read)
+      YAML.stub(:load).and_return(@gem_list)
       expected_gem_resources = @provider.send(:gem_packages).map { |r| [r.name, r.version] }
       gem_runner = @provider.send(:gem_resource_collection_runner)
       # no one has heard of defining == to be meaningful so I have use this monstrosity

data/spec/unit/provider/directory_spec.rb

@@ -48,18 +48,18 @@ describe Chef::Provider::Directory do
 
   describe "scanning file security metadata on unix" do
     before do
-      Chef::Platform.stub!(:windows?).and_return(false)
+      Chef::Platform.stub(:windows?).and_return(false)
     end
     let(:mock_stat) do
-      cstats = mock("stats")
-      cstats.stub!(:uid).and_return(500)
-      cstats.stub!(:gid).and_return(500)
-      cstats.stub!(:mode).and_return(0755)
+      cstats = double("stats")
+      cstats.stub(:uid).and_return(500)
+      cstats.stub(:gid).and_return(500)
+      cstats.stub(:mode).and_return(0755)
       cstats
     end
 
     it "describes the access mode as a String of octal integers" do
-      File.stub!(:exists?).and_return(true)
+      File.stub(:exists?).and_return(true)
       File.should_receive(:stat).and_return(mock_stat)
       @directory.load_current_resource
       @directory.current_resource.mode.should == "0755"
@@ -67,7 +67,7 @@ describe Chef::Provider::Directory do
 
     context "when user and group are specified with UID/GID" do
       it "describes the current owner and group as UID and GID" do
-        File.stub!(:exists?).and_return(true)
+        File.stub(:exists?).and_return(true)
         File.should_receive(:stat).and_return(mock_stat)
         @directory.load_current_resource
         @directory.current_resource.path.should eql(@new_resource.path)
@@ -91,7 +91,7 @@ describe Chef::Provider::Directory do
     Dir.should_receive(:mkdir).with(@new_resource.path).once.and_return(true)
 
     @directory.should_receive(:do_acl_changes)
-    @directory.stub!(:do_selinux)
+    @directory.stub(:do_selinux)
     @directory.run_action(:create)
     @directory.new_resource.should be_updated
   end
@@ -117,7 +117,7 @@ describe Chef::Provider::Directory do
 
     FileUtils.should_receive(:mkdir_p).with(@new_resource.path).and_return(true)
     @directory.should_receive(:do_acl_changes)
-    @directory.stub!(:do_selinux)
+    @directory.stub(:do_selinux)
     @directory.run_action(:create)
     @new_resource.should be_updated
   end
@@ -152,14 +152,14 @@ describe Chef::Provider::Directory do
   end
 
   it "should raise an exception if it cannot delete the directory due to bad permissions" do
-    File.stub!(:exists?).and_return(true)
-    File.stub!(:writable?).and_return(false)
+    File.stub(:exists?).and_return(true)
+    File.stub(:writable?).and_return(false)
     lambda {  @directory.run_action(:delete) }.should raise_error(RuntimeError)
   end
 
   it "should take no action when deleting a target directory that does not exist" do
     @new_resource.path "/an/invalid/path"
-    File.stub!(:exists?).and_return(false)
+    File.stub(:exists?).and_return(false)
     Dir.should_not_receive(:delete).with(@new_resource.path)
     @directory.run_action(:delete)
     @directory.new_resource.should_not be_updated
@@ -168,7 +168,7 @@ describe Chef::Provider::Directory do
   it "should raise an exception when deleting a directory when target directory is a file" do
     stub_file_cstats
     @new_resource.path "/an/invalid/path"
-    File.stub!(:exists?).and_return(true)
+    File.stub(:exists?).and_return(true)
     File.should_receive(:directory?).and_return(false)
     Dir.should_not_receive(:delete).with(@new_resource.path)
     lambda { @directory.run_action(:delete) }.should raise_error(RuntimeError)
@@ -176,13 +176,13 @@ describe Chef::Provider::Directory do
   end
 
   def stub_file_cstats
-    cstats = mock("stats")
-    cstats.stub!(:uid).and_return(500)
-    cstats.stub!(:gid).and_return(500)
-    cstats.stub!(:mode).and_return(0755)
+    cstats = double("stats")
+    cstats.stub(:uid).and_return(500)
+    cstats.stub(:gid).and_return(500)
+    cstats.stub(:mode).and_return(0755)
     # File.stat is called in:
     # - Chef::Provider::File.load_current_resource_attrs
     # - Chef::ScanAccessControl via Chef::Provider::File.setup_acl
-    File.stub!(:stat).and_return(cstats)
+    File.stub(:stat).and_return(cstats)
   end
 end