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

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

@@ -159,14 +159,14 @@ describe Chef::Provider::RemoteFile::HTTP do
 
     let(:tempfile_path) { "/tmp/chef-mock-tempfile-abc123" }
 
-    let(:tempfile) { mock(Tempfile, :path => tempfile_path, :close => nil) }
+    let(:tempfile) { double(Tempfile, :path => tempfile_path, :close => nil) }
 
     let(:last_response) { {} }
 
     let(:rest) do
-      rest = mock(Chef::HTTP::Simple)
-      rest.stub!(:streaming_request).and_return(tempfile)
-      rest.stub!(:last_response).and_return(last_response)
+      rest = double(Chef::HTTP::Simple)
+      rest.stub(:streaming_request).and_return(tempfile)
+      rest.stub(:last_response).and_return(last_response)
       rest
     end
 

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

@@ -40,8 +40,8 @@ describe Chef::Provider::RemoteFile::LocalFile do
 
   describe "when fetching the object" do
 
-    let(:tempfile) { mock("Tempfile", :path => "/tmp/foo/bar/nyan.png", :close => nil) }
-    let(:chef_tempfile) { mock("Chef::FileContentManagement::Tempfile", :tempfile => tempfile) }
+    let(:tempfile) { double("Tempfile", :path => "/tmp/foo/bar/nyan.png", :close => nil) }
+    let(:chef_tempfile) { double("Chef::FileContentManagement::Tempfile", :tempfile => tempfile) }
 
     before do
       current_resource.source("file:///nyan_cat.png")

data/spec/unit/provider/remote_file_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Provider::RemoteFile do
   end
 
   let(:content) do
-    content = mock('Chef::Provider::File::Content::RemoteFile')
+    content = double('Chef::Provider::File::Content::RemoteFile')
   end
 
   let(:node) { double('Chef::Node') }

data/spec/unit/provider/route_spec.rb

@@ -55,13 +55,13 @@ describe Chef::Provider::Route do
         routing_table = "Iface	Destination	Gateway 	Flags	RefCnt	Use	Metric	Mask		MTU	Window	IRTT\n" +
                         "eth0	0064A8C0	0984A8C0	0003	0	0	0	00FFFFFF	0	0	0\n"
         route_file = StringIO.new(routing_table)
-        File.stub!(:open).with("/proc/net/route", "r").and_return(route_file)
+        File.stub(:open).with("/proc/net/route", "r").and_return(route_file)
       end
 
       it "should set is_running to false when a route is not detected" do
         resource = Chef::Resource::Route.new('10.10.10.0/24')
-        resource.stub!(:gateway).and_return("10.0.0.1")
-        resource.stub!(:device).and_return("eth0")
+        resource.stub(:gateway).and_return("10.0.0.1")
+        resource.stub(:device).and_return("eth0")
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
@@ -70,8 +70,8 @@ describe Chef::Provider::Route do
 
       it "should detect existing routes and set is_running attribute correctly" do
         resource = Chef::Resource::Route.new('192.168.100.0/24')
-        resource.stub!(:gateway).and_return("192.168.132.9")
-        resource.stub!(:device).and_return("eth0")
+        resource.stub(:gateway).and_return("192.168.132.9")
+        resource.stub(:device).and_return("eth0")
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
@@ -80,8 +80,8 @@ describe Chef::Provider::Route do
 
       it "should use gateway value when matching routes" do
         resource = Chef::Resource::Route.new('192.168.100.0/24')
-        resource.stub!(:gateway).and_return("10.10.10.10")
-        resource.stub!(:device).and_return("eth0")
+        resource.stub(:gateway).and_return("10.10.10.10")
+        resource.stub(:device).and_return("eth0")
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
@@ -92,8 +92,8 @@ describe Chef::Provider::Route do
 
   describe Chef::Provider::Route, "action_add" do
     it "should add the route if it does not exist" do
-      @provider.stub!(:run_command).and_return(true)
-      @current_resource.stub!(:gateway).and_return(nil)
+      @provider.stub(:run_command).and_return(true)
+      @current_resource.stub(:gateway).and_return(nil)
       @provider.should_receive(:generate_command).once.with(:add)
       @provider.should_receive(:generate_config)
       @provider.run_action(:add)
@@ -101,8 +101,8 @@ describe Chef::Provider::Route do
     end
 
     it "should not add the route if it exists" do
-      @provider.stub!(:run_command).and_return(true)
-      @provider.stub!(:is_running).and_return(true)
+      @provider.stub(:run_command).and_return(true)
+      @provider.stub(:is_running).and_return(true)
       @provider.should_not_receive(:generate_command).with(:add)
       @provider.should_receive(:generate_config)
       @provider.run_action(:add)
@@ -116,7 +116,7 @@ describe Chef::Provider::Route do
       File.should_receive(:new).and_return(route_file)
       @resource_add = Chef::Resource::Route.new('192.168.1.0/24 via 192.168.0.1')
       @run_context.resource_collection << @resource_add
-      @provider.stub!(:run_command).and_return(true)
+      @provider.stub(:run_command).and_return(true)
 
       @resource_add.action(:add)
       @provider.run_action(:add)
@@ -127,16 +127,16 @@ describe Chef::Provider::Route do
 
   describe Chef::Provider::Route, "action_delete" do
     it "should delete the route if it exists" do
-      @provider.stub!(:run_command).and_return(true)
+      @provider.stub(:run_command).and_return(true)
       @provider.should_receive(:generate_command).once.with(:delete)
-      @provider.stub!(:is_running).and_return(true)
+      @provider.stub(:is_running).and_return(true)
       @provider.run_action(:delete)
       @new_resource.should be_updated
     end
 
     it "should not delete the route if it does not exist" do
-      @current_resource.stub!(:gateway).and_return(nil)
-      @provider.stub!(:run_command).and_return(true)
+      @current_resource.stub(:gateway).and_return(nil)
+      @provider.stub(:run_command).and_return(true)
       @provider.should_not_receive(:generate_command).with(:add)
       @provider.run_action(:delete)
       @new_resource.should_not be_updated
@@ -145,12 +145,12 @@ describe Chef::Provider::Route do
 
   describe Chef::Provider::Route, "generate_command for action_add" do
     it "should include a netmask when a one is specified" do
-      @new_resource.stub!(:netmask).and_return('255.255.0.0')
+      @new_resource.stub(:netmask).and_return('255.255.0.0')
       @provider.generate_command(:add).should match(/\/\d{1,2}\s/)
     end
 
     it "should not include a netmask when a one is specified" do
-      @new_resource.stub!(:netmask).and_return(nil)
+      @new_resource.stub(:netmask).and_return(nil)
       @provider.generate_command(:add).should_not match(/\/\d{1,2}\s/)
     end
 
@@ -159,19 +159,19 @@ describe Chef::Provider::Route do
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
-      @new_resource.stub!(:gateway).and_return(nil)
+      @new_resource.stub(:gateway).and_return(nil)
       @provider.generate_command(:add).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
   end
 
   describe Chef::Provider::Route, "generate_command for action_delete" do
     it "should include a netmask when a one is specified" do
-      @new_resource.stub!(:netmask).and_return('255.255.0.0')
+      @new_resource.stub(:netmask).and_return('255.255.0.0')
       @provider.generate_command(:delete).should match(/\/\d{1,2}\s/)
     end
 
     it "should not include a netmask when a one is specified" do
-      @new_resource.stub!(:netmask).and_return(nil)
+      @new_resource.stub(:netmask).and_return(nil)
       @provider.generate_command(:delete).should_not match(/\/\d{1,2}\s/)
     end
 
@@ -180,14 +180,14 @@ describe Chef::Provider::Route do
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
-      @new_resource.stub!(:gateway).and_return(nil)
+      @new_resource.stub(:gateway).and_return(nil)
       @provider.generate_command(:delete).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
   end
 
   describe Chef::Provider::Route, "config_file_contents for action_add" do
     it "should include a netmask when a one is specified" do
-      @new_resource.stub!(:netmask).and_return('255.255.0.0')
+      @new_resource.stub(:netmask).and_return('255.255.0.0')
       @provider.config_file_contents(:add, { :target => @new_resource.target, :netmask => @new_resource.netmask}).should match(/\/\d{1,2}.*\n$/)
     end
 

data/spec/unit/provider/script_spec.rb

@@ -30,9 +30,9 @@ describe Chef::Provider::Script, "action_run" do
     @provider = Chef::Provider::Script.new(@new_resource, @run_context)
 
     @script_file = StringIO.new
-    @script_file.stub!(:path).and_return('/tmp/the_script_file')
+    @script_file.stub(:path).and_return('/tmp/the_script_file')
 
-    @provider.stub!(:shell_out!).and_return(true)
+    @provider.stub(:shell_out!).and_return(true)
   end
 
   it "creates a temporary file to store the script" do
@@ -48,15 +48,15 @@ describe Chef::Provider::Script, "action_run" do
   it "sets the owner and group for the script file" do
     @new_resource.user 'toor'
     @new_resource.group 'wheel'
-    @provider.stub!(:script_file).and_return(@script_file)
+    @provider.stub(:script_file).and_return(@script_file)
     FileUtils.should_receive(:chown).with('toor', 'wheel', "/tmp/the_script_file")
     @provider.set_owner_and_group
   end
 
   context "with the script file set to the correct owner and group" do
     before do
-      @provider.stub!(:set_owner_and_group)
-      @provider.stub!(:script_file).and_return(@script_file)
+      @provider.stub(:set_owner_and_group)
+      @provider.stub(:script_file).and_return(@script_file)
     end
     describe "when writing the script to the file" do
       it "should put the contents of the script in the temp file" do

data/spec/unit/provider/service/arch_service_spec.rb

@@ -39,8 +39,8 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
 
     @provider = Chef::Provider::Service::Arch.new(@new_resource, @run_context)
 
-    ::File.stub!(:exists?).with("/etc/rc.conf").and_return(true)
-    ::File.stub!(:read).with("/etc/rc.conf").and_return("DAEMONS=(network apache sshd)")
+    ::File.stub(:exists?).with("/etc/rc.conf").and_return(true)
+    ::File.stub(:read).with("/etc/rc.conf").and_return("DAEMONS=(network apache sshd)")
   end
 
   describe "when first created" do
@@ -63,19 +63,19 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
     end
 
     it "should set running to true if the status command returns 0" do
-      @provider.stub!(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
+      @provider.stub(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
       @provider.load_current_resource
       @provider.current_resource.running.should be_true
     end
 
     it "should set running to false if the status command returns anything except 0" do
-      @provider.stub!(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 1))
+      @provider.stub(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 1))
       @provider.load_current_resource
       @provider.current_resource.running.should be_false
     end
 
     it "should set running to false if the status command raises" do
-      @provider.stub!(:shell_out).with("/etc/rc.d/chef status").and_raise(Mixlib::ShellOut::ShellCommandFailed)
+      @provider.stub(:shell_out).with("/etc/rc.d/chef status").and_raise(Mixlib::ShellOut::ShellCommandFailed)
       @provider.load_current_resource
       @provider.current_resource.running.should be_false
     end
@@ -111,12 +111,12 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
 
 
   it "should fail if file /etc/rc.conf does not exist" do
-    ::File.stub!(:exists?).with("/etc/rc.conf").and_return(false)
+    ::File.stub(:exists?).with("/etc/rc.conf").and_return(false)
     lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Service)
   end
 
   it "should fail if file /etc/rc.conf does not contain DAEMONS array" do
-    ::File.stub!(:read).with("/etc/rc.conf").and_return("")
+    ::File.stub(:read).with("/etc/rc.conf").and_return("")
     lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Service)
   end
 
@@ -127,8 +127,8 @@ aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
 aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
 aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
 DEFAULT_PS
-      @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-      @provider.stub!(:shell_out!).and_return(@status)
+      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+      @provider.stub(:shell_out!).and_return(@status)
 
       @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     end
@@ -138,19 +138,19 @@ DEFAULT_PS
 aj        7842  5057  0 21:26 pts/2    00:00:06 chef
 aj        7842  5057  0 21:26 pts/2    00:00:06 poos
 RUNNING_PS
-      @status.stub!(:stdout).and_return(@stdout)
+      @status.stub(:stdout).and_return(@stdout)
       @provider.load_current_resource
       @provider.current_resource.running.should be_true
     end
 
     it "determines the service is not running when it does not appear in ps" do
-      @provider.stub!(:shell_out!).and_return(@status)
+      @provider.stub(:shell_out!).and_return(@status)
       @provider.load_current_resource
       @provider.current_resource.running.should be_false
     end
 
     it "should raise an exception if ps fails" do
-      @provider.stub!(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
+      @provider.stub(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
       @provider.load_current_resource
       @provider.action = :start
       @provider.define_resource_requirements
@@ -159,7 +159,7 @@ RUNNING_PS
   end
 
   it "should return existing entries in DAEMONS array" do
-    ::File.stub!(:read).with("/etc/rc.conf").and_return("DAEMONS=(network !apache ssh)")
+    ::File.stub(:read).with("/etc/rc.conf").and_return("DAEMONS=(network !apache ssh)")
     @provider.daemons.should == ['network', '!apache', 'ssh']
   end
 
@@ -171,20 +171,20 @@ RUNNING_PS
 
     describe Chef::Provider::Service::Arch, "enable_service" do
       # before(:each) do
-      #   @new_resource = mock("Chef::Resource::Service",
+      #   @new_resource = double("Chef::Resource::Service",
       #     :null_object => true,
       #     :name => "chef",
       #     :service_name => "chef",
       #     :running => false
       #   )
-      #   @new_resource.stub!(:start_command).and_return(false)
+      #   @new_resource.stub(:start_command).and_return(false)
       #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
-      #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      #   Chef::Resource::Service.stub(:new).and_return(@current_resource)
       # end
 
       it "should add chef to DAEMONS array" do
-        ::File.stub!(:read).with("/etc/rc.conf").and_return("DAEMONS=(network)")
+        ::File.stub(:read).with("/etc/rc.conf").and_return("DAEMONS=(network)")
         @provider.should_receive(:update_daemons).with(['network', 'chef'])
         @provider.enable_service()
       end
@@ -192,20 +192,20 @@ RUNNING_PS
 
     describe Chef::Provider::Service::Arch, "disable_service" do
       # before(:each) do
-      #   @new_resource = mock("Chef::Resource::Service",
+      #   @new_resource = double("Chef::Resource::Service",
       #     :null_object => true,
       #     :name => "chef",
       #     :service_name => "chef",
       #     :running => false
       #   )
-      #   @new_resource.stub!(:start_command).and_return(false)
+      #   @new_resource.stub(:start_command).and_return(false)
       #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
-      #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      #   Chef::Resource::Service.stub(:new).and_return(@current_resource)
       # end
 
       it "should remove chef from DAEMONS array" do
-        ::File.stub!(:read).with("/etc/rc.conf").and_return("DAEMONS=(network chef)")
+        ::File.stub(:read).with("/etc/rc.conf").and_return("DAEMONS=(network chef)")
         @provider.should_receive(:update_daemons).with(['network', '!chef'])
         @provider.disable_service()
       end
@@ -214,20 +214,20 @@ RUNNING_PS
 
     describe Chef::Provider::Service::Arch, "start_service" do
       # before(:each) do
-      #   @new_resource = mock("Chef::Resource::Service",
+      #   @new_resource = double("Chef::Resource::Service",
       #     :null_object => true,
       #     :name => "chef",
       #     :service_name => "chef",
       #     :running => false
       #   )
-      #   @new_resource.stub!(:start_command).and_return(false)
+      #   @new_resource.stub(:start_command).and_return(false)
       #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
-      #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      #   Chef::Resource::Service.stub(:new).and_return(@current_resource)
       # end
 
       it "should call the start command if one is specified" do
-        @new_resource.stub!(:start_command).and_return("/etc/rc.d/chef startyousillysally")
+        @new_resource.stub(:start_command).and_return("/etc/rc.d/chef startyousillysally")
         @provider.should_receive(:shell_out!).with("/etc/rc.d/chef startyousillysally")
         @provider.start_service()
       end
@@ -240,20 +240,20 @@ RUNNING_PS
 
     describe Chef::Provider::Service::Arch, "stop_service" do
       # before(:each) do
-      #   @new_resource = mock("Chef::Resource::Service",
+      #   @new_resource = double("Chef::Resource::Service",
       #     :null_object => true,
       #     :name => "chef",
       #     :service_name => "chef",
       #     :running => false
       #   )
-      #   @new_resource.stub!(:stop_command).and_return(false)
+      #   @new_resource.stub(:stop_command).and_return(false)
       #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
-      #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      #   Chef::Resource::Service.stub(:new).and_return(@current_resource)
       # end
 
       it "should call the stop command if one is specified" do
-        @new_resource.stub!(:stop_command).and_return("/etc/rc.d/chef itoldyoutostop")
+        @new_resource.stub(:stop_command).and_return("/etc/rc.d/chef itoldyoutostop")
         @provider.should_receive(:shell_out!).with("/etc/rc.d/chef itoldyoutostop")
         @provider.stop_service()
       end
@@ -266,27 +266,27 @@ RUNNING_PS
 
     describe Chef::Provider::Service::Arch, "restart_service" do
       # before(:each) do
-      #   @new_resource = mock("Chef::Resource::Service",
+      #   @new_resource = double("Chef::Resource::Service",
       #     :null_object => true,
       #     :name => "chef",
       #     :service_name => "chef",
       #     :running => false
       #   )
-      #   @new_resource.stub!(:restart_command).and_return(false)
-      #   @new_resource.stub!(:supports).and_return({:restart => false})
+      #   @new_resource.stub(:restart_command).and_return(false)
+      #   @new_resource.stub(:supports).and_return({:restart => false})
       #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
-      #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      #   Chef::Resource::Service.stub(:new).and_return(@current_resource)
       # end
 
       it "should call 'restart' on the service_name if the resource supports it" do
-        @new_resource.stub!(:supports).and_return({:restart => true})
+        @new_resource.stub(:supports).and_return({:restart => true})
         @provider.should_receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} restart")
         @provider.restart_service()
       end
 
       it "should call the restart_command if one has been specified" do
-        @new_resource.stub!(:restart_command).and_return("/etc/rc.d/chef restartinafire")
+        @new_resource.stub(:restart_command).and_return("/etc/rc.d/chef restartinafire")
         @provider.should_receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} restartinafire")
         @provider.restart_service()
       end
@@ -301,27 +301,27 @@ RUNNING_PS
 
     describe Chef::Provider::Service::Arch, "reload_service" do
       # before(:each) do
-      #   @new_resource = mock("Chef::Resource::Service",
+      #   @new_resource = double("Chef::Resource::Service",
       #     :null_object => true,
       #     :name => "chef",
       #     :service_name => "chef",
       #     :running => false
       #   )
-      #   @new_resource.stub!(:reload_command).and_return(false)
-      #   @new_resource.stub!(:supports).and_return({:reload => false})
+      #   @new_resource.stub(:reload_command).and_return(false)
+      #   @new_resource.stub(:supports).and_return({:reload => false})
       #
       #   @provider = Chef::Provider::Service::Arch.new(@node, @new_resource)
-      #   Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      #   Chef::Resource::Service.stub(:new).and_return(@current_resource)
       # end
 
       it "should call 'reload' on the service if it supports it" do
-        @new_resource.stub!(:supports).and_return({:reload => true})
+        @new_resource.stub(:supports).and_return({:reload => true})
         @provider.should_receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} reload")
         @provider.reload_service()
       end
 
       it "should should run the user specified reload command if one is specified and the service doesn't support reload" do
-        @new_resource.stub!(:reload_command).and_return("/etc/rc.d/chef lollerpants")
+        @new_resource.stub(:reload_command).and_return("/etc/rc.d/chef lollerpants")
         @provider.should_receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} lollerpants")
         @provider.reload_service()
       end