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

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

@@ -30,14 +30,14 @@ describe Chef::Provider::Package::EasyInstall do
     @current_resource.version('1.8d')
 
     @provider = Chef::Provider::Package::EasyInstall.new(@new_resource, @run_context)
-    Chef::Resource::Package.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
 
     @stdin = StringIO.new
     @stdout = StringIO.new
-    @status = mock("Status", :exitstatus => 0)
+    @status = double("Status", :exitstatus => 0)
     @stderr = StringIO.new
     @pid = 2342
-    @provider.stub!(:popen4).and_return(@status)
+    @provider.stub(:popen4).and_return(@status)
   end
 
   describe "easy_install_binary_path" do
@@ -47,7 +47,7 @@ describe Chef::Provider::Package::EasyInstall do
     end
 
     it "should set the current resources package name to the new resources package name" do
-      $stdout.stub!(:write)
+      $stdout.stub(:write)
       @current_resource.should_receive(:package_name).with(@new_resource.package_name)
       @provider.load_current_resource
     end
@@ -75,7 +75,7 @@ describe Chef::Provider::Package::EasyInstall do
       @provider.should_receive(:run_command).with({
         :command => "easy_install --always-unzip \"boto==1.8d\""
       })
-      @new_resource.stub!(:options).and_return("--always-unzip")
+      @new_resource.stub(:options).and_return("--always-unzip")
       @provider.install_package("boto", "1.8d")
     end
 
@@ -97,7 +97,7 @@ describe Chef::Provider::Package::EasyInstall do
       @provider.should_receive(:run_command).with({
         :command => "easy_install -x -m boto"
       })
-      @new_resource.stub!(:options).and_return("-x")
+      @new_resource.stub(:options).and_return("-x")
       @provider.remove_package("boto", "1.8d")
     end
 

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

@@ -30,12 +30,12 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
 
     @provider = Chef::Provider::Package::Freebsd.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
-    ::File.stub!(:exist?).with('/usr/ports/Makefile').and_return(false)
+    ::File.stub(:exist?).with('/usr/ports/Makefile').and_return(false)
   end
 
   describe "when determining the current package state" do
     before do
-      @provider.stub!(:ports_candidate_version).and_return("4.3.6")
+      @provider.stub(:ports_candidate_version).and_return("4.3.6")
     end
 
     it "should create a current resource with the name of the new_resource" do
@@ -68,25 +68,25 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
 
       #@provider = Chef::Provider::Package::Freebsd.new(@node, @new_resource)
 
-      #@status = mock("Status", :exitstatus => 0)
-      #@stdin = mock("STDIN", :null_object => true)
-      #@stdout = mock("STDOUT", :null_object => true)
-      #@stderr = mock("STDERR", :null_object => true)
-      #@pid = mock("PID", :null_object => true)
+      #@status = double("Status", :exitstatus => 0)
+      #@stdin = double("STDIN", :null_object => true)
+      #@stdout = double("STDOUT", :null_object => true)
+      #@stderr = double("STDERR", :null_object => true)
+      #@pid = double("PID", :null_object => true)
     end
 
     it "should return the version number when it is installed" do
       pkg_info = OpenStruct.new(:stdout => "zsh-4.3.6_7")
       @provider.should_receive(:shell_out!).with('pkg_info -E "zsh*"', :env => nil, :returns => [0,1]).and_return(pkg_info)
       #@provider.should_receive(:popen4).with('pkg_info -E "zsh*"').and_yield(@pid, @stdin, ["zsh-4.3.6_7"], @stderr).and_return(@status)
-      @provider.stub!(:package_name).and_return("zsh")
+      @provider.stub(:package_name).and_return("zsh")
       @provider.current_installed_version.should == "4.3.6_7"
     end
 
     it "does not set the current version number when the package is not installed" do
       pkg_info = OpenStruct.new(:stdout => "")
       @provider.should_receive(:shell_out!).with('pkg_info -E "zsh*"', :env => nil, :returns => [0,1]).and_return(pkg_info)
-      @provider.stub!(:package_name).and_return("zsh")
+      @provider.stub(:package_name).and_return("zsh")
       @provider.current_installed_version.should be_nil
     end
 
@@ -94,21 +94,21 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
       whereis = OpenStruct.new(:stdout => "zsh: /usr/ports/shells/zsh")
       @provider.should_receive(:shell_out!).with("whereis -s zsh", :env => nil).and_return(whereis)
       #@provider.should_receive(:popen4).with("whereis -s zsh").and_yield(@pid, @stdin, ["zsh: /usr/ports/shells/zsh"], @stderr).and_return(@status)
-      @provider.stub!(:port_name).and_return("zsh")
+      @provider.stub(:port_name).and_return("zsh")
       @provider.port_path.should == "/usr/ports/shells/zsh"
     end
 
     # Not happy with the form of these tests as they are far too closely tied to the implementation and so very fragile.
     it "should return the ports candidate version when given a valid port path" do
-      @provider.stub!(:port_path).and_return("/usr/ports/shells/zsh")
+      @provider.stub(:port_path).and_return("/usr/ports/shells/zsh")
       make_v = OpenStruct.new(:stdout => "4.3.6\n")
       @provider.should_receive(:shell_out!).with("make -V PORTVERSION", {:cwd=>"/usr/ports/shells/zsh", :returns=>[0, 1], :env=>nil}).and_return(make_v)
       @provider.ports_candidate_version.should == "4.3.6"
     end
 
     it "should figure out the package name when we have ports" do
-      ::File.stub!(:exist?).with('/usr/ports/Makefile').and_return(true)
-      @provider.stub!(:port_path).and_return("/usr/ports/shells/zsh")
+      ::File.stub(:exist?).with('/usr/ports/Makefile').and_return(true)
+      @provider.stub(:port_path).and_return("/usr/ports/shells/zsh")
       make_v = OpenStruct.new(:stdout => "zsh-4.3.6_7\n")
       @provider.should_receive(:shell_out!).with("make -V PKGNAME", {:cwd=>"/usr/ports/shells/zsh", :env=>nil, :returns=>[0, 1]}).and_return(make_v)
       #@provider.should_receive(:ports_makefile_variable_value).with("PKGNAME").and_return("zsh-4.3.6_7")
@@ -121,9 +121,9 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
       @cmd_result = OpenStruct.new(:status => true)
 
       @provider.current_resource = @current_resource
-      @provider.stub!(:package_name).and_return("zsh")
-      @provider.stub!(:latest_link_name).and_return("zsh")
-      @provider.stub!(:port_path).and_return("/usr/ports/shells/zsh")
+      @provider.stub(:package_name).and_return("zsh")
+      @provider.stub(:latest_link_name).and_return("zsh")
+      @provider.stub(:port_path).and_return("/usr/ports/shells/zsh")
     end
 
     it "should run pkg_add -r with the package name" do
@@ -132,7 +132,7 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
     end
 
     it "should run make install when installing from ports" do
-      @new_resource.stub!(:source).and_return("ports")
+      @new_resource.stub(:source).and_return("ports")
       @provider.should_not_receive(:shell_out!).with("make -DBATCH -f /usr/ports/shells/zsh/Makefile install", :timeout => 1200, :env=>nil)
       @provider.should_receive(:shell_out!).with("make -DBATCH install", :timeout => 1200, :env=>nil, :cwd => @provider.port_path).and_return(@cmd_result)
       @provider.install_package("zsh", "4.3.6_7")
@@ -161,7 +161,7 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
     end
 
     it "should use the package_name as a relative path from /usr/ports when it contains / but doesn't start with it" do
-      # @new_resource = mock( "Chef::Resource::Package",
+      # @new_resource = double( "Chef::Resource::Package",
       #                       :package_name => "www/wordpress",
       #                       :cookbook_name => "xenoparadox")
       new_resource = Chef::Resource::Package.new("www/wordpress")
@@ -177,9 +177,9 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
       @current_resource = Chef::Resource::Package.new("ruby-iconv")
       @provider = Chef::Provider::Package::Freebsd.new(@new_resource, @run_context)
       @provider.current_resource = @current_resource
-      @provider.stub!(:port_path).and_return("/usr/ports/converters/ruby-iconv")
-      @provider.stub!(:package_name).and_return("ruby18-iconv")
-      @provider.stub!(:latest_link_name).and_return("ruby18-iconv")
+      @provider.stub(:port_path).and_return("/usr/ports/converters/ruby-iconv")
+      @provider.stub(:package_name).and_return("ruby18-iconv")
+      @provider.stub(:latest_link_name).and_return("ruby18-iconv")
 
       @install_result = OpenStruct.new(:status => true)
     end
@@ -190,7 +190,7 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
     end
 
     it "should run make install when installing from ports" do
-      @new_resource.stub!(:source).and_return("ports")
+      @new_resource.stub(:source).and_return("ports")
       @provider.should_receive(:shell_out!).with("make -DBATCH install", :timeout => 1200, :env=>nil, :cwd => @provider.port_path).and_return(@install_result)
       @provider.install_package("ruby-iconv", "1.0")
     end
@@ -202,7 +202,7 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
       @new_resource.version "4.3.6_7"
       @current_resource.version "4.3.6_7"
       @provider.current_resource = @current_resource
-      @provider.stub!(:package_name).and_return("zsh")
+      @provider.stub(:package_name).and_return("zsh")
     end
 
     it "should run pkg_delete with the package name and version" do
@@ -227,14 +227,14 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
     it "should return the port path for a valid port name" do
       whereis = OpenStruct.new(:stdout => "bonnie++: /usr/ports/benchmarks/bonnie++")
       @provider.should_receive(:shell_out!).with("whereis -s bonnie++", :env => nil).and_return(whereis)
-      @provider.stub!(:port_name).and_return("bonnie++")
+      @provider.stub(:port_name).and_return("bonnie++")
       @provider.port_path.should == "/usr/ports/benchmarks/bonnie++"
     end
 
     it "should return the version number when it is installed" do
       pkg_info = OpenStruct.new(:stdout => "bonnie++-1.96")
       @provider.should_receive(:shell_out!).with('pkg_info -E "bonnie++*"', :env => nil, :returns => [0,1]).and_return(pkg_info)
-      @provider.stub!(:package_name).and_return("bonnie++")
+      @provider.stub(:package_name).and_return("bonnie++")
       @provider.current_installed_version.should == "1.96"
     end
   end
@@ -262,8 +262,8 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
       @current_resource = Chef::Resource::Package.new("perl5.8")
       @provider = Chef::Provider::Package::Freebsd.new(@new_resource, @run_context)
       @provider.current_resource = @current_resource
-      @provider.stub!(:package_name).and_return("perl")
-      @provider.stub!(:latest_link_name).and_return("perl")
+      @provider.stub(:package_name).and_return("perl")
+      @provider.stub(:latest_link_name).and_return("perl")
 
       cmd = OpenStruct.new(:status => true)
       @provider.should_receive(:shell_out!).with("pkg_add -r perl", :env => nil).and_return(cmd)
@@ -276,8 +276,8 @@ describe Chef::Provider::Package::Freebsd, "load_current_resource" do
       @current_resource = Chef::Resource::Package.new("mysql50-server")
       @provider = Chef::Provider::Package::Freebsd.new(@new_resource, @run_context)
       @provider.current_resource = @current_resource
-      @provider.stub!(:package_name).and_return("mysql-server")
-      @provider.stub!(:latest_link_name).and_return("mysql50-server")
+      @provider.stub(:package_name).and_return("mysql-server")
+      @provider.stub(:latest_link_name).and_return("mysql50-server")
 
       cmd = OpenStruct.new(:status => true)
       @provider.should_receive(:shell_out!).with("pkg_add -r mysql50-server", :env=>nil).and_return(cmd)

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

@@ -28,7 +28,7 @@ describe Chef::Provider::Package::Ips do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Package.new("crypto/gnupg", @run_context)
     @current_resource = Chef::Resource::Package.new("crypto/gnupg", @run_context)
-    Chef::Resource::Package.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
     @provider = Chef::Provider::Package::Ips.new(@new_resource, @run_context)
 
     @stdin = StringIO.new
@@ -117,7 +117,7 @@ INSTALLED
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "pkg --no-refresh install -q crypto/gnupg@2.0.17"
       })
-      @new_resource.stub!(:options).and_return("--no-refresh")
+      @new_resource.stub(:options).and_return("--no-refresh")
       @provider.install_package("crypto/gnupg", "2.0.17")
     end
 
@@ -168,7 +168,7 @@ PKG_STATUS
 
       context "when accept_license is true" do
         before do
-          @new_resource.stub!(:accept_license).and_return(true)
+          @new_resource.stub(:accept_license).and_return(true)
         end
 
         it "should run pkg install with the --accept flag" do
@@ -202,7 +202,7 @@ PKG_STATUS
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "pkg --no-refresh uninstall -q crypto/gnupg@2.0.17"
       })
-      @new_resource.stub!(:options).and_return("--no-refresh")
+      @new_resource.stub(:options).and_return("--no-refresh")
       @provider.remove_package("crypto/gnupg", "2.0.17")
     end
   end

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

@@ -27,9 +27,9 @@ describe Chef::Provider::Package::Macports do
     @current_resource = Chef::Resource::Package.new("zsh")
 
     @provider = Chef::Provider::Package::Macports.new(@new_resource, @run_context)
-    Chef::Resource::Package.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
 
-    @status = mock("Status", :exitstatus => 0)
+    @status = double("Status", :exitstatus => 0)
     @stdin = StringIO.new
     @stdout = StringIO.new
     @stderr = StringIO.new
@@ -121,7 +121,7 @@ EOF
     it "should add options to the port command when specified" do
       @current_resource.should_receive(:version).and_return("4.1.6")
       @provider.current_resource = @current_resource
-      @new_resource.stub!(:options).and_return("-f")
+      @new_resource.stub(:options).and_return("-f")
       @provider.should_receive(:run_command_with_systems_locale).with(:command => "port -f install zsh @4.2.7")
 
       @provider.install_package("zsh", "4.2.7")
@@ -140,7 +140,7 @@ EOF
     end
 
     it "should add options to the port command when specified" do
-      @new_resource.stub!(:options).and_return("-f")
+      @new_resource.stub(:options).and_return("-f")
       @provider.should_receive(:run_command_with_systems_locale).with(:command => "port -f uninstall zsh @4.2.7")
       @provider.purge_package("zsh", "4.2.7")
     end
@@ -158,7 +158,7 @@ EOF
     end
 
     it "should add options to the port command when specified" do
-      @new_resource.stub!(:options).and_return("-f")
+      @new_resource.stub(:options).and_return("-f")
       @provider.should_receive(:run_command_with_systems_locale).with(:command => "port -f deactivate zsh @4.2.7")
       @provider.remove_package("zsh", "4.2.7")
     end
@@ -191,7 +191,7 @@ EOF
     end
 
     it "should add options to the port command when specified" do
-      @new_resource.stub!(:options).and_return("-f")
+      @new_resource.stub(:options).and_return("-f")
       @current_resource.should_receive(:version).at_least(:once).and_return("4.1.6")
       @provider.current_resource = @current_resource
 

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

@@ -26,10 +26,10 @@ describe Chef::Provider::Package::Pacman do
     @new_resource = Chef::Resource::Package.new("nano")
     @current_resource = Chef::Resource::Package.new("nano")
 
-    @status = mock("Status", :exitstatus => 0)
+    @status = double("Status", :exitstatus => 0)
     @provider = Chef::Provider::Package::Pacman.new(@new_resource, @run_context)
-    Chef::Resource::Package.stub!(:new).and_return(@current_resource)
-    @provider.stub!(:popen4).and_return(@status)
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
+    @provider.stub(:popen4).and_return(@status)
     @stdin = StringIO.new
     @stdout = StringIO.new(<<-ERR)
 error: package "nano" not found
@@ -55,13 +55,13 @@ ERR
     end
 
     it "should read stdout on pacman" do
-      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @stdout.should_receive(:each).and_return(true)
       @provider.load_current_resource
     end
 
     it "should set the installed version to nil on the current resource if pacman installed version not exists" do
-      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @current_resource.should_receive(:version).with(nil).and_return(true)
       @provider.load_current_resource
     end
@@ -88,17 +88,17 @@ Install Reason : Explicitly installed
 Install Script : Yes
 Description    : Pico editor clone with enhancements
 PACMAN
-      @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
       @current_resource.version.should == "2.2.2-1"
     end
 
     it "should set the candidate version if pacman has one" do
-      @stdout.stub!(:each).and_yield("core/nano 2.2.3-1 (base)").
+      @stdout.stub(:each).and_yield("core/nano 2.2.3-1 (base)").
                             and_yield("    Pico editor clone with enhancements").
                             and_yield("community/nanoblogger 3.4.1-1").
                             and_yield("    NanoBlogger is a small weblog engine written in Bash for the command line")
-      @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.candidate_version.should eql("2.2.3-1")
     end
@@ -122,11 +122,11 @@ Include = /etc/pacman.d/mirrorlist
 Include = /etc/pacman.d/mirrorlist
 PACMAN_CONF
 
-      ::File.stub!(:exists?).with("/etc/pacman.conf").and_return(true)
-      ::File.stub!(:read).with("/etc/pacman.conf").and_return(@pacman_conf)
-      @stdout.stub!(:each).and_yield("customrepo/nano 1.2.3-4").
+      ::File.stub(:exists?).with("/etc/pacman.conf").and_return(true)
+      ::File.stub(:read).with("/etc/pacman.conf").and_return(@pacman_conf)
+      @stdout.stub(:each).and_yield("customrepo/nano 1.2.3-4").
                             and_yield("    My custom package")
-      @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.candidate_version.should eql("1.2.3-4")
@@ -139,12 +139,12 @@ PACMAN_CONF
 
     it "should not raise an exception if pacman succeeds" do
       @status.should_receive(:exitstatus).and_return(0)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Package)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
 
     it "should raise an exception if pacman does not return a candidate version" do
-      @stdout.stub!(:each).and_yield("")
-      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @stdout.stub(:each).and_yield("")
+      @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       lambda { @provider.candidate_version }.should raise_error(Chef::Exceptions::Package)
     end
 
@@ -165,7 +165,7 @@ PACMAN_CONF
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "pacman --sync --noconfirm --noprogressbar --debug nano"
       })
-      @new_resource.stub!(:options).and_return("--debug")
+      @new_resource.stub(:options).and_return("--debug")
 
       @provider.install_package("nano", "1.0")
     end
@@ -190,7 +190,7 @@ PACMAN_CONF
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "pacman --remove --noconfirm --noprogressbar --debug nano"
       })
-      @new_resource.stub!(:options).and_return("--debug")
+      @new_resource.stub(:options).and_return("--debug")
 
       @provider.remove_package("nano", "1.0")
     end

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

@@ -27,70 +27,70 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do
     @current_resource = Chef::Resource::Package.new("dev-util/git")
 
     @provider = Chef::Provider::Package::Portage.new(@new_resource, @run_context)
-    Chef::Resource::Package.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
   end
 
   describe "when determining the current state of the package" do
 
     it "should create a current resource with the name of new_resource" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0"])
       Chef::Resource::Package.should_receive(:new).and_return(@current_resource)
       @provider.load_current_resource
     end
 
     it "should set the current resource package name to the new resource package name" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0"])
       @current_resource.should_receive(:package_name).with(@new_resource.package_name)
       @provider.load_current_resource
     end
 
     it "should return a current resource with the correct version if the package is found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-foobar-0.9", "/var/db/pkg/dev-util/git-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-foobar-0.9", "/var/db/pkg/dev-util/git-1.0.0"])
       @provider.load_current_resource
       @provider.current_resource.version.should == "1.0.0"
     end
 
     it "should return a current resource with the correct version if the package is found with revision" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0-r1"])
+      ::Dir.stub(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0-r1"])
       @provider.load_current_resource
       @provider.current_resource.version.should == "1.0.0-r1"
     end
 
     it "should return a current resource with a nil version if the package is not found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/notgit-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/notgit-1.0.0"])
       @provider.load_current_resource
       @provider.current_resource.version.should be_nil
     end
 
     it "should return a package name match from /var/db/pkg/* if a category isn't specified and a match is found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/git-foobar-0.9", "/var/db/pkg/dev-util/git-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/git-foobar-0.9", "/var/db/pkg/dev-util/git-1.0.0"])
       @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
       @provider.load_current_resource
       @provider.current_resource.version.should == "1.0.0"
     end
 
     it "should return a current resource with a nil version if a category isn't specified and a name match from /var/db/pkg/* is not found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/notgit-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/notgit-1.0.0"])
       @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
       @provider.load_current_resource
       @provider.current_resource.version.should be_nil
     end
 
     it "should throw an exception if a category isn't specified and multiple packages are found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0", "/var/db/pkg/funny-words/git-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0", "/var/db/pkg/funny-words/git-1.0.0"])
       @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
       lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package)
     end
 
     it "should return a current resource with a nil version if a category is specified and multiple packages are found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0", "/var/db/pkg/funny-words/git-1.0.0"])
+      ::Dir.stub(:[]).with("/var/db/pkg/dev-util/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0", "/var/db/pkg/funny-words/git-1.0.0"])
       @provider = Chef::Provider::Package::Portage.new(@new_resource, @run_context)
       @provider.load_current_resource
       @provider.current_resource.version.should be_nil
     end
 
     it "should return a current resource with a nil version if a category is not specified and multiple packages from the same category are found" do
-      ::Dir.stub!(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0", "/var/db/pkg/dev-util/git-1.0.1"])
+      ::Dir.stub(:[]).with("/var/db/pkg/*/git-*").and_return(["/var/db/pkg/dev-util/git-1.0.0", "/var/db/pkg/dev-util/git-1.0.1"])
       @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
       @provider.load_current_resource
       @provider.current_resource.version.should be_nil
@@ -107,8 +107,8 @@ describe Chef::Provider::Package::Portage, "load_current_resource" do
       end
 
       it "should throw an 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
 
@@ -143,7 +143,7 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = mock("Status", :exitstatus => 0)
+        @status = double("Status", :exitstatus => 0)
         @provider.should_receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
         @provider.candidate_version.should == "1.6.0.6"
       end
@@ -179,7 +179,7 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = mock("Status", :exitstatus => 0)
+        @status = double("Status", :exitstatus => 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
         @provider.should_receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
         @provider.candidate_version.should == "1.6.0.6"
@@ -224,7 +224,7 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = mock("Status", :exitstatus => 0)
+        @status = double("Status", :exitstatus => 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource_without_category, @run_context)
         @provider.should_receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
         lambda { @provider.candidate_version }.should raise_error(Chef::Exceptions::Package)
@@ -269,7 +269,7 @@ Searching...
       License:       GPL-2
 EOF
 
-        @status = mock("Status", :exitstatus => 0)
+        @status = double("Status", :exitstatus => 0)
         @provider = Chef::Provider::Package::Portage.new(@new_resource, @run_context)
         @provider.should_receive(:popen4).and_yield(nil, nil, StringIO.new(output), nil).and_return(@status)
         @provider.candidate_version.should == "1.6.0.6"
@@ -295,7 +295,7 @@ EOF
         @provider.should_receive(:run_command_with_systems_locale).with({
           :command => "emerge -g --color n --nospinner --quiet --oneshot =dev-util/git-1.0.0"
         })
-        @new_resource.stub!(:options).and_return("--oneshot")
+        @new_resource.stub(:options).and_return("--oneshot")
 
         @provider.install_package("dev-util/git", "1.0.0")
       end