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

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

@@ -40,12 +40,12 @@ describe Chef::Provider::Mount::Windows do
     @new_resource = Chef::Resource::Mount.new("X:")
     @new_resource.device GUID
     @current_resource = Chef::Resource::Mount.new("X:")
-    Chef::Resource::Mount.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Mount.stub(:new).and_return(@current_resource)
 
-    @net_use = mock("Chef::Util::Windows::NetUse")
-    Chef::Util::Windows::NetUse.stub!(:new).and_return(@net_use)
-    @vol = mock("Chef::Util::Windows::Volume")
-    Chef::Util::Windows::Volume.stub!(:new).and_return(@vol)
+    @net_use = double("Chef::Util::Windows::NetUse")
+    Chef::Util::Windows::NetUse.stub(:new).and_return(@net_use)
+    @vol = double("Chef::Util::Windows::Volume")
+    Chef::Util::Windows::Volume.stub(:new).and_return(@vol)
 
     @provider = Chef::Provider::Mount::Windows.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
@@ -53,13 +53,13 @@ describe Chef::Provider::Mount::Windows do
 
   describe "when loading the current resource" do
     it "should set mounted true if the mount point is found" do
-      @vol.stub!(:device).and_return(@new_resource.device)
+      @vol.stub(:device).and_return(@new_resource.device)
       @current_resource.should_receive(:mounted).with(true)
       @provider.load_current_resource
     end
 
     it "should set mounted false if the mount point is not found" do
-      @vol.stub!(:device).and_raise(ArgumentError)
+      @vol.stub(:device).and_raise(ArgumentError)
       @current_resource.should_receive(:mounted).with(false)
       @provider.load_current_resource
     end
@@ -67,8 +67,8 @@ describe Chef::Provider::Mount::Windows do
     describe "with a local device" do
       before do
         @new_resource.device GUID
-        @vol.stub!(:device).and_return(@new_resource.device)
-        @net_use.stub!(:device).and_raise(ArgumentError)
+        @vol.stub(:device).and_return(@new_resource.device)
+        @net_use.stub(:device).and_raise(ArgumentError)
       end
 
       it "should determine the device is a volume GUID" do
@@ -80,8 +80,8 @@ describe Chef::Provider::Mount::Windows do
     describe "with a remote device" do
       before do
         @new_resource.device REMOTE
-        @net_use.stub!(:device).and_return(@new_resource.device)
-        @vol.stub!(:device).and_raise(ArgumentError)
+        @net_use.stub(:device).and_return(@new_resource.device)
+        @vol.stub(:device).and_raise(ArgumentError)
       end
 
       it "should determine the device is remote" do
@@ -93,8 +93,8 @@ describe Chef::Provider::Mount::Windows do
     describe "when mounting a file system" do
       before do
         @new_resource.device GUID
-        @vol.stub!(:add)
-        @vol.stub!(:device).and_raise(ArgumentError)
+        @vol.stub(:add)
+        @vol.stub(:device).and_raise(ArgumentError)
         @provider.load_current_resource
       end
 
@@ -108,7 +108,7 @@ describe Chef::Provider::Mount::Windows do
 
       it "should not mount the filesystem if it is mounted" do
         @vol.should_not_receive(:add)
-        @current_resource.stub!(:mounted).and_return(true)
+        @current_resource.stub(:mounted).and_return(true)
         @provider.mount_fs
       end
     end
@@ -116,19 +116,19 @@ describe Chef::Provider::Mount::Windows do
     describe "when unmounting a file system" do
       before do
         @new_resource.device GUID
-        @vol.stub!(:delete)
-        @vol.stub!(:device).and_raise(ArgumentError)
+        @vol.stub(:delete)
+        @vol.stub(:device).and_raise(ArgumentError)
         @provider.load_current_resource
       end
 
       it "should umount the filesystem if it is mounted" do
-        @current_resource.stub!(:mounted).and_return(true)
+        @current_resource.stub(:mounted).and_return(true)
         @vol.should_receive(:delete)
         @provider.umount_fs
       end
 
       it "should not umount the filesystem if it is not mounted" do
-        @current_resource.stub!(:mounted).and_return(false)
+        @current_resource.stub(:mounted).and_return(false)
         @vol.should_not_receive(:delete)
         @provider.umount_fs
       end

data/spec/unit/provider/mount_spec.rb

@@ -43,14 +43,14 @@ describe Chef::Provider::Mount do
   describe "when the target state is a mounted filesystem" do
 
     it "should mount the filesystem if it isn't mounted" do
-      @current_resource.stub!(:mounted).and_return(false)
+      @current_resource.stub(:mounted).and_return(false)
       @provider.should_receive(:mount_fs).with.and_return(true)
       @provider.run_action(:mount)
       @new_resource.should be_updated_by_last_action
     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(:mount_fs)
       @provider.run_action(:mount)
       @new_resource.should_not be_updated_by_last_action
@@ -60,14 +60,14 @@ describe Chef::Provider::Mount do
 
   describe "when the target state is an unmounted filesystem" do
     it "should umount the filesystem if it is mounted" do
-      @current_resource.stub!(:mounted).and_return(true)
+      @current_resource.stub(:mounted).and_return(true)
       @provider.should_receive(:umount_fs).with.and_return(true)
       @provider.run_action(:umount)
       @new_resource.should be_updated_by_last_action
     end
 
     it "should not umount the filesystem if it is not mounted" do
-      @current_resource.stub!(:mounted).and_return(false)
+      @current_resource.stub(:mounted).and_return(false)
       @provider.should_not_receive(:umount_fs)
       @provider.run_action(:umount)
       @new_resource.should_not be_updated_by_last_action
@@ -80,14 +80,14 @@ describe Chef::Provider::Mount do
     end
 
     it "should remount the filesystem if it is mounted" do
-      @current_resource.stub!(:mounted).and_return(true)
+      @current_resource.stub(:mounted).and_return(true)
       @provider.should_receive(:remount_fs).and_return(true)
       @provider.run_action(:remount)
       @new_resource.should be_updated_by_last_action
     end
 
     it "should not remount the filesystem if it is not mounted" do
-      @current_resource.stub!(:mounted).and_return(false)
+      @current_resource.stub(:mounted).and_return(false)
       @provider.should_not_receive(:remount_fs)
       @provider.run_action(:remount)
       @new_resource.should_not be_updated_by_last_action
@@ -107,7 +107,7 @@ describe Chef::Provider::Mount do
   end
   describe "when enabling the filesystem to be mounted" do
     it "should enable the mount if it isn't enable" do
-      @current_resource.stub!(:enabled).and_return(false)
+      @current_resource.stub(:enabled).and_return(false)
       @provider.should_not_receive(:mount_options_unchanged?)
       @provider.should_receive(:enable_fs).and_return(true)
       @provider.run_action(:enable)
@@ -115,7 +115,7 @@ describe Chef::Provider::Mount do
     end
 
     it "should enable the mount if it is enabled and mount options have changed" do
-      @current_resource.stub!(:enabled).and_return(true)
+      @current_resource.stub(:enabled).and_return(true)
       @provider.should_receive(:mount_options_unchanged?).and_return(false)
       @provider.should_receive(:enable_fs).and_return(true)
       @provider.run_action(:enable)
@@ -123,9 +123,9 @@ describe Chef::Provider::Mount do
     end
 
     it "should not enable the mount if it is enabled and mount options have not changed" do
-      @current_resource.stub!(:enabled).and_return(true)
+      @current_resource.stub(:enabled).and_return(true)
       @provider.should_receive(:mount_options_unchanged?).and_return(true)
-      @provider.should_not_receive(:enable_fs).and_return(true)
+      @provider.should_not_receive(:enable_fs)
       @provider.run_action(:enable)
       @new_resource.should_not be_updated_by_last_action
     end
@@ -133,14 +133,14 @@ describe Chef::Provider::Mount do
 
   describe "when the target state is to disable the mount" do
     it "should disable the mount if it is enabled" do
-      @current_resource.stub!(:enabled).and_return(true)
+      @current_resource.stub(:enabled).and_return(true)
       @provider.should_receive(:disable_fs).with.and_return(true)
       @provider.run_action(:disable)
       @new_resource.should be_updated_by_last_action
     end
 
     it "should not disable the mount if it isn't enabled" do
-      @current_resource.stub!(:enabled).and_return(false)
+      @current_resource.stub(:enabled).and_return(false)
       @provider.should_not_receive(:disable_fs)
       @provider.run_action(:disable)
       @new_resource.should_not be_updated_by_last_action

data/spec/unit/provider/ohai_spec.rb

@@ -41,17 +41,17 @@ describe Chef::Provider::Ohai do
         :newdata => "somevalue"
       }
     }
-    mock_ohai.stub!(:all_plugins).and_return(true)
-    mock_ohai.stub!(:require_plugin).and_return(true)
-    mock_ohai.stub!(:data).and_return(mock_ohai[:data],
+    mock_ohai.stub(:all_plugins).and_return(true)
+    mock_ohai.stub(:require_plugin).and_return(true)
+    mock_ohai.stub(:data).and_return(mock_ohai[:data],
                                       mock_ohai[:data2])
-    Ohai::System.stub!(:new).and_return(mock_ohai)
-    Chef::Platform.stub!(:find_platform_and_version).and_return({ "platform" => @platform,
+    Ohai::System.stub(:new).and_return(mock_ohai)
+    Chef::Platform.stub(:find_platform_and_version).and_return({ "platform" => @platform,
                                                                   "platform_version" => @platform_version})
     # Fake node with a dummy save
     @node = Chef::Node.new
     @node.name(@fqdn)
-    @node.stub!(:save).and_return(@node)
+    @node.stub(:save).and_return(@node)
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Ohai.new("ohai_reload")

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

@@ -28,7 +28,7 @@ describe Chef::Provider::Package::Aix do
     @new_resource.source("/tmp/samba.base")
 
     @provider = Chef::Provider::Package::Aix.new(@new_resource, @run_context)
-    ::File.stub!(:exists?).and_return(true)
+    ::File.stub(:exists?).and_return(true)
   end
 
   describe "assessing the current package status" do
@@ -36,24 +36,24 @@ describe Chef::Provider::Package::Aix do
      @bffinfo ="/usr/lib/objrepos:samba.base:3.3.12.0::COMMITTED:I:Samba for AIX:
  /etc/objrepos:samba.base:3.3.12.0::COMMITTED:I:Samba for AIX:"
 
-      @status = mock("Status", :exitstatus => 0)
+      @status = double("Status", :exitstatus => 0)
     end
 
     it "should create a current resource with the name of new_resource" do
-      @provider.stub!(:popen4).and_return(@status)
+      @provider.stub(:popen4).and_return(@status)
       @provider.load_current_resource
       @provider.current_resource.name.should == "samba.base"
     end
 
     it "should set the current resource bff package name to the new resource bff package name" do
-      @provider.stub!(:popen4).and_return(@status)
+      @provider.stub(:popen4).and_return(@status)
       @provider.load_current_resource
       @provider.current_resource.package_name.should == "samba.base"
     end
 
     it "should raise an exception if a source is supplied but not found" do
-      @provider.stub!(:popen4).and_return(@status)
-      ::File.stub!(:exists?).and_return(false)
+      @provider.stub(:popen4).and_return(@status)
+      ::File.stub(:exists?).and_return(false)
       @provider.define_resource_requirements
       @provider.load_current_resource
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Package)
@@ -83,13 +83,13 @@ describe Chef::Provider::Package::Aix do
     it "should raise an exception if the source is not set but we are installing" do
       @new_resource = Chef::Resource::Package.new("samba.base")
       @provider = Chef::Provider::Package::Aix.new(@new_resource, @run_context)
-      @provider.stub!(:popen4).and_return(@status)
+      @provider.stub(:popen4).and_return(@status)
       lambda { @provider.run_action(:install) }.should raise_error(Chef::Exceptions::Package)
     end
 
     it "should raise an exception if installp/lslpp fails to run" do
-      @status = mock("Status", :exitstatus => -1)
-      @provider.stub!(:popen4).and_return(@status)
+      @status = double("Status", :exitstatus => -1)
+      @provider.stub(:popen4).and_return(@status)
       lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package)
     end
 
@@ -110,14 +110,14 @@ describe Chef::Provider::Package::Aix do
     end
 
     it "should lookup the candidate_version if the variable is not already set" do
-      @status = mock("Status", :exitstatus => 0)
+      @status = double("Status", :exitstatus => 0)
       @provider.should_receive(:popen4).and_return(@status)
       @provider.candidate_version
     end
 
     it "should throw and exception if the exitstatus is not 0" do
-      @status = mock("Status", :exitstatus => 1)
-      @provider.stub!(:popen4).and_return(@status)
+      @status = double("Status", :exitstatus => 1)
+      @provider.stub(:popen4).and_return(@status)
       lambda { @provider.candidate_version }.should raise_error(Chef::Exceptions::Package)
     end
 
@@ -142,7 +142,7 @@ describe Chef::Provider::Package::Aix do
     end
 
     it "should run installp with -eLogfile option." do
-      @new_resource.stub!(:options).and_return("-e/tmp/installp.log")
+      @new_resource.stub(:options).and_return("-e/tmp/installp.log")
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "installp -aYF  -e/tmp/installp.log -d /tmp/samba.base samba.base"
       })
@@ -159,7 +159,7 @@ describe Chef::Provider::Package::Aix do
     end
 
     it "should run installp -u -e/tmp/installp.log  with options -e/tmp/installp.log" do
-      @new_resource.stub!(:options).and_return("-e/tmp/installp.log")
+      @new_resource.stub(:options).and_return("-e/tmp/installp.log")
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "installp -u  -e/tmp/installp.log samba.base"
       })

data/spec/unit/provider/package/apt_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Provider::Package::Apt do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Package.new("irssi", @run_context)
 
-    @status = mock("Status", :exitstatus => 0)
+    @status = double("Status", :exitstatus => 0)
     @provider = Chef::Provider::Package::Apt.new(@new_resource, @run_context)
     @stdin = StringIO.new
     @stdout =<<-PKG_STATUS
@@ -83,7 +83,7 @@ libmysqlclient15-dev:
   Candidate: (none)
   Version table:
 VPKG_STDOUT
-      virtual_package = mock(:stdout => virtual_package_out,:exitstatus => 0)
+      virtual_package = double(:stdout => virtual_package_out,:exitstatus => 0)
       @provider.should_receive(:shell_out!).with("apt-cache policy libmysqlclient15-dev").and_return(virtual_package)
       showpkg_out =<<-SHOWPKG_STDOUT
 Package: libmysqlclient15-dev
@@ -103,7 +103,7 @@ libmysqlclient-dev 5.1.41-3ubuntu12.7
 libmysqlclient-dev 5.1.41-3ubuntu12.10
 libmysqlclient-dev 5.1.41-3ubuntu12
 SHOWPKG_STDOUT
-      showpkg = mock(:stdout => showpkg_out,:exitstatus => 0)
+      showpkg = double(:stdout => showpkg_out,:exitstatus => 0)
       @provider.should_receive(:shell_out!).with("apt-cache showpkg libmysqlclient15-dev").and_return(showpkg)
       real_package_out=<<-RPKG_STDOUT
 libmysqlclient-dev:
@@ -118,7 +118,7 @@ libmysqlclient-dev:
      5.1.41-3ubuntu12 0
         500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
 RPKG_STDOUT
-      real_package = mock(:stdout => real_package_out,:exitstatus => 0)
+      real_package = double(:stdout => real_package_out,:exitstatus => 0)
       @provider.should_receive(:shell_out!).with("apt-cache policy libmysqlclient-dev").and_return(real_package)
       @provider.load_current_resource
     end
@@ -131,7 +131,7 @@ mp3-decoder:
   Candidate: (none)
   Version table:
 VPKG_STDOUT
-      virtual_package = mock(:stdout => virtual_package_out,:exitstatus => 0)
+      virtual_package = double(:stdout => virtual_package_out,:exitstatus => 0)
       @provider.should_receive(:shell_out!).with("apt-cache policy mp3-decoder").and_return(virtual_package)
       showpkg_out=<<-SHOWPKG_STDOUT
 Package: mp3-decoder
@@ -154,7 +154,7 @@ opencubicplayer 1:0.1.17-2
 mpg321 0.2.10.6
 mpg123 1.12.1-0ubuntu1
 SHOWPKG_STDOUT
-      showpkg = mock(:stdout => showpkg_out,:exitstatus => 0)
+      showpkg = double(:stdout => showpkg_out,:exitstatus => 0)
       @provider.should_receive(:shell_out!).with("apt-cache showpkg mp3-decoder").and_return(showpkg)
       lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package)
     end
@@ -163,8 +163,8 @@ SHOWPKG_STDOUT
       @new_resource = Chef::Resource::AptPackage.new("irssi", @run_context)
       @provider = Chef::Provider::Package::Apt.new(@new_resource, @run_context)
 
-      @new_resource.stub!(:default_release).and_return("lenny-backports")
-      @new_resource.stub!(:provider).and_return("Chef::Provider::Package::Apt")
+      @new_resource.stub(:default_release).and_return("lenny-backports")
+      @new_resource.stub(:provider).and_return("Chef::Provider::Package::Apt")
       @provider.should_receive(:shell_out!).with("apt-cache -o APT::Default-Release=lenny-backports policy irssi").and_return(@shell_out)
       @provider.load_current_resource
     end
@@ -256,7 +256,7 @@ SHOWPKG_STDOUT
 
     describe "when preseeding a package" do
       before(:each) do
-        @provider.stub!(:get_preseed_file).and_return("/tmp/irssi-0.8.12-7.seed")
+        @provider.stub(:get_preseed_file).and_return("/tmp/irssi-0.8.12-7.seed")
       end
 
       it "should get the full path to the preseed response file" do
@@ -282,7 +282,7 @@ SHOWPKG_STDOUT
         @provider.stub(:check_package_state)
         @current_resource.version "0.8.11"
         @new_resource.response_file "/tmp/file"
-        @provider.stub!(:get_preseed_file).and_return(false)
+        @provider.stub(:get_preseed_file).and_return(false)
         @provider.should_not_receive(:shell_out!)
         @provider.run_action(:reconfig)
       end

data/spec/unit/provider/package/dpkg_spec.rb

@@ -30,12 +30,12 @@ describe Chef::Provider::Package::Dpkg do
 
     @stdin = StringIO.new
     @stdout = StringIO.new
-    @status = mock("Status", :exitstatus => 0)
+    @status = double("Status", :exitstatus => 0)
     @stderr = StringIO.new
-    @pid = mock("PID")
-    @provider.stub!(:popen4).and_return(@status)
+    @pid = double("PID")
+    @provider.stub(:popen4).and_return(@status)
 
-    ::File.stub!(:exists?).and_return(true)
+    ::File.stub(:exists?).and_return(true)
   end
 
   describe "when loading the current resource state" do
@@ -48,14 +48,14 @@ describe Chef::Provider::Package::Dpkg do
     it "should raise an exception if a source is supplied but not found" do
       @provider.load_current_resource
       @provider.define_resource_requirements
-      ::File.stub!(:exists?).and_return(false)
+      ::File.stub(:exists?).and_return(false)
       lambda { @provider.run_action(:install) }.should raise_error(Chef::Exceptions::Package)
     end
 
     describe 'gets the source package version from dpkg-deb' do
       def check_version(version)
         @stdout = StringIO.new("wget\t#{version}")
-        @provider.stub!(:popen4).with("dpkg-deb -W #{@new_resource.source}").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+        @provider.stub(:popen4).with("dpkg-deb -W #{@new_resource.source}").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
         @provider.load_current_resource
         @provider.current_resource.package_name.should == "wget"
         @new_resource.version.should == version
@@ -76,7 +76,7 @@ describe Chef::Provider::Package::Dpkg do
 
     it "gets the source package name from dpkg-deb correctly when the package name has `-', `+' or `.' characters" do
       @stdout = StringIO.new("f.o.o-pkg++2\t1.11.4-1ubuntu1")
-      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @provider.load_current_resource
       @provider.current_resource.package_name.should == "f.o.o-pkg++2"
     end
@@ -103,15 +103,15 @@ Config-Version: 1.11.4-1ubuntu1
 Depends: libc6 (>= 2.8~20080505), libssl0.9.8 (>= 0.9.8f-5)
 Conflicts: wget-ssl
 DPKG_S
-      @provider.stub!(:popen4).with("dpkg -s wget").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @provider.stub(:popen4).with("dpkg -s wget").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
 
       @provider.load_current_resource
       @provider.current_resource.version.should == "1.11.4-1ubuntu1"
     end
 
     it "should raise an exception if dpkg fails to run" do
-      @status = mock("Status", :exitstatus => -1)
-      @provider.stub!(:popen4).and_return(@status)
+      @status = double("Status", :exitstatus => -1)
+      @provider.stub(:popen4).and_return(@status)
       lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package)
     end
   end
@@ -158,7 +158,7 @@ DPKG_S
           "DEBIAN_FRONTEND" => "noninteractive"
         }
       })
-      @new_resource.stub!(:options).and_return("--force-yes")
+      @new_resource.stub(:options).and_return("--force-yes")
 
       @provider.install_package("wget", "1.11.4-1ubuntu1")
     end
@@ -186,7 +186,7 @@ DPKG_S
           "DEBIAN_FRONTEND" => "noninteractive"
         }
       })
-      @new_resource.stub!(:options).and_return("--force-yes")
+      @new_resource.stub(:options).and_return("--force-yes")
 
       @provider.remove_package("wget", "1.11.4-1ubuntu1")
     end
@@ -208,7 +208,7 @@ DPKG_S
           "DEBIAN_FRONTEND" => "noninteractive"
         }
       })
-      @new_resource.stub!(:options).and_return("--force-yes")
+      @new_resource.stub(:options).and_return("--force-yes")
 
       @provider.purge_package("wget", "1.11.4-1ubuntu1")
     end