chef 11.10.0.rc.0-x86-mingw32 → 11.10.0.rc.1-x86-mingw32

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

@@ -29,26 +29,26 @@ describe Chef::Provider::Package::Rpm do
 
     @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
 
-    @status = mock("Status", :exitstatus => 0)
-    ::File.stub!(:exists?).and_return(true)
+    @status = double("Status", :exitstatus => 0)
+    ::File.stub(:exists?).and_return(true)
   end
 
   describe "when determining the current state of the package" do
 
     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 == "emacs"
     end
 
     it "should set the current reource package name to the new resource 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 == 'emacs'
     end
 
     it "should raise an exception if a source is supplied but not found" do
-      ::File.stub!(:exists?).and_return(false)
+      ::File.stub(:exists?).and_return(false)
       lambda { @provider.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
 
@@ -76,8 +76,8 @@ describe Chef::Provider::Package::Rpm do
     end
 
     it "should raise an exception if rpm 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.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
   end

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

@@ -89,7 +89,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
   it "finds a matching gem candidate version" do
     dep = Gem::Dependency.new('rspec', '>= 0')
     dep_installer = Gem::DependencyInstaller.new
-    @gem_env.stub!(:dependency_installer).and_return(dep_installer)
+    @gem_env.stub(:dependency_installer).and_return(dep_installer)
     latest = [[gemspec("rspec", Gem::Version.new("1.3.0")), "http://rubygems.org/"]]
     dep_installer.should_receive(:find_gems_with_sources).with(dep).and_return(latest)
     @gem_env.candidate_version_from_remote(Gem::Dependency.new('rspec', '>= 0')).should == Gem::Version.new('1.3.0')
@@ -98,9 +98,9 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
   it "finds a matching gem candidate version on rubygems 2.0.0+" do
     dep = Gem::Dependency.new('rspec', '>= 0')
     dep_installer = Gem::DependencyInstaller.new
-    @gem_env.stub!(:dependency_installer).and_return(dep_installer)
-    best_gem = mock("best gem match", :spec => gemspec("rspec", Gem::Version.new("1.3.0")), :source => "https://rubygems.org")
-    available_set = mock("Gem::AvailableSet test double")
+    @gem_env.stub(:dependency_installer).and_return(dep_installer)
+    best_gem = double("best gem match", :spec => gemspec("rspec", Gem::Version.new("1.3.0")), :source => "https://rubygems.org")
+    available_set = double("Gem::AvailableSet test double")
     available_set.should_receive(:pick_best!)
     available_set.should_receive(:set).and_return([best_gem])
     dep_installer.should_receive(:find_gems_with_sources).with(dep).and_return(available_set)
@@ -121,7 +121,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
         Gem.const_set(:Format, Object.new)
         @remove_gem_format = true
       end
-      Gem::Package.stub!(:respond_to?).with(:open).and_return(false)
+      Gem::Package.stub(:respond_to?).with(:open).and_return(false)
     end
 
     after do
@@ -131,7 +131,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
     end
 
     it "finds a matching gem candidate version on rubygems 2.0+ with some rubygems 1.8 code loaded" do
-      package = mock("Gem::Package", :spec => "a gemspec from package")
+      package = double("Gem::Package", :spec => "a gemspec from package")
       Gem::Package.should_receive(:new).with("/path/to/package.gem").and_return(package)
       @gem_env.spec_from_file("/path/to/package.gem").should == "a gemspec from package"
     end
@@ -142,7 +142,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
     dep = Gem::Dependency.new('rspec', '>= 0')
     latest = []
     dep_installer = Gem::DependencyInstaller.new
-    @gem_env.stub!(:dependency_installer).and_return(dep_installer)
+    @gem_env.stub(:dependency_installer).and_return(dep_installer)
     dep_installer.should_receive(:find_gems_with_sources).with(dep).and_return(latest)
     @gem_env.candidate_version_from_remote(Gem::Dependency.new('rspec', '>= 0')).should be_nil
   end
@@ -159,7 +159,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
 
     @gem_env.should_receive(:with_gem_sources).with('http://gems.example.com').and_yield
     dep_installer = Gem::DependencyInstaller.new
-    @gem_env.stub!(:dependency_installer).and_return(dep_installer)
+    @gem_env.stub(:dependency_installer).and_return(dep_installer)
     dep_installer.should_receive(:find_gems_with_sources).with(dep).and_return(latest)
     @gem_env.candidate_version_from_remote(Gem::Dependency.new('rspec', '>=0'), 'http://gems.example.com').should == Gem::Version.new('1.3.0')
   end
@@ -180,14 +180,14 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
   end
 
   it "uninstalls all versions of a gem" do
-    uninstaller = mock('gem uninstaller')
+    uninstaller = double('gem uninstaller')
     uninstaller.should_receive(:uninstall)
     @gem_env.should_receive(:uninstaller).with('rspec', :all => true).and_return(uninstaller)
     @gem_env.uninstall('rspec')
   end
 
   it "uninstalls a specific version of a gem" do
-    uninstaller = mock('gem uninstaller')
+    uninstaller = double('gem uninstaller')
     uninstaller.should_receive(:uninstall)
     @gem_env.should_receive(:uninstaller).with('rspec', :version => '1.2.3').and_return(uninstaller)
     @gem_env.uninstall('rspec', '1.2.3')
@@ -230,7 +230,7 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
   end
 
   it "builds the gems source index from the gem paths" do
-    @gem_env.stub!(:gem_paths).and_return(['/path/to/gems', '/another/path/to/gems'])
+    @gem_env.stub(:gem_paths).and_return(['/path/to/gems', '/another/path/to/gems'])
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
       @gem_env.gem_specification
       Gem::Specification.dirs.should == [ '/path/to/gems/specifications', '/another/path/to/gems/specifications' ]
@@ -244,17 +244,17 @@ describe Chef::Provider::Package::Rubygems::AlternateGemEnvironment do
     gems = [gemspec('rspec', Gem::Version.new('1.2.9')), gemspec('rspec', Gem::Version.new('1.3.0'))]
     rspec_dep = Gem::Dependency.new('rspec', nil)
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
-      @gem_env.stub!(:gem_specification).and_return(Gem::Specification)
+      @gem_env.stub(:gem_specification).and_return(Gem::Specification)
       @gem_env.gem_specification.should_receive(:find_all_by_name).with(rspec_dep.name, rspec_dep.requirement).and_return(gems)
     else
-      @gem_env.stub!(:gem_source_index).and_return(Gem.source_index)
+      @gem_env.stub(:gem_source_index).and_return(Gem.source_index)
       @gem_env.gem_source_index.should_receive(:search).with(rspec_dep).and_return(gems)
     end
     @gem_env.installed_versions(Gem::Dependency.new('rspec', nil)).should == gems
   end
 
   it "determines the installed versions of gems from the source index (part2: the unmockening)" do
-    $stdout.stub!(:write)
+    $stdout.stub(:write)
     path_to_gem = if windows?
       `where gem`.split[1]
     else
@@ -295,7 +295,7 @@ RubyGems Environment:
      - http://rubygems.org/
      - http://gems.github.com/
 JRUBY_GEM_ENV
-    @gem_env.should_receive(:shell_out!).with('/usr/weird/bin/gem env').and_return(mock('jruby_gem_env', :stdout => gem_env_out))
+    @gem_env.should_receive(:shell_out!).with('/usr/weird/bin/gem env').and_return(double('jruby_gem_env', :stdout => gem_env_out))
     expected = ['ruby', Gem::Platform.new('universal-java-1.6')]
     @gem_env.gem_platforms.should == expected
     # it should also cache the result
@@ -337,7 +337,7 @@ RubyGems Environment:
      - http://rubygems.org/
      - http://gems.github.com/
 RBX_GEM_ENV
-    @gem_env.should_receive(:shell_out!).with('/usr/weird/bin/gem env').and_return(mock('rbx_gem_env', :stdout => gem_env_out))
+    @gem_env.should_receive(:shell_out!).with('/usr/weird/bin/gem env').and_return(double('rbx_gem_env', :stdout => gem_env_out))
     @gem_env.gem_platforms.should == Gem.platforms
     Chef::Provider::Package::Rubygems::AlternateGemEnvironment.platform_cache['/usr/weird/bin/gem'].should == Gem.platforms
   end
@@ -367,7 +367,7 @@ describe Chef::Provider::Package::Rubygems do
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
     # We choose detect omnibus via RbConfig::CONFIG['bindir'] in Chef::Provider::Package::Rubygems.new
-    RbConfig::CONFIG.stub!(:[]).with('bindir').and_return("/usr/bin/ruby")
+    RbConfig::CONFIG.stub(:[]).with('bindir').and_return("/usr/bin/ruby")
     @provider = Chef::Provider::Package::Rubygems.new(@new_resource, @run_context)
   end
 
@@ -388,11 +388,11 @@ describe Chef::Provider::Package::Rubygems do
 
   it "searches for a gem binary when running on Omnibus on Unix" do
     platform_mock :unix do
-      RbConfig::CONFIG.stub!(:[]).with('bindir').and_return("/opt/chef/embedded/bin")
-      ENV.stub!(:[]).with('PATH').and_return("/usr/bin:/usr/sbin:/opt/chef/embedded/bin")
-      File.stub!(:exists?).with('/usr/bin/gem').and_return(false)
-      File.stub!(:exists?).with('/usr/sbin/gem').and_return(true)
-      File.stub!(:exists?).with('/opt/chef/embedded/bin/gem').and_return(true) # should not get here
+      RbConfig::CONFIG.stub(:[]).with('bindir').and_return("/opt/chef/embedded/bin")
+      ENV.stub(:[]).with('PATH').and_return("/usr/bin:/usr/sbin:/opt/chef/embedded/bin")
+      File.stub(:exists?).with('/usr/bin/gem').and_return(false)
+      File.stub(:exists?).with('/usr/sbin/gem').and_return(true)
+      File.stub(:exists?).with('/opt/chef/embedded/bin/gem').and_return(true) # should not get here
       provider = Chef::Provider::Package::Rubygems.new(@new_resource, @run_context)
       provider.gem_env.gem_binary_location.should == '/usr/sbin/gem'
     end
@@ -400,13 +400,13 @@ describe Chef::Provider::Package::Rubygems do
 
   it "searches for a gem binary when running on Omnibus on Windows" do
     platform_mock :windows do
-      RbConfig::CONFIG.stub!(:[]).with('bindir').and_return("d:/opscode/chef/embedded/bin")
-      ENV.stub!(:[]).with('PATH').and_return('C:\windows\system32;C:\windows;C:\Ruby186\bin;d:\opscode\chef\embedded\bin')
-      File.stub!(:exists?).with('C:\\windows\\system32\\gem').and_return(false)
-      File.stub!(:exists?).with('C:\\windows\\gem').and_return(false)
-      File.stub!(:exists?).with('C:\\Ruby186\\bin\\gem').and_return(true)
-      File.stub!(:exists?).with('d:\\opscode\\chef\\bin\\gem').and_return(false) # should not get here
-      File.stub!(:exists?).with('d:\\opscode\\chef\\embedded\\bin\\gem').and_return(false) # should not get here
+      RbConfig::CONFIG.stub(:[]).with('bindir').and_return("d:/opscode/chef/embedded/bin")
+      ENV.stub(:[]).with('PATH').and_return('C:\windows\system32;C:\windows;C:\Ruby186\bin;d:\opscode\chef\embedded\bin')
+      File.stub(:exists?).with('C:\\windows\\system32\\gem').and_return(false)
+      File.stub(:exists?).with('C:\\windows\\gem').and_return(false)
+      File.stub(:exists?).with('C:\\Ruby186\\bin\\gem').and_return(true)
+      File.stub(:exists?).with('d:\\opscode\\chef\\bin\\gem').and_return(false) # should not get here
+      File.stub(:exists?).with('d:\\opscode\\chef\\embedded\\bin\\gem').and_return(false) # should not get here
       provider = Chef::Provider::Package::Rubygems.new(@new_resource, @run_context)
       provider.gem_env.gem_binary_location.should == 'C:\Ruby186\bin\gem'
     end
@@ -475,7 +475,7 @@ describe Chef::Provider::Package::Rubygems do
       @current_resource = Chef::Resource::GemPackage.new('rspec-core')
       @provider.current_resource = @current_resource
       @gem_dep = Gem::Dependency.new('rspec-core', @spec_version)
-      @provider.stub!(:load_current_resource)
+      @provider.stub(:load_current_resource)
     end
 
     describe "in the current gem environment" do
@@ -508,7 +508,7 @@ describe Chef::Provider::Package::Rubygems do
 
       # this catches 'gem_package "foo"' when "./foo" is a file in the cwd, and instead of installing './foo' it fetches the remote gem
       it "installs the gem via the gems api, when the package has no file separator characters in it, but a matching file exists in cwd" do
-        ::File.stub!(:exists?).and_return(true)
+        ::File.stub(:exists?).and_return(true)
         @new_resource.package_name('rspec-core')
         @provider.gem_env.should_receive(:install).with(@gem_dep, :sources => nil)
         @provider.action_install.should be_true

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

@@ -29,9 +29,9 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
     @current_resource = Chef::Resource::Package.new("varnish")
 
 
-	  @status = mock("Status", :exitstatus => 0)
+	  @status = double("Status", :exitstatus => 0)
 		@provider = Chef::Provider::Package::SmartOS.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 = "varnish-2.1.5nb2\n"
 		@stderr = StringIO.new
@@ -77,11 +77,11 @@ describe Chef::Provider::Package::SmartOS, "load_current_resource" do
     end
 
     it "should lookup the candidate_version if the variable is not already set" do
-      search = mock()
+      search = double()
       search.should_receive(:each_line).
         and_yield("something-varnish-1.1.1  something varnish like\n").
         and_yield("varnish-2.3.4 actual varnish\n")
-      @shell_out = mock('shell_out!', :stdout => search)
+      @shell_out = double('shell_out!', :stdout => search)
       @provider.should_receive(:shell_out!).with('/opt/local/bin/pkgin se varnish', :env => nil, :returns => [0,1]).and_return(@shell_out)
       @provider.candidate_version.should == "2.3.4"
     end

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

@@ -27,7 +27,7 @@ describe Chef::Provider::Package::Solaris do
     @new_resource.source("/tmp/bash.pkg")
 
     @provider = Chef::Provider::Package::Solaris.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
@@ -46,24 +46,24 @@ INSTDATE:  Nov 04 2009 01:02
 HOTLINE:  Please contact your local service provider
 PKGINFO
 
-      @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 == "SUNWbash"
     end
 
     it "should set the current reource package name to the new resource 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 == "SUNWbash"
     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)
@@ -93,13 +93,13 @@ PKGINFO
     it "should raise an exception if the source is not set but we are installing" do
       @new_resource = Chef::Resource::Package.new("SUNWbash")
       @provider = Chef::Provider::Package::Solaris.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 pkginfo 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
 
@@ -120,15 +120,15 @@ PKGINFO
     end
 
     it "should lookup the candidate_version if the variable is not already set" do
-      @status = mock("Status", :exitstatus => 0)
-      @provider.stub!(:popen4).and_return(@status)
+      @status = double("Status", :exitstatus => 0)
+      @provider.stub(:popen4).and_return(@status)
       @provider.should_receive(:popen4)
       @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
 
@@ -153,7 +153,7 @@ PKGINFO
     end
 
     it "should run pkgadd -n -a /tmp/myadmin -d with the package options -a /tmp/myadmin" do
-      @new_resource.stub!(:options).and_return("-a /tmp/myadmin")
+      @new_resource.stub(:options).and_return("-a /tmp/myadmin")
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "pkgadd -n -a /tmp/myadmin -d /tmp/bash.pkg all"
       })
@@ -170,7 +170,7 @@ PKGINFO
     end
 
     it "should run pkgrm -n -a /tmp/myadmin with options -a /tmp/myadmin" do
-      @new_resource.stub!(:options).and_return("-a /tmp/myadmin")
+      @new_resource.stub(:options).and_return("-a /tmp/myadmin")
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "pkgrm -n -a /tmp/myadmin SUNWbash"
       })

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

@@ -24,8 +24,8 @@ describe Chef::Provider::Package::Yum do
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Package.new('cups')
-    @status = mock("Status", :exitstatus => 0)
-    @yum_cache = mock(
+    @status = double("Status", :exitstatus => 0)
+    @yum_cache = double(
       'Chef::Provider::Yum::YumCache',
       :reload_installed => true,
       :reset => true,
@@ -37,9 +37,9 @@ describe Chef::Provider::Package::Yum do
       :package_repository => "base",
       :disable_extra_repo_control => true
     )
-    Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+    Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
-    @pid = mock("PID")
+    @pid = double("PID")
   end
 
   describe "when loading the current system state" do
@@ -54,7 +54,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should set the installed version to nil on the current resource if no installed package" do
-      @yum_cache.stub!(:installed_version).and_return(nil)
+      @yum_cache.stub(:installed_version).and_return(nil)
       @provider.load_current_resource
       @provider.current_resource.version.should be_nil
     end
@@ -76,14 +76,14 @@ describe Chef::Provider::Package::Yum do
     describe "when arch in package_name" do
       it "should set the arch if no existing package_name is found and new_package_name+new_arch is available" do
         @new_resource = Chef::Resource::YumPackage.new('testing.noarch')
-        @yum_cache = mock(
+        @yum_cache = double(
           'Chef::Provider::Yum::YumCache'
         )
-        @yum_cache.stub!(:installed_version) do |package_name, arch|
+        @yum_cache.stub(:installed_version) do |package_name, arch|
           # nothing installed for package_name/new_package_name
           nil
         end
-        @yum_cache.stub!(:candidate_version) do |package_name, arch|
+        @yum_cache.stub(:candidate_version) do |package_name, arch|
           if package_name == "testing.noarch" || package_name == "testing.more.noarch"
             nil
           # candidate for new_package_name
@@ -91,9 +91,9 @@ describe Chef::Provider::Package::Yum do
             "1.1"
           end
         end
-        @yum_cache.stub!(:package_available?).and_return(true)
-        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
-        Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+        @yum_cache.stub(:package_available?).and_return(true)
+        @yum_cache.stub(:disable_extra_repo_control).and_return(true)
+        Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
         @provider.new_resource.package_name.should == "testing"
@@ -110,10 +110,10 @@ describe Chef::Provider::Package::Yum do
 
       it "should not set the arch when an existing package_name is found" do
         @new_resource = Chef::Resource::YumPackage.new('testing.beta3')
-        @yum_cache = mock(
+        @yum_cache = double(
           'Chef::Provider::Yum::YumCache'
         )
-        @yum_cache.stub!(:installed_version) do |package_name, arch|
+        @yum_cache.stub(:installed_version) do |package_name, arch|
           # installed for package_name
           if package_name == "testing.beta3" || package_name == "testing.beta3.more"
             "1.1"
@@ -121,13 +121,13 @@ describe Chef::Provider::Package::Yum do
             nil
           end
         end
-        @yum_cache.stub!(:candidate_version) do |package_name, arch|
+        @yum_cache.stub(:candidate_version) do |package_name, arch|
           # no candidate for package_name/new_package_name
           nil
         end
-        @yum_cache.stub!(:package_available?).and_return(true)
-        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
-        Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+        @yum_cache.stub(:package_available?).and_return(true)
+        @yum_cache.stub(:disable_extra_repo_control).and_return(true)
+        Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         # annoying side effect of the fun stub'ing above
         @provider.load_current_resource
@@ -145,20 +145,20 @@ describe Chef::Provider::Package::Yum do
 
       it "should not set the arch when no existing package_name or new_package_name+new_arch is found" do
         @new_resource = Chef::Resource::YumPackage.new('testing.beta3')
-        @yum_cache = mock(
+        @yum_cache = double(
           'Chef::Provider::Yum::YumCache'
         )
-        @yum_cache.stub!(:installed_version) do |package_name, arch|
+        @yum_cache.stub(:installed_version) do |package_name, arch|
           # nothing installed for package_name/new_package_name
           nil
         end
-        @yum_cache.stub!(:candidate_version) do |package_name, arch|
+        @yum_cache.stub(:candidate_version) do |package_name, arch|
           # no candidate for package_name/new_package_name
           nil
         end
-        @yum_cache.stub!(:package_available?).and_return(true)
-        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
-        Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+        @yum_cache.stub(:package_available?).and_return(true)
+        @yum_cache.stub(:disable_extra_repo_control).and_return(true)
+        Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
         @provider.new_resource.package_name.should == "testing.beta3"
@@ -176,14 +176,14 @@ describe Chef::Provider::Package::Yum do
       it "should ensure it doesn't clobber an existing arch if passed" do
         @new_resource = Chef::Resource::YumPackage.new('testing.i386')
         @new_resource.arch("x86_64")
-        @yum_cache = mock(
+        @yum_cache = double(
           'Chef::Provider::Yum::YumCache'
         )
-         @yum_cache.stub!(:installed_version) do |package_name, arch|
+         @yum_cache.stub(:installed_version) do |package_name, arch|
            # nothing installed for package_name/new_package_name
          nil
         end
-        @yum_cache.stub!(:candidate_version) do |package_name, arch|
+        @yum_cache.stub(:candidate_version) do |package_name, arch|
           if package_name == "testing.noarch"
             nil
           # candidate for new_package_name
@@ -191,9 +191,9 @@ describe Chef::Provider::Package::Yum do
             "1.1"
           end
         end.and_return("something")
-        @yum_cache.stub!(:package_available?).and_return(true)
-        @yum_cache.stub!(:disable_extra_repo_control).and_return(true)
-        Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+        @yum_cache.stub(:package_available?).and_return(true)
+        @yum_cache.stub(:disable_extra_repo_control).and_return(true)
+        Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
         @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
         @provider.load_current_resource
         @provider.new_resource.package_name.should == "testing.i386"
@@ -202,37 +202,37 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should flush the cache if :before is true" do
-      @new_resource.stub!(:flush_cache).and_return({:after => false, :before => true})
+      @new_resource.stub(:flush_cache).and_return({:after => false, :before => true})
       @yum_cache.should_receive(:reload).once
       @provider.load_current_resource
     end
 
     it "should flush the cache if :before is false" do
-      @new_resource.stub!(:flush_cache).and_return({:after => false, :before => false})
+      @new_resource.stub(:flush_cache).and_return({:after => false, :before => false})
       @yum_cache.should_not_receive(:reload)
       @provider.load_current_resource
     end
 
     it "should detect --enablerepo or --disablerepo when passed among options, collect them preserving order and notify the yum cache" do
-      @new_resource.stub!(:options).and_return("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c  --enablerepo=bar")
+      @new_resource.stub(:options).and_return("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c  --enablerepo=bar")
       @yum_cache.should_receive(:enable_extra_repo_control).with("--enablerepo=foo --disablerepo=a,b,c --enablerepo=bar")
       @provider.load_current_resource
     end
 
     it "should let the yum cache know extra repos are disabled if --enablerepo or --disablerepo aren't among options" do
-      @new_resource.stub!(:options).and_return("--stuff --otherthings")
+      @new_resource.stub(:options).and_return("--stuff --otherthings")
       @yum_cache.should_receive(:disable_extra_repo_control)
       @provider.load_current_resource
     end
 
     it "should let the yum cache know extra repos are disabled if options aren't set" do
-      @new_resource.stub!(:options).and_return(nil)
+      @new_resource.stub(:options).and_return(nil)
       @yum_cache.should_receive(:disable_extra_repo_control)
       @provider.load_current_resource
     end
 
     it "should search provides if package name can't be found then set package_name to match" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -242,7 +242,7 @@ describe Chef::Provider::Package::Yum do
         :version_available? => true,
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       pkg = Chef::Provider::Package::Yum::RPMPackage.new("test-package", "1.2.4-11.18.el5", "x86_64", [])
       @yum_cache.should_receive(:packages_from_require).and_return([pkg])
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -251,7 +251,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should search provides if package name can't be found, warn about multiple matches, but use the first one" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -261,7 +261,7 @@ describe Chef::Provider::Package::Yum do
         :version_available? => true,
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       pkg_x = Chef::Provider::Package::Yum::RPMPackage.new("test-package-x", "1.2.4-11.18.el5", "x86_64", [])
       pkg_y = Chef::Provider::Package::Yum::RPMPackage.new("test-package-y", "1.2.6-11.3.el5", "i386", [])
       @yum_cache.should_receive(:packages_from_require).and_return([pkg_x, pkg_y])
@@ -272,7 +272,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should search provides if no package is available - if no match in installed provides then load the complete set" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -282,7 +282,7 @@ describe Chef::Provider::Package::Yum do
         :version_available? => true,
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @yum_cache.should_receive(:packages_from_require).twice.and_return([])
       @yum_cache.should_receive(:reload_provides)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
@@ -290,7 +290,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should search provides if no package is available and not load the complete set if action is :remove or :purge" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -300,7 +300,7 @@ describe Chef::Provider::Package::Yum do
         :version_available? => true,
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @yum_cache.should_receive(:packages_from_require).once.and_return([])
       @yum_cache.should_not_receive(:reload_provides)
@@ -313,7 +313,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should search provides if no package is available - if no match in provides leave the name intact" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_provides => true,
         :reload_installed => true,
@@ -324,7 +324,7 @@ describe Chef::Provider::Package::Yum do
         :version_available? => true,
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @yum_cache.should_receive(:packages_from_require).twice.and_return([])
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @provider.load_current_resource
@@ -335,7 +335,7 @@ describe Chef::Provider::Package::Yum do
   describe "when installing a package" do
     it "should run yum install with the package name and version" do
       @provider.load_current_resource
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y install emacs-1.0"
       )
@@ -343,7 +343,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum localinstall if given a path to an rpm" do
-      @new_resource.stub!(:source).and_return("/tmp/emacs-21.4-20.el5.i386.rpm")
+      @new_resource.stub(:source).and_return("/tmp/emacs-21.4-20.el5.i386.rpm")
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y localinstall /tmp/emacs-21.4-20.el5.i386.rpm"
       )
@@ -352,7 +352,7 @@ describe Chef::Provider::Package::Yum do
 
     it "should run yum localinstall if given a path to an rpm as the package" do
       @new_resource = Chef::Resource::Package.new("/tmp/emacs-21.4-20.el5.i386.rpm")
-      ::File.stub!(:exists?).and_return(true)
+      ::File.stub(:exists?).and_return(true)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @new_resource.source.should == "/tmp/emacs-21.4-20.el5.i386.rpm"
       @provider.should_receive(:yum_command).with(
@@ -363,8 +363,8 @@ describe Chef::Provider::Package::Yum do
 
     it "should run yum install with the package name, version and arch" do
       @provider.load_current_resource
-      @new_resource.stub!(:arch).and_return("i386")
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      @new_resource.stub(:arch).and_return("i386")
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y install emacs-21.4-20.el5.i386"
       )
@@ -374,8 +374,8 @@ describe Chef::Provider::Package::Yum do
     it "installs the package with the options given in the resource" do
       @provider.load_current_resource
       @provider.candidate_version = '11'
-      @new_resource.stub!(:options).and_return("--disablerepo epmd")
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      @new_resource.stub(:options).and_return("--disablerepo epmd")
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y --disablerepo epmd install cups-11"
       )
@@ -383,7 +383,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should raise an exception if the package is not available" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_from_cache => true,
         :reset => true,
@@ -393,14 +393,14 @@ describe Chef::Provider::Package::Yum do
         :version_available? => nil,
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       lambda { @provider.install_package("lolcats", "0.99") }.should raise_error(Chef::Exceptions::Package, %r{Version .* not found})
     end
 
     it "should raise an exception if candidate version is older than the installed version and allow_downgrade is false" do
-      @new_resource.stub!(:allow_downgrade).and_return(false)
-      @yum_cache = mock(
+      @new_resource.stub(:allow_downgrade).and_return(false)
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -411,14 +411,14 @@ describe Chef::Provider::Package::Yum do
         :allow_multi_install => [ "kernel" ],
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @provider.load_current_resource
       lambda { @provider.install_package("cups", "1.2.4-11.15.el5") }.should raise_error(Chef::Exceptions::Package, %r{is newer than candidate package})
     end
 
     it "should not raise an exception if candidate version is older than the installed version and the package is list in yum's installonlypkg option" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -430,7 +430,7 @@ describe Chef::Provider::Package::Yum do
         :package_repository => "base",
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @provider.load_current_resource
       @provider.should_receive(:yum_command).with(
@@ -440,8 +440,8 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum downgrade if candidate version is older than the installed version and allow_downgrade is true" do
-      @new_resource.stub!(:allow_downgrade).and_return(true)
-      @yum_cache = mock(
+      @new_resource.stub(:allow_downgrade).and_return(true)
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -453,7 +453,7 @@ describe Chef::Provider::Package::Yum do
         :package_repository => "base",
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @provider.load_current_resource
       @provider.should_receive(:yum_command).with(
@@ -463,9 +463,9 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum install then flush the cache if :after is true" do
-      @new_resource.stub!(:flush_cache).and_return({:after => true, :before => false})
+      @new_resource.stub(:flush_cache).and_return({:after => true, :before => false})
       @provider.load_current_resource
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y install emacs-1.0"
       )
@@ -474,9 +474,9 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum install then not flush the cache if :after is false" do
-      @new_resource.stub!(:flush_cache).and_return({:after => false, :before => false})
+      @new_resource.stub(:flush_cache).and_return({:after => false, :before => false})
       @provider.load_current_resource
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y install emacs-1.0"
       )
@@ -489,7 +489,7 @@ describe Chef::Provider::Package::Yum do
     it "should run yum install if the package is installed and a version is given" do
       @provider.load_current_resource
       @provider.candidate_version = '11'
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y install cups-11"
       )
@@ -500,7 +500,7 @@ describe Chef::Provider::Package::Yum do
       @provider.load_current_resource
       @current_resource = Chef::Resource::Package.new('cups')
       @provider.candidate_version = '11'
-      Chef::Provider::Package::Yum::RPMUtils.stub!(:rpmvercmp).and_return(-1)
+      Chef::Provider::Package::Yum::RPMUtils.stub(:rpmvercmp).and_return(-1)
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y install cups-11"
       )
@@ -508,7 +508,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should raise an exception if candidate version is older than the installed version" do
-      @yum_cache = mock(
+      @yum_cache = double(
         'Chef::Provider::Yum::YumCache',
         :reload_installed => true,
         :reset => true,
@@ -519,7 +519,7 @@ describe Chef::Provider::Package::Yum do
         :allow_multi_install => [ "kernel" ],
         :disable_extra_repo_control => true
       )
-      Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+      Chef::Provider::Package::Yum::YumCache.stub(:instance).and_return(@yum_cache)
       @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
       @provider.load_current_resource
       lambda { @provider.upgrade_package("cups", "1.2.4-11.15.el5") }.should raise_error(Chef::Exceptions::Package, %r{is newer than candidate package})
@@ -527,7 +527,7 @@ describe Chef::Provider::Package::Yum do
 
     # Test our little workaround, some crossover into Chef::Provider::Package territory
     it "should call action_upgrade in the parent if the current resource version is nil" do
-      @yum_cache.stub!(:installed_version).and_return(nil)
+      @yum_cache.stub(:installed_version).and_return(nil)
       @provider.load_current_resource
       @current_resource = Chef::Resource::Package.new('cups')
       @provider.candidate_version = '11'
@@ -558,7 +558,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should not call action_upgrade in the parent if the candidate is older" do
-      @yum_cache.stub!(:installed_version).and_return("12")
+      @yum_cache.stub(:installed_version).and_return("12")
       @provider.load_current_resource
       @current_resource = Chef::Resource::Package.new('cups')
       @provider.candidate_version = '11'
@@ -576,7 +576,7 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum remove with the package name and arch" do
-      @new_resource.stub!(:arch).and_return("x86_64")
+      @new_resource.stub(:arch).and_return("x86_64")
       @provider.should_receive(:yum_command).with(
         "yum -d0 -e0 -y remove emacs-1.0.x86_64"
       )
@@ -595,8 +595,8 @@ describe Chef::Provider::Package::Yum do
 
   describe "when running yum" do
     it "should run yum once if it exits with a return code of 0" do
-      @status = mock("Status", :exitstatus => 0)
-      @provider.stub!(:output_of_command).and_return([@status, "", ""])
+      @status = double("Status", :exitstatus => 0)
+      @provider.stub(:output_of_command).and_return([@status, "", ""])
       @provider.should_receive(:output_of_command).once.with(
         "yum -d0 -e0 -y install emacs-1.0",
         {:timeout => Chef::Config[:yum_timeout]}
@@ -605,8 +605,8 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum once if it exits with a return code > 0 and no scriptlet failures" do
-      @status = mock("Status", :exitstatus => 2)
-      @provider.stub!(:output_of_command).and_return([@status, "failure failure", "problem problem"])
+      @status = double("Status", :exitstatus => 2)
+      @provider.stub(:output_of_command).and_return([@status, "failure failure", "problem problem"])
       @provider.should_receive(:output_of_command).once.with(
         "yum -d0 -e0 -y install emacs-1.0",
         {:timeout => Chef::Config[:yum_timeout]}
@@ -615,8 +615,8 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum once if it exits with a return code of 1 and %pre scriptlet failures" do
-      @status = mock("Status", :exitstatus => 1)
-      @provider.stub!(:output_of_command).and_return([@status, "error: %pre(demo-1-1.el5.centos.x86_64) scriptlet failed, exit status 2", ""])
+      @status = double("Status", :exitstatus => 1)
+      @provider.stub(:output_of_command).and_return([@status, "error: %pre(demo-1-1.el5.centos.x86_64) scriptlet failed, exit status 2", ""])
       @provider.should_receive(:output_of_command).once.with(
         "yum -d0 -e0 -y install emacs-1.0",
         {:timeout => Chef::Config[:yum_timeout]}
@@ -626,8 +626,8 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should run yum twice if it exits with a return code of 1 and %post scriptlet failures" do
-      @status = mock("Status", :exitstatus => 1)
-      @provider.stub!(:output_of_command).and_return([@status, "error: %post(demo-1-1.el5.centos.x86_64) scriptlet failed, exit status 2", ""])
+      @status = double("Status", :exitstatus => 1)
+      @provider.stub(:output_of_command).and_return([@status, "error: %post(demo-1-1.el5.centos.x86_64) scriptlet failed, exit status 2", ""])
       @provider.should_receive(:output_of_command).twice.with(
         "yum -d0 -e0 -y install emacs-1.0",
         {:timeout => Chef::Config[:yum_timeout]}
@@ -1543,8 +1543,8 @@ describe Chef::Provider::Package::Yum::YumCache do
   end
 
   before(:each) do
-    @stdin = mock("STDIN", :nil_object => true)
-    @stdout = mock("STDOUT", :nil_object => true)
+    @stdin = double("STDIN", :nil_object => true)
+    @stdout = double("STDOUT", :nil_object => true)
 
     @stdout_good = <<EOF
 [option installonlypkgs] kernel kernel-bigmem kernel-enterprise
@@ -1586,13 +1586,13 @@ yum-dump Config Error: File contains no section headers.
 file: file://///etc/yum.repos.d/CentOS-Base.repo, line: 12
 'qeqwewe\n'
 EOF
-    @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_good, :stderr => @stderr)
+    @status = double("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_good, :stderr => @stderr)
 
     # new singleton each time
     Chef::Provider::Package::Yum::YumCache.reset_instance
     @yc = Chef::Provider::Package::Yum::YumCache.instance
     # load valid data
-    @yc.stub!(:shell_out!).and_return(@status)
+    @yc.stub(:shell_out!).and_return(@status)
   end
 
   describe "initialize" do
@@ -1642,29 +1642,29 @@ EOF
     end
 
     it "should warn about invalid data with too many separators" do
-      @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_bad_separators, :stderr => @stderr)
-      @yc.stub!(:shell_out!).and_return(@status)
+      @status = double("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_bad_separators, :stderr => @stderr)
+      @yc.stub(:shell_out!).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(3).times.with(%r{Problem parsing})
       @yc.refresh
     end
 
     it "should warn about invalid data with an incorrect type" do
-      @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_bad_type, :stderr => @stderr)
-      @yc.stub!(:shell_out!).and_return(@status)
+      @status = double("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_bad_type, :stderr => @stderr)
+      @yc.stub(:shell_out!).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(2).times.with(%r{Problem parsing})
       @yc.refresh
     end
 
     it "should warn about no output from yum-dump.py" do
-      @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_no_output, :stderr => @stderr)
-      @yc.stub!(:shell_out!).and_return(@status)
+      @status = double("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_no_output, :stderr => @stderr)
+      @yc.stub(:shell_out!).and_return(@status)
       Chef::Log.should_receive(:warn).exactly(1).times.with(%r{no output from yum-dump.py})
       @yc.refresh
     end
 
     it "should raise exception yum-dump.py exits with a non zero status" do
-      @status = mock("Status", :exitstatus => 1, :stdin => @stdin, :stdout => @stdout_no_output, :stderr => @stderr)
-      @yc.stub!(:shell_out!).and_return(@status)
+      @status = double("Status", :exitstatus => 1, :stdin => @stdin, :stdout => @stdout_no_output, :stderr => @stderr)
+      @yc.stub(:shell_out!).and_return(@status)
       lambda { @yc.refresh}.should raise_error(Chef::Exceptions::Package, %r{CentOS-Base.repo, line: 12})
     end
 
@@ -1690,8 +1690,8 @@ EOF
 
   describe "installed_version" do
     it "should take one or two arguments" do
-      lambda { @yc.installed_version("zip") }.should_not raise_error(ArgumentError)
-      lambda { @yc.installed_version("zip", "i386") }.should_not raise_error(ArgumentError)
+      lambda { @yc.installed_version("zip") }.should_not raise_error
+      lambda { @yc.installed_version("zip", "i386") }.should_not raise_error
       lambda { @yc.installed_version("zip", "i386", "extra") }.should raise_error(ArgumentError)
     end
 
@@ -1714,8 +1714,8 @@ EOF
 
   describe "available_version" do
     it "should take one or two arguments" do
-      lambda { @yc.available_version("zisofs-tools") }.should_not raise_error(ArgumentError)
-      lambda { @yc.available_version("zisofs-tools", "i386") }.should_not raise_error(ArgumentError)
+      lambda { @yc.available_version("zisofs-tools") }.should_not raise_error
+      lambda { @yc.available_version("zisofs-tools", "i386") }.should_not raise_error
       lambda { @yc.available_version("zisofs-tools", "i386", "extra") }.should raise_error(ArgumentError)
     end
 
@@ -1739,8 +1739,8 @@ EOF
   describe "version_available?" do
     it "should take two or three arguments" do
       lambda { @yc.version_available?("zisofs-tools") }.should raise_error(ArgumentError)
-      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error(ArgumentError)
-      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error(ArgumentError)
+      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error
+      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error
     end
 
     it "should return true if our package-version-arch is available" do
@@ -1768,8 +1768,8 @@ EOF
   describe "package_repository" do
     it "should take two or three arguments" do
       lambda { @yc.package_repository("zisofs-tools") }.should raise_error(ArgumentError)
-      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error(ArgumentError)
-      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error(ArgumentError)
+      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error
+      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error
     end
 
     it "should return repoid for package-version-arch" do