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

data/spec/unit/provider/http_request_spec.rb

@@ -44,8 +44,8 @@ describe Chef::Provider::HttpRequest do
     before(:each) do
       # run_action(x) forces load_current_resource to run;
       # that would overwrite our supplied mock Chef::Rest # object
-      @provider.stub!(:load_current_resource).and_return(true)
-      @http = mock("Chef::REST")
+      @provider.stub(:load_current_resource).and_return(true)
+      @http = double("Chef::REST")
       @provider.http = @http
     end
 
@@ -73,7 +73,7 @@ describe Chef::Provider::HttpRequest do
       end
 
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
+        @new_resource.stub(:message).and_return(lambda { "return" })
         @http.should_receive(:put).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:put)
         @new_resource.should be_updated

data/spec/unit/provider/ifconfig/aix_spec.rb

@@ -67,7 +67,7 @@ IFCONFIG
 
     it "should add an interface if it does not exist" do
       @new_resource.device "en10"
-      @provider.stub!(:load_current_resource) do
+      @provider.stub(:load_current_resource) do
         @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
@@ -81,7 +81,7 @@ IFCONFIG
     it "should raise exception if metric attribute is set" do
       @new_resource.device "en0"
       @new_resource.metric "1"
-      @provider.stub!(:load_current_resource) do
+      @provider.stub(:load_current_resource) do
         @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
@@ -93,7 +93,7 @@ IFCONFIG
   describe "#action_enable" do
     it "should enable an interface if it does not exist" do
       @new_resource.device "en10"
-      @provider.stub!(:load_current_resource) do
+      @provider.stub(:load_current_resource) do
         @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
@@ -109,7 +109,7 @@ IFCONFIG
 
     it "should not disable an interface if it does not exist" do
       @new_resource.device "en10"
-      @provider.stub!(:load_current_resource) do
+      @provider.stub(:load_current_resource) do
         @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
@@ -123,7 +123,7 @@ IFCONFIG
     context "interface exists" do
       before do
         @new_resource.device "en10"
-        @provider.stub!(:load_current_resource) do
+        @provider.stub(:load_current_resource) do
           @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
           current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
           current_resource.device @new_resource.device
@@ -146,7 +146,7 @@ IFCONFIG
 
     it "should not delete an interface if it does not exist" do
       @new_resource.device "en10"
-      @provider.stub!(:load_current_resource) do
+      @provider.stub(:load_current_resource) do
         @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
@@ -160,7 +160,7 @@ IFCONFIG
     context "interface exists" do
       before do
         @new_resource.device "en10"
-        @provider.stub!(:load_current_resource) do
+        @provider.stub(:load_current_resource) do
           @provider.instance_variable_set("@status", double("Status", :exitstatus => 0))
           current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
           current_resource.device @new_resource.device

data/spec/unit/provider/ifconfig/debian_spec.rb

@@ -34,11 +34,11 @@ describe Chef::Provider::Ifconfig::Debian do
     @provider = Chef::Provider::Ifconfig::Debian.new(@new_resource, @run_context)
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
-    status = mock("Status", :exitstatus => 0)
+    status = double("Status", :exitstatus => 0)
     @provider.instance_variable_set("@status", status)
     @provider.current_resource = @current_resource
-    @provider.stub!(:load_current_resource)
-    @provider.stub!(:run_command)
+    @provider.stub(:load_current_resource)
+    @provider.stub(:run_command)
 
     @config_filename_ifaces = "/etc/network/interfaces"
     @config_filename_ifcfg = "/etc/network/interfaces.d/ifcfg-#{@new_resource.device}"

data/spec/unit/provider/ifconfig/redhat_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Provider::Ifconfig::Redhat do
     @provider = Chef::Provider::Ifconfig::Redhat.new(@new_resource, @run_context)
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
-    status = mock("Status", :exitstatus => 0)
+    status = double("Status", :exitstatus => 0)
     @provider.instance_variable_set("@status", status)
     @provider.current_resource = @current_resource
  end
@@ -42,8 +42,8 @@ describe Chef::Provider::Ifconfig::Redhat do
   describe "generate_config for action_add" do
 
      it "should write network-script for centos" do
-      @provider.stub!(:load_current_resource)
-      @provider.stub!(:run_command)
+      @provider.stub(:load_current_resource)
+      @provider.stub(:run_command)
       config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
       config_file = StringIO.new
       File.should_receive(:new).with(config_filename, "w").and_return(config_file)
@@ -59,8 +59,8 @@ describe Chef::Provider::Ifconfig::Redhat do
 
     it "should delete network-script if it exists for centos" do
       @current_resource.device @new_resource.device
-      @provider.stub!(:load_current_resource)
-      @provider.stub!(:run_command)
+      @provider.stub(:load_current_resource)
+      @provider.stub(:run_command)
       config_filename =  "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
       File.should_receive(:exist?).with(config_filename).and_return(true)
       FileUtils.should_receive(:rm_f).with(config_filename, :verbose => false)

data/spec/unit/provider/ifconfig_spec.rb

@@ -35,14 +35,14 @@ describe Chef::Provider::Ifconfig do
     @provider = Chef::Provider::Ifconfig.new(@new_resource, @run_context)
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
-    status = mock("Status", :exitstatus => 0)
+    status = double("Status", :exitstatus => 0)
     @provider.instance_variable_set("@status", status)
     @provider.current_resource = @current_resource
 
  end
   describe Chef::Provider::Ifconfig, "load_current_resource" do
     before do
-      status = mock("Status", :exitstatus => 1)
+      status = double("Status", :exitstatus => 1)
       @provider.should_receive(:popen4).and_return status
       @provider.load_current_resource
     end
@@ -57,8 +57,8 @@ describe Chef::Provider::Ifconfig do
   describe Chef::Provider::Ifconfig, "action_add" do
 
     it "should add an interface if it does not exist" do
-      #@provider.stub!(:run_command).and_return(true)
-      @provider.stub!(:load_current_resource)
+      #@provider.stub(:run_command).and_return(true)
+      @provider.stub(:load_current_resource)
       @current_resource.inet_addr nil
       command = "ifconfig eth0 10.0.0.1 netmask 255.255.254.0 metric 1 mtu 1500"
       @provider.should_receive(:run_command).with(:command => command)
@@ -69,7 +69,7 @@ describe Chef::Provider::Ifconfig do
     end
 
     it "should not add an interface if it already exists" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @provider.should_not_receive(:run_command)
       @current_resource.inet_addr "10.0.0.1"
       @provider.should_not_receive(:generate_config)
@@ -86,7 +86,7 @@ describe Chef::Provider::Ifconfig do
   describe Chef::Provider::Ifconfig, "action_enable" do
 
     it "should enable interface if does not exist" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @current_resource.inet_addr nil
       command = "ifconfig eth0 10.0.0.1 netmask 255.255.254.0 metric 1 mtu 1500"
       @provider.should_receive(:run_command).with(:command => command)
@@ -97,7 +97,7 @@ describe Chef::Provider::Ifconfig do
     end
 
     it "should not enable interface if it already exists" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @provider.should_not_receive(:run_command)
       @current_resource.inet_addr "10.0.0.1"
       @provider.should_not_receive(:generate_config)
@@ -110,7 +110,7 @@ describe Chef::Provider::Ifconfig do
   describe Chef::Provider::Ifconfig, "action_delete" do
 
     it "should delete interface if it exists" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @current_resource.device "eth0"
       command = "ifconfig #{@new_resource.device} down"
       @provider.should_receive(:run_command).with(:command => command)
@@ -121,7 +121,7 @@ describe Chef::Provider::Ifconfig do
     end
 
     it "should not delete interface if it does not exist" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @provider.should_not_receive(:run_command)
       @provider.should_not_receive(:delete_config)
 
@@ -133,7 +133,7 @@ describe Chef::Provider::Ifconfig do
   describe Chef::Provider::Ifconfig, "action_disable" do
 
     it "should disable interface if it exists" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @current_resource.device "eth0"
       command = "ifconfig #{@new_resource.device} down"
       @provider.should_receive(:run_command).with(:command => command)
@@ -144,7 +144,7 @@ describe Chef::Provider::Ifconfig do
     end
 
     it "should not delete interface if it does not exist" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @provider.should_not_receive(:run_command)
       @provider.should_not_receive(:delete_config)
 
@@ -156,7 +156,7 @@ describe Chef::Provider::Ifconfig do
   describe Chef::Provider::Ifconfig, "action_delete" do
 
     it "should delete interface of it exists" do
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       @current_resource.device "eth0"
       command = "ifconfig #{@new_resource.device} down"
       @provider.should_receive(:run_command).with(:command => command)
@@ -168,7 +168,7 @@ describe Chef::Provider::Ifconfig do
 
     it "should not delete interface if it does not exist" do
       # This is so that our fake values do not get overwritten
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
       # This is so that nothing actually runs
       @provider.should_not_receive(:run_command)
       @provider.should_not_receive(:delete_config)

data/spec/unit/provider/link_spec.rb

@@ -44,13 +44,13 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
   describe "when the target is a symlink" do
     before(:each) do
-      lstat = mock("stats", :ino => 5)
-      lstat.stub!(:uid).and_return(501)
-      lstat.stub!(:gid).and_return(501)
-      lstat.stub!(:mode).and_return(0777)
-      File.stub!(:lstat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(lstat)
-      provider.file_class.stub!(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
-      provider.file_class.stub!(:readlink).with("#{CHEF_SPEC_DATA}/fofile-link").and_return("#{CHEF_SPEC_DATA}/fofile")
+      lstat = double("stats", :ino => 5)
+      lstat.stub(:uid).and_return(501)
+      lstat.stub(:gid).and_return(501)
+      lstat.stub(:mode).and_return(0777)
+      File.stub(:lstat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(lstat)
+      provider.file_class.stub(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+      provider.file_class.stub(:readlink).with("#{CHEF_SPEC_DATA}/fofile-link").and_return("#{CHEF_SPEC_DATA}/fofile")
     end
 
     describe "to a file that exists" do
@@ -95,9 +95,9 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
     describe "to a file that doesn't exist" do
       before do
-        File.stub!(:exist?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
-        provider.file_class.stub!(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
-        provider.file_class.stub!(:readlink).with("#{CHEF_SPEC_DATA}/fofile-link").and_return("#{CHEF_SPEC_DATA}/fofile")
+        File.stub(:exist?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+        provider.file_class.stub(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+        provider.file_class.stub(:readlink).with("#{CHEF_SPEC_DATA}/fofile-link").and_return("#{CHEF_SPEC_DATA}/fofile")
         new_resource.owner "501" # only loaded in current_resource if present in new
         new_resource.group "501"
         provider.load_current_resource
@@ -123,8 +123,8 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
   describe "when the target doesn't exist" do
     before do
-      File.stub!(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
-      provider.file_class.stub!(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+      File.stub(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+      provider.file_class.stub(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
       provider.load_current_resource
     end
 
@@ -144,19 +144,19 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
   describe "when the target is a regular old file" do
     before do
-      stat = mock("stats", :ino => 5)
-      stat.stub!(:uid).and_return(501)
-      stat.stub!(:gid).and_return(501)
-      stat.stub!(:mode).and_return(0755)
-      provider.file_class.stub!(:stat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(stat)
-
-      File.stub!(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
-      provider.file_class.stub!(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+      stat = double("stats", :ino => 5)
+      stat.stub(:uid).and_return(501)
+      stat.stub(:gid).and_return(501)
+      stat.stub(:mode).and_return(0755)
+      provider.file_class.stub(:stat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(stat)
+
+      File.stub(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+      provider.file_class.stub(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
     end
 
     describe "and the source does not exist" do
       before do
-        File.stub!(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(false)
+        File.stub(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(false)
         provider.load_current_resource
       end
 
@@ -176,14 +176,14 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
     describe "and the source exists" do
       before do
-        stat = mock("stats", :ino => 6)
-        stat.stub!(:uid).and_return(502)
-        stat.stub!(:gid).and_return(502)
-        stat.stub!(:mode).and_return(0644)
+        stat = double("stats", :ino => 6)
+        stat.stub(:uid).and_return(502)
+        stat.stub(:gid).and_return(502)
+        stat.stub(:mode).and_return(0644)
 
-        provider.file_class.stub!(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
+        provider.file_class.stub(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
 
-        File.stub!(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
+        File.stub(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
         provider.load_current_resource
       end
 
@@ -203,14 +203,14 @@ describe Chef::Resource::Link, :not_supported_on_win2k3 do
 
     describe "and is hardlinked to the source" do
       before do
-        stat = mock("stats", :ino => 5)
-        stat.stub!(:uid).and_return(502)
-        stat.stub!(:gid).and_return(502)
-        stat.stub!(:mode).and_return(0644)
+        stat = double("stats", :ino => 5)
+        stat.stub(:uid).and_return(502)
+        stat.stub(:gid).and_return(502)
+        stat.stub(:mode).and_return(0644)
 
-        provider.file_class.stub!(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
+        provider.file_class.stub(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
 
-        File.stub!(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
+        File.stub(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
         provider.load_current_resource
       end
 

data/spec/unit/provider/mdadm_spec.rb

@@ -32,20 +32,20 @@ describe Chef::Provider::Mdadm do
 
   describe "when determining the current metadevice status" do
     it "should set the current resources mount point to the new resources mount point" do
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:status => 0))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:status => 0))
       @provider.load_current_resource
       @provider.current_resource.name.should == '/dev/md1'
       @provider.current_resource.raid_device.should == '/dev/md1'
     end
 
     it "determines that the metadevice exists when mdadm exit code is zero" do
-      @provider.stub!(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 0))
+      @provider.stub(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 0))
       @provider.load_current_resource
       @provider.current_resource.exists.should be_true
     end
 
     it "determines that the metadevice does not exist when mdadm exit code is 4" do
-      @provider.stub!(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 4))
+      @provider.stub(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 4))
       @provider.load_current_resource
       @provider.current_resource.exists.should be_false
     end
@@ -55,7 +55,7 @@ describe Chef::Provider::Mdadm do
     before(:each) do
       @current_resource = Chef::Resource::Mdadm.new('/dev/md1')
       @new_resource.level 5
-      @provider.stub!(:load_current_resource).and_return(true)
+      @provider.stub(:load_current_resource).and_return(true)
       @provider.current_resource = @current_resource
     end
 

data/spec/unit/provider/mount/aix_spec.rb

@@ -60,8 +60,8 @@ ENABLED
 
     @provider = Chef::Provider::Mount::Aix.new(@new_resource, @run_context)
 
-    ::File.stub!(:exists?).with("/dev/sdz1").and_return true
-    ::File.stub!(:exists?).with("/tmp/foo").and_return true
+    ::File.stub(:exists?).with("/dev/sdz1").and_return true
+    ::File.stub(:exists?).with("/tmp/foo").and_return true
   end
 
   def stub_mounted(provider, mounted_output)
@@ -179,7 +179,7 @@ ENABLED
       @new_resource.options("nodev,rw")
       stub_mounted_enabled(@provider, @mounted_output, "")
       filesystems = StringIO.new
-      ::File.stub!(:open).with("/etc/filesystems", "a").and_yield(filesystems)
+      ::File.stub(:open).with("/etc/filesystems", "a").and_yield(filesystems)
 
       @provider.run_action(:enable)
 
@@ -200,7 +200,7 @@ ENABLED
     it "should disable mount if it is mounted and enabled" do
       stub_mounted_enabled(@provider, @mounted_output, @enabled_output)
 
-      ::File.stub!(:open).with("/etc/filesystems", "r").and_return(<<-ETCFILESYSTEMS)
+      ::File.stub(:open).with("/etc/filesystems", "r").and_return(<<-ETCFILESYSTEMS)
 /tmp/foo:
   dev   = /dev/sdz1
   vfs   = jfs2
@@ -219,7 +219,7 @@ ENABLED
 ETCFILESYSTEMS
 
       filesystems = StringIO.new
-      ::File.stub!(:open).with("/etc/filesystems", "w").and_yield(filesystems)
+      ::File.stub(:open).with("/etc/filesystems", "w").and_yield(filesystems)
 
       @provider.run_action(:disable)
 

data/spec/unit/provider/mount/mount_spec.rb

@@ -34,16 +34,16 @@ describe Chef::Provider::Mount::Mount do
 
     @provider = Chef::Provider::Mount::Mount.new(@new_resource, @run_context)
 
-    ::File.stub!(:exists?).with("/dev/sdz1").and_return true
-    ::File.stub!(:exists?).with("/tmp/foo").and_return true
-    ::File.stub!(:realpath).with("/dev/sdz1").and_return "/dev/sdz1"
-    ::File.stub!(:realpath).with("/tmp/foo").and_return "/tmp/foo"
+    ::File.stub(:exists?).with("/dev/sdz1").and_return true
+    ::File.stub(:exists?).with("/tmp/foo").and_return true
+    ::File.stub(:realpath).with("/dev/sdz1").and_return "/dev/sdz1"
+    ::File.stub(:realpath).with("/tmp/foo").and_return "/tmp/foo"
   end
 
   describe "when discovering the current fs state" do
     before do
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => ''))
-      ::File.stub!(:foreach).with("/etc/fstab")
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => ''))
+      ::File.stub(:foreach).with("/etc/fstab")
     end
 
     it "should create a current resource with the same mount point and device" do
@@ -56,7 +56,7 @@ describe Chef::Provider::Mount::Mount do
     it "should accecpt device_type :uuid" do
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
-      @stdout_findfs = mock("STDOUT", :first => "/dev/sdz1")
+      @stdout_findfs = double("STDOUT", :first => "/dev/sdz1")
       @provider.should_receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
       @provider.load_current_resource()
       @provider.mountable?
@@ -72,7 +72,7 @@ describe Chef::Provider::Mount::Mount do
 
         it "should ignore trailing slash and set mounted to true for network mount (#{type})" do
           @new_resource.device fs_spec
-          @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
+          @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
           @provider.load_current_resource
           @provider.current_resource.mounted.should be_true
         end
@@ -80,12 +80,12 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should raise an error if the mount device does not exist" do
-      ::File.stub!(:exists?).with("/dev/sdz1").and_return false
+      ::File.stub(:exists?).with("/dev/sdz1").and_return false
       lambda { @provider.load_current_resource();@provider.mountable? }.should raise_error(Chef::Exceptions::Mount)
     end
 
     it "should not call mountable? with load_current_resource - CHEF-1565" do
-      ::File.stub!(:exists?).with("/dev/sdz1").and_return false
+      ::File.stub(:exists?).with("/dev/sdz1").and_return false
       @provider.should_receive(:mounted?).and_return(true)
       @provider.should_receive(:enabled?).and_return(true)
       @provider.should_not_receive(:mountable?)
@@ -95,15 +95,15 @@ describe Chef::Provider::Mount::Mount do
     it "should raise an error if the mount device (uuid) does not exist" do
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
-      status_findfs = mock("Status", :exitstatus => 1)
-      stdout_findfs = mock("STDOUT", :first => nil)
+      status_findfs = double("Status", :exitstatus => 1)
+      stdout_findfs = double("STDOUT", :first => nil)
       @provider.should_receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,stdout_findfs,@stderr).and_return(status_findfs)
       ::File.should_receive(:exists?).with("").and_return(false)
       lambda { @provider.load_current_resource();@provider.mountable? }.should raise_error(Chef::Exceptions::Mount)
     end
 
     it "should raise an error if the mount point does not exist" do
-      ::File.stub!(:exists?).with("/tmp/foo").and_return false
+      ::File.stub(:exists?).with("/tmp/foo").and_return false
       lambda { @provider.load_current_resource();@provider.mountable? }.should raise_error(Chef::Exceptions::Mount)
     end
 
@@ -125,7 +125,7 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should set mounted true if the mount point is found in the mounts list" do
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => '/dev/sdz1 on /tmp/foo'))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => '/dev/sdz1 on /tmp/foo'))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_true
     end
@@ -133,10 +133,10 @@ describe Chef::Provider::Mount::Mount do
     it "should set mounted true if the symlink target of the device is found in the mounts list" do
       target = "/dev/mapper/target"
 
-      ::File.stub!(:symlink?).with("#{@new_resource.device}").and_return(true)
-      ::File.stub!(:readlink).with("#{@new_resource.device}").and_return(target)
+      ::File.stub(:symlink?).with("#{@new_resource.device}").and_return(true)
+      ::File.stub(:readlink).with("#{@new_resource.device}").and_return(target)
 
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/mapper/target on /tmp/foo type ext3 (rw)\n"))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/mapper/target on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_true
     end
@@ -145,7 +145,7 @@ describe Chef::Provider::Mount::Mount do
       mount = "/dev/sdy1 on #{@new_resource.mount_point} type ext3 (rw)\n"
       mount << "#{@new_resource.device} on #{@new_resource.mount_point} type ext3 (rw)\n"
 
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_true
     end
@@ -154,13 +154,13 @@ describe Chef::Provider::Mount::Mount do
       mount = "#{@new_resource.device} on #{@new_resource.mount_point} type ext3 (rw)\n"
       mount << "/dev/sdy1 on #{@new_resource.mount_point} type ext3 (rw)\n"
 
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_false
     end
 
     it "mounted should be false if the mount point is not found in the mounts list" do
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_false
     end
@@ -169,7 +169,7 @@ describe Chef::Provider::Mount::Mount do
       fstab1 = "/dev/sdy1  /tmp/foo  ext3  defaults  1 2\n"
       fstab2 = "#{@new_resource.device} #{@new_resource.mount_point}  ext3  defaults  1 2\n"
 
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield(fstab1).and_yield(fstab2)
+      ::File.stub(:foreach).with("/etc/fstab").and_yield(fstab1).and_yield(fstab2)
 
       @provider.load_current_resource
       @provider.current_resource.enabled.should be_true
@@ -179,7 +179,7 @@ describe Chef::Provider::Mount::Mount do
       fstab1 = "#{@new_resource.device} #{@new_resource.mount_point}  ext3  defaults  1 2\n"
       fstab2 = "/dev/sdy1  /tmp/foo/bar  ext3  defaults  1 2\n"
 
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield(fstab1).and_yield(fstab2)
+      ::File.stub(:foreach).with("/etc/fstab").and_yield(fstab1).and_yield(fstab2)
 
       @provider.load_current_resource
       @provider.current_resource.enabled.should be_true
@@ -188,12 +188,12 @@ describe Chef::Provider::Mount::Mount do
     it "should set enabled to true if the symlink target is in fstab" do
       target = "/dev/mapper/target"
 
-      ::File.stub!(:symlink?).with("#{@new_resource.device}").and_return(true)
-      ::File.stub!(:readlink).with("#{@new_resource.device}").and_return(target)
+      ::File.stub(:symlink?).with("#{@new_resource.device}").and_return(true)
+      ::File.stub(:readlink).with("#{@new_resource.device}").and_return(target)
 
       fstab = "/dev/sdz1  /tmp/foo ext3  defaults  1 2\n"
 
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+      ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
 
       @provider.load_current_resource
       @provider.current_resource.enabled.should be_true
@@ -201,7 +201,7 @@ describe Chef::Provider::Mount::Mount do
 
     it "should set enabled to false if the mount point is not in fstab" do
       fstab = "/dev/sdy1  #{@new_resource.mount_point}  ext3  defaults  1 2\n"
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+      ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
 
       @provider.load_current_resource
       @provider.current_resource.enabled.should be_false
@@ -209,7 +209,7 @@ describe Chef::Provider::Mount::Mount do
 
     it "should ignore commented lines in fstab " do
        fstab = "\# #{@new_resource.device}  #{@new_resource.mount_point}  ext3  defaults  1 2\n"
-       ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+       ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
 
        @provider.load_current_resource
        @provider.current_resource.enabled.should be_false
@@ -218,7 +218,7 @@ describe Chef::Provider::Mount::Mount do
     it "should set enabled to false if the mount point is not last in fstab" do
       line_1 = "#{@new_resource.device} #{@new_resource.mount_point}  ext3  defaults  1 2\n"
       line_2 = "/dev/sdy1 #{@new_resource.mount_point}  ext3  defaults  1 2\n"
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield(line_1).and_yield(line_2)
+      ::File.stub(:foreach).with("/etc/fstab").and_yield(line_1).and_yield(line_2)
 
       @provider.load_current_resource
       @provider.current_resource.enabled.should be_false
@@ -228,11 +228,11 @@ describe Chef::Provider::Mount::Mount do
       target = "/dev/mapper/target"
       options = "rw,noexec,noauto"
 
-      ::File.stub!(:symlink?).with(@new_resource.device).and_return(true)
-      ::File.stub!(:readlink).with(@new_resource.device).and_return(target)
+      ::File.stub(:symlink?).with(@new_resource.device).and_return(true)
+      ::File.stub(:readlink).with(@new_resource.device).and_return(target)
 
       fstab = "#{@new_resource.device} #{@new_resource.mount_point} #{@new_resource.fstype} #{options} 1 2\n"
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+      ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
       @provider.load_current_resource
       @provider.current_resource.options.should eq(options.split(','))
     end
@@ -241,11 +241,11 @@ describe Chef::Provider::Mount::Mount do
       target = "/dev/mapper/target"
       options = "rw,noexec,noauto"
 
-      ::File.stub!(:symlink?).with(@new_resource.device).and_return(true)
-      ::File.stub!(:readlink).with(@new_resource.device).and_return(target)
+      ::File.stub(:symlink?).with(@new_resource.device).and_return(true)
+      ::File.stub(:readlink).with(@new_resource.device).and_return(target)
 
       fstab = "#{target} #{@new_resource.mount_point} #{@new_resource.fstype} #{options} 1 2\n"
-      ::File.stub!(:foreach).with("/etc/fstab").and_yield fstab
+      ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
       @provider.load_current_resource
       @provider.current_resource.options.should eq(options.split(','))
     end
@@ -263,7 +263,6 @@ describe Chef::Provider::Mount::Mount do
 
     describe "mount_fs" do
       it "should mount the filesystem if it is not mounted" do
-        @provider.rspec_reset
         @provider.should_receive(:shell_out!).with("mount -t ext3 -o defaults /dev/sdz1 /tmp/foo")
         @provider.mount_fs()
       end
@@ -278,16 +277,16 @@ describe Chef::Provider::Mount::Mount do
       it "should mount the filesystem specified by uuid" do
         @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
         @new_resource.device_type :uuid
-        @stdout_findfs = mock("STDOUT", :first => "/dev/sdz1")
-        @provider.stub!(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
-        @stdout_mock = mock('stdout mock')
-        @stdout_mock.stub!(:each).and_yield("#{@new_resource.device} on #{@new_resource.mount_point}")
+        @stdout_findfs = double("STDOUT", :first => "/dev/sdz1")
+        @provider.stub(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
+        @stdout_mock = double('stdout mock')
+        @stdout_mock.stub(:each).and_yield("#{@new_resource.device} on #{@new_resource.mount_point}")
         @provider.should_receive(:shell_out!).with("mount -t #{@new_resource.fstype} -o defaults -U #{@new_resource.device} #{@new_resource.mount_point}").and_return(@stdout_mock)
         @provider.mount_fs()
       end
 
       it "should not mount the filesystem if it is mounted" do
-        @current_resource.stub!(:mounted).and_return(true)
+        @current_resource.stub(:mounted).and_return(true)
         @provider.should_not_receive(:shell_out!)
         @provider.mount_fs()
       end
@@ -339,7 +338,7 @@ describe Chef::Provider::Mount::Mount do
         @current_resource.enabled(false)
 
         @fstab = StringIO.new
-        ::File.stub!(:open).with("/etc/fstab", "a").and_yield(@fstab)
+        ::File.stub(:open).with("/etc/fstab", "a").and_yield(@fstab)
         @provider.enable_fs
         @fstab.string.should match(%r{^/dev/sdz1\s+/tmp/foo\s+ext3\s+defaults\s+0\s+2\s*$})
       end
@@ -378,9 +377,9 @@ describe Chef::Provider::Mount::Mount do
         this_mount = "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n"
 
         @fstab_read = [this_mount, other_mount]
-        ::File.stub!(:readlines).with("/etc/fstab").and_return(@fstab_read)
+        ::File.stub(:readlines).with("/etc/fstab").and_return(@fstab_read)
         @fstab_write = StringIO.new
-        ::File.stub!(:open).with("/etc/fstab", "w").and_yield(@fstab_write)
+        ::File.stub(:open).with("/etc/fstab", "w").and_yield(@fstab_write)
 
         @provider.disable_fs
         @fstab_write.string.should match(Regexp.escape(other_mount))
@@ -395,8 +394,8 @@ describe Chef::Provider::Mount::Mount do
                       %q{#/dev/sdz1 /tmp/foo  ext3  defaults  1 2}]
         fstab_write = StringIO.new
 
-        ::File.stub!(:readlines).with("/etc/fstab").and_return(fstab_read)
-        ::File.stub!(:open).with("/etc/fstab", "w").and_yield(fstab_write)
+        ::File.stub(:readlines).with("/etc/fstab").and_return(fstab_read)
+        ::File.stub(:open).with("/etc/fstab", "w").and_yield(fstab_write)
 
         @provider.disable_fs
         fstab_write.string.should match(%r{^/dev/sdy1 /tmp/foo  ext3  defaults  1 2$})
@@ -405,23 +404,23 @@ describe Chef::Provider::Mount::Mount do
       end
 
       it "should disable only the last entry if enabled is true" do
-        @current_resource.stub!(:enabled).and_return(true)
+        @current_resource.stub(:enabled).and_return(true)
         fstab_read = ["/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n",
                       "/dev/sdy1 /tmp/foo  ext3  defaults  1 2\n",
                       "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n"]
 
         fstab_write = StringIO.new
-        ::File.stub!(:readlines).with("/etc/fstab").and_return(fstab_read)
-        ::File.stub!(:open).with("/etc/fstab", "w").and_yield(fstab_write)
+        ::File.stub(:readlines).with("/etc/fstab").and_return(fstab_read)
+        ::File.stub(:open).with("/etc/fstab", "w").and_yield(fstab_write)
 
         @provider.disable_fs
         fstab_write.string.should == "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n/dev/sdy1 /tmp/foo  ext3  defaults  1 2\n"
       end
 
       it "should not disable if enabled is false" do
-        @current_resource.stub!(:enabled).and_return(false)
+        @current_resource.stub(:enabled).and_return(false)
 
-        ::File.stub!(:readlines).with("/etc/fstab").and_return([])
+        ::File.stub(:readlines).with("/etc/fstab").and_return([])
         ::File.should_not_receive(:open).and_yield(@fstab)
 
         @provider.disable_fs