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

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

@@ -27,15 +27,15 @@ describe Chef::Provider::Package::Zypper do
 
     @current_resource = Chef::Resource::Package.new("cups")
 
-    @status = mock("Status", :exitstatus => 0)
+    @status = double("Status", :exitstatus => 0)
 
     @provider = Chef::Provider::Package::Zypper.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)
     @stderr = StringIO.new
     @stdout = StringIO.new
-    @pid = mock("PID")
-    @provider.stub!(:`).and_return("2.0")
+    @pid = double("PID")
+    @provider.stub(:`).and_return("2.0")
   end
 
   describe "when loading the current package state" do
@@ -55,14 +55,14 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should set the installed version to nil on the current resource if zypper info installed version is (none)" 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
 
     it "should set the installed version if zypper info has one" do
       @stdout = StringIO.new("Version: 1.0\nInstalled: Yes\n")
-      @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("1.0").and_return(true)
       @provider.load_current_resource
     end
@@ -70,7 +70,7 @@ describe Chef::Provider::Package::Zypper do
     it "should set the candidate version if zypper info has one" do
       @stdout = StringIO.new("Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)")
 
-      @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.0")
     end
@@ -82,7 +82,7 @@ describe Chef::Provider::Package::Zypper do
 
     it "should not raise an exception if zypper info 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 return the current resouce" do
@@ -191,7 +191,7 @@ describe Chef::Provider::Package::Zypper do
 
   describe "on an older zypper" do
     before(:each) do
-      @provider.stub!(:`).and_return("0.11.6")
+      @provider.stub(:`).and_return("0.11.6")
     end
 
     describe "install_package" do

data/spec/unit/provider/package_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Provider::Package do
   describe "when installing a package" do
     before(:each) do
       @provider.current_resource = @current_resource
-      @provider.stub!(:install_package).and_return(true)
+      @provider.stub(:install_package).and_return(true)
     end
 
     it "should raise a Chef::Exceptions::Package if no version is specified, and no candidate is available" do
@@ -81,7 +81,7 @@ describe Chef::Provider::Package do
 
     it "should install the package at the version specified if a different version is installed" do
       @new_resource.version("1.0")
-      @current_resource.stub!(:version).and_return("0.99")
+      @current_resource.stub(:version).and_return("0.99")
       @provider.should_receive(:install_package).with(
         @new_resource.name,
         @new_resource.version
@@ -107,7 +107,7 @@ describe Chef::Provider::Package do
 
     it "should call the candidate_version accessor only once if the package is already installed and no version is specified" do
       @current_resource.version("1.0")
-      @provider.stub!(:candidate_version).and_return("1.0")
+      @provider.stub(:candidate_version).and_return("1.0")
       @provider.run_action(:install)
     end
 
@@ -126,7 +126,7 @@ describe Chef::Provider::Package do
 
   describe "when upgrading the package" do
     before(:each) do
-      @provider.stub!(:upgrade_package).and_return(true)
+      @provider.stub(:upgrade_package).and_return(true)
     end
 
     it "should upgrade the package if the current version is not the candidate version" do
@@ -151,14 +151,14 @@ describe Chef::Provider::Package do
     end
 
     it "should print the word 'uninstalled' if there was no original version" do
-      @current_resource.stub!(:version).and_return(nil)
+      @current_resource.stub(:version).and_return(nil)
       Chef::Log.should_receive(:info).with("package[emacs] upgraded from uninstalled to 1.0")
       @provider.run_action(:upgrade)
       @new_resource.should be_updated_by_last_action
     end
 
     it "should raise a Chef::Exceptions::Package if current version and candidate are nil" do
-      @current_resource.stub!(:version).and_return(nil)
+      @current_resource.stub(:version).and_return(nil)
       @provider.candidate_version = nil
       lambda { @provider.run_action(:upgrade) }.should raise_error(Chef::Exceptions::Package)
     end
@@ -174,7 +174,7 @@ describe Chef::Provider::Package do
 
   describe "When removing the package" do
     before(:each) do
-      @provider.stub!(:remove_package).and_return(true)
+      @provider.stub(:remove_package).and_return(true)
       @current_resource.version '1.4.2'
     end
 
@@ -204,7 +204,7 @@ describe Chef::Provider::Package do
 
     it "should not remove the package if it is not installed" do
       @provider.should_not_receive(:remove_package)
-      @current_resource.stub!(:version).and_return(nil)
+      @current_resource.stub(:version).and_return(nil)
       @provider.run_action(:remove)
       @new_resource.should_not be_updated_by_last_action
     end
@@ -218,7 +218,7 @@ describe Chef::Provider::Package do
 
   describe "When purging the package" do
     before(:each) do
-      @provider.stub!(:purge_package).and_return(true)
+      @provider.stub(:purge_package).and_return(true)
       @current_resource.version '1.4.2'
     end
 
@@ -264,15 +264,15 @@ describe Chef::Provider::Package do
 
   describe "when reconfiguring the package" do
     before(:each) do
-      @provider.stub!(:reconfig_package).and_return(true)
+      @provider.stub(:reconfig_package).and_return(true)
     end
 
     it "should info log, reconfigure the package and update the resource" do
-      @current_resource.stub!(:version).and_return('1.0')
-      @new_resource.stub!(:response_file).and_return(true)
+      @current_resource.stub(:version).and_return('1.0')
+      @new_resource.stub(:response_file).and_return(true)
       @provider.should_receive(:get_preseed_file).and_return('/var/cache/preseed-test')
-      @provider.stub!(:preseed_package).and_return(true)
-      @provider.stub!(:reconfig_package).and_return(true)
+      @provider.stub(:preseed_package).and_return(true)
+      @provider.stub(:reconfig_package).and_return(true)
       Chef::Log.should_receive(:info).with("package[emacs] reconfigured")
       @provider.should_receive(:reconfig_package)
       @provider.run_action(:reconfig)
@@ -281,7 +281,7 @@ describe Chef::Provider::Package do
     end
 
     it "should debug log and not reconfigure the package if the package is not installed" do
-      @current_resource.stub!(:version).and_return(nil)
+      @current_resource.stub(:version).and_return(nil)
       Chef::Log.should_receive(:debug).with("package[emacs] is NOT installed - nothing to do")
       @provider.should_not_receive(:reconfig_package)
       @provider.run_action(:reconfig)
@@ -289,8 +289,8 @@ describe Chef::Provider::Package do
     end
 
     it "should debug log and not reconfigure the package if no response_file is given" do
-      @current_resource.stub!(:version).and_return('1.0')
-      @new_resource.stub!(:response_file).and_return(nil)
+      @current_resource.stub(:version).and_return('1.0')
+      @new_resource.stub(:response_file).and_return(nil)
       Chef::Log.should_receive(:debug).with("package[emacs] no response_file provided - nothing to do")
       @provider.should_not_receive(:reconfig_package)
       @provider.run_action(:reconfig)
@@ -298,10 +298,10 @@ describe Chef::Provider::Package do
     end
 
     it "should debug log and not reconfigure the package if the response_file has not changed" do
-      @current_resource.stub!(:version).and_return('1.0')
-      @new_resource.stub!(:response_file).and_return(true)
+      @current_resource.stub(:version).and_return('1.0')
+      @new_resource.stub(:response_file).and_return(true)
       @provider.should_receive(:get_preseed_file).and_return(false)
-      @provider.stub!(:preseed_package).and_return(false)
+      @provider.stub(:preseed_package).and_return(false)
       Chef::Log.should_receive(:debug).with("package[emacs] preseeding has not changed - nothing to do")
       @provider.should_not_receive(:reconfig_package)
       @provider.run_action(:reconfig)
@@ -362,7 +362,7 @@ describe Chef::Provider::Package do
       end
 
       it "sets the preseed resource's runcontext to its own run context" do
-        Chef::FileCache.stub!(:create_cache_path).and_return("/tmp/preseed/java")
+        Chef::FileCache.stub(:create_cache_path).and_return("/tmp/preseed/java")
         @provider.preseed_resource('java', '6').run_context.should_not be_nil
         @provider.preseed_resource('java', '6').run_context.should equal(@provider.run_context)
       end

data/spec/unit/provider/registry_key_spec.rb

@@ -38,9 +38,9 @@ describe Chef::Provider::RegistryKey do
 
     @provider = Chef::Provider::RegistryKey.new(@new_resource, @run_context)
 
-    @provider.stub!(:running_on_windows!).and_return(true)
+    @provider.stub(:running_on_windows!).and_return(true)
     @double_registry = double(Chef::Win32::Registry)
-    @provider.stub!(:registry).and_return(@double_registry)
+    @provider.stub(:registry).and_return(@double_registry)
   end
 
   describe "when first created" do

data/spec/unit/provider/remote_file/content_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Provider::RemoteFile::Content do
     r
   end
 
-  let(:run_context) { mock("Chef::RunContext") }
+  let(:run_context) { double("Chef::RunContext") }
 
   #
   # subject
@@ -47,8 +47,8 @@ describe Chef::Provider::RemoteFile::Content do
 
   describe "when the checksum of the current_resource matches the checksum set on the resource" do
     before do
-      new_resource.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-      current_resource.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
+      new_resource.stub(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
+      current_resource.stub(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
     end
 
     it "should return nil for the tempfile" do
@@ -62,8 +62,8 @@ describe Chef::Provider::RemoteFile::Content do
 
   describe "when the checksum of the current_resource is a partial match for the checksum set on the resource" do
     before do
-      new_resource.stub!(:checksum).and_return("0fd012fd")
-      current_resource.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
+      new_resource.stub(:checksum).and_return("0fd012fd")
+      current_resource.stub(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
     end
 
     it "should return nil for the tempfile" do
@@ -78,13 +78,13 @@ describe Chef::Provider::RemoteFile::Content do
   shared_examples_for "the resource needs fetching" do
     before do
       # FIXME: test one or the other nil, test both not nil and not equal, abuse the regexp a little
-      @uri = mock("URI")
+      @uri = double("URI")
       URI.should_receive(:parse).with(new_resource.source[0]).and_return(@uri)
     end
 
     describe "when the fetcher returns nil for the tempfile" do
       before do
-        http_fetcher = mock("Chef::Provider::RemoteFile::HTTP", :fetch => nil)
+        http_fetcher = double("Chef::Provider::RemoteFile::HTTP", :fetch => nil)
         Chef::Provider::RemoteFile::Fetcher.should_receive(:for_resource).with(@uri, new_resource, current_resource).and_return(http_fetcher)
       end
 
@@ -96,8 +96,8 @@ describe Chef::Provider::RemoteFile::Content do
     describe "when the fetcher returns a valid tempfile" do
 
       let(:mtime) { Time.now }
-      let(:tempfile) { mock("Tempfile") }
-      let(:http_fetcher) { mock("Chef::Provider::RemoteFile::HTTP", :fetch => tempfile) }
+      let(:tempfile) { double("Tempfile") }
+      let(:http_fetcher) { double("Chef::Provider::RemoteFile::HTTP", :fetch => tempfile) }
 
       before do
         Chef::Provider::RemoteFile::Fetcher.should_receive(:for_resource).with(@uri, new_resource, current_resource).and_return(http_fetcher)
@@ -119,24 +119,24 @@ describe Chef::Provider::RemoteFile::Content do
 
   describe "when the current_resource checksum is nil" do
     before do
-      new_resource.stub!(:checksum).and_return("fd012fd")
-      current_resource.stub!(:checksum).and_return(nil)
+      new_resource.stub(:checksum).and_return("fd012fd")
+      current_resource.stub(:checksum).and_return(nil)
     end
     it_behaves_like "the resource needs fetching"
   end
 
   describe "when the new_resource checksum is nil" do
     before do
-      new_resource.stub!(:checksum).and_return(nil)
-      current_resource.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
+      new_resource.stub(:checksum).and_return(nil)
+      current_resource.stub(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
     end
     it_behaves_like "the resource needs fetching"
   end
 
   describe "when the checksums are a partial match, but not to the leading portion" do
     before do
-      new_resource.stub!(:checksum).and_return("fd012fd")
-      current_resource.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
+      new_resource.stub(:checksum).and_return("fd012fd")
+      current_resource.stub(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
     end
     it_behaves_like "the resource needs fetching"
   end
@@ -144,11 +144,11 @@ describe Chef::Provider::RemoteFile::Content do
 
   describe "when the fetcher throws an exception" do
     before do
-      new_resource.stub!(:checksum).and_return(nil)
-      current_resource.stub!(:checksum).and_return(nil)
-      @uri = mock("URI")
+      new_resource.stub(:checksum).and_return(nil)
+      current_resource.stub(:checksum).and_return(nil)
+      @uri = double("URI")
       URI.should_receive(:parse).with(new_resource.source[0]).and_return(@uri)
-      http_fetcher = mock("Chef::Provider::RemoteFile::HTTP")
+      http_fetcher = double("Chef::Provider::RemoteFile::HTTP")
       http_fetcher.should_receive(:fetch).and_raise(Errno::ECONNREFUSED)
       Chef::Provider::RemoteFile::Fetcher.should_receive(:for_resource).with(@uri, new_resource, current_resource).and_return(http_fetcher)
     end
@@ -162,22 +162,22 @@ describe Chef::Provider::RemoteFile::Content do
 
     let(:source) { [ "http://opscode.com/seattle.txt", "http://opscode.com/nyc.txt" ] }
     before do
-      new_resource.stub!(:checksum).and_return(nil)
-      current_resource.stub!(:checksum).and_return(nil)
-      @uri0 = mock("URI0")
-      @uri1 = mock("URI1")
+      new_resource.stub(:checksum).and_return(nil)
+      current_resource.stub(:checksum).and_return(nil)
+      @uri0 = double("URI0")
+      @uri1 = double("URI1")
       URI.should_receive(:parse).with(new_resource.source[0]).and_return(@uri0)
       URI.should_receive(:parse).with(new_resource.source[1]).and_return(@uri1)
-      @http_fetcher_throws_exception = mock("Chef::Provider::RemoteFile::HTTP")
+      @http_fetcher_throws_exception = double("Chef::Provider::RemoteFile::HTTP")
       @http_fetcher_throws_exception.should_receive(:fetch).at_least(:once).and_raise(Errno::ECONNREFUSED)
       Chef::Provider::RemoteFile::Fetcher.should_receive(:for_resource).with(@uri0, new_resource, current_resource).and_return(@http_fetcher_throws_exception)
     end
 
     describe "when the second url succeeds" do
       before do
-        @tempfile = mock("Tempfile")
+        @tempfile = double("Tempfile")
         mtime = Time.now
-        http_fetcher_works = mock("Chef::Provider::RemoteFile::HTTP", :fetch => @tempfile)
+        http_fetcher_works = double("Chef::Provider::RemoteFile::HTTP", :fetch => @tempfile)
         Chef::Provider::RemoteFile::Fetcher.should_receive(:for_resource).with(@uri1, new_resource, current_resource).and_return(http_fetcher_works)
       end
 
@@ -205,14 +205,14 @@ describe Chef::Provider::RemoteFile::Content do
   describe "when there is an array of sources and the first succeeds" do
     let(:source) { [ "http://opscode.com/seattle.txt", "http://opscode.com/nyc.txt" ] }
     before do
-      new_resource.stub!(:checksum).and_return(nil)
-      current_resource.stub!(:checksum).and_return(nil)
-      @uri0 = mock("URI0")
+      new_resource.stub(:checksum).and_return(nil)
+      current_resource.stub(:checksum).and_return(nil)
+      @uri0 = double("URI0")
       URI.should_receive(:parse).with(new_resource.source[0]).and_return(@uri0)
       URI.should_not_receive(:parse).with(new_resource.source[1])
-      @tempfile = mock("Tempfile")
+      @tempfile = double("Tempfile")
       mtime = Time.now
-      http_fetcher_works = mock("Chef::Provider::RemoteFile::HTTP", :fetch => @tempfile)
+      http_fetcher_works = double("Chef::Provider::RemoteFile::HTTP", :fetch => @tempfile)
       Chef::Provider::RemoteFile::Fetcher.should_receive(:for_resource).with(@uri0, new_resource, current_resource).and_return(http_fetcher_works)
     end
 

data/spec/unit/provider/remote_file/fetcher_spec.rb

@@ -20,12 +20,12 @@ require 'spec_helper'
 
 describe Chef::Provider::RemoteFile::Fetcher do
 
-  let(:current_resource) { mock("current resource") }
-  let(:new_resource) { mock("new resource") }
-  let(:fetcher_instance) { mock("fetcher") }
+  let(:current_resource) { double("current resource") }
+  let(:new_resource) { double("new resource") }
+  let(:fetcher_instance) { double("fetcher") }
 
   describe "when passed an http url" do
-    let(:uri) { mock("uri", :scheme => "http" ) }
+    let(:uri) { double("uri", :scheme => "http" ) }
     before do
       Chef::Provider::RemoteFile::HTTP.should_receive(:new).and_return(fetcher_instance)
     end
@@ -35,7 +35,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed an https url" do
-    let(:uri) { mock("uri", :scheme => "https" ) }
+    let(:uri) { double("uri", :scheme => "https" ) }
     before do
       Chef::Provider::RemoteFile::HTTP.should_receive(:new).and_return(fetcher_instance)
     end
@@ -45,7 +45,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed an ftp url" do
-    let(:uri) { mock("uri", :scheme => "ftp" ) }
+    let(:uri) { double("uri", :scheme => "ftp" ) }
     before do
       Chef::Provider::RemoteFile::FTP.should_receive(:new).and_return(fetcher_instance)
     end
@@ -55,7 +55,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed a file url" do
-    let(:uri) { mock("uri", :scheme => "file" ) }
+    let(:uri) { double("uri", :scheme => "file" ) }
     before do
       Chef::Provider::RemoteFile::LocalFile.should_receive(:new).and_return(fetcher_instance)
     end
@@ -65,7 +65,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed a url we do not recognize" do
-    let(:uri) { mock("uri", :scheme => "xyzzy" ) }
+    let(:uri) { double("uri", :scheme => "xyzzy" ) }
     it "throws an ArgumentError exception" do
       lambda { described_class.for_resource(uri, new_resource, current_resource) }.should raise_error(ArgumentError)
     end

data/spec/unit/provider/remote_file/ftp_spec.rb

@@ -38,14 +38,14 @@ describe Chef::Provider::RemoteFile::FTP do
   end
 
   let(:ftp) do
-    ftp = mock(Net::FTP, { })
-    ftp.stub!(:connect)
-    ftp.stub!(:login)
-    ftp.stub!(:voidcmd)
-    ftp.stub!(:mtime).and_return(Time.now)
-    ftp.stub!(:getbinaryfile)
-    ftp.stub!(:close)
-    ftp.stub!(:passive=)
+    ftp = double(Net::FTP, { })
+    ftp.stub(:connect)
+    ftp.stub(:login)
+    ftp.stub(:voidcmd)
+    ftp.stub(:mtime).and_return(Time.now)
+    ftp.stub(:getbinaryfile)
+    ftp.stub(:close)
+    ftp.stub(:passive=)
     ftp
   end
 
@@ -60,8 +60,8 @@ describe Chef::Provider::RemoteFile::FTP do
   let(:uri) { URI.parse("ftp://opscode.com/seattle.txt") }
 
   before(:each) do
-    Net::FTP.stub!(:new).with().and_return(ftp)
-    Tempfile.stub!(:new).and_return(tempfile)
+    Net::FTP.stub(:new).with().and_return(ftp)
+    Tempfile.stub(:new).and_return(tempfile)
   end
 
   describe "when first created" do