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

data/spec/unit/mixin/shell_out_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Mixin::ShellOut do
 
     let(:output) { StringIO.new }
     let!(:capture_log_output) { Chef::Log.logger = Logger.new(output)  }
-    let(:assume_deprecation_log_level) { Chef::Log.stub!(:level).and_return(:warn) }
+    let(:assume_deprecation_log_level) { Chef::Log.stub(:level).and_return(:warn) }
 
     context 'without options' do
       let(:command_args) { [ cmd ] }

data/spec/unit/mixin/template_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Mixin::Template, "render_template" do
 
   describe "when running on windows" do
     before do
-      Chef::Platform.stub!(:windows?).and_return(true)
+      Chef::Platform.stub(:windows?).and_return(true)
     end
 
     it "should render the templates with windows line endings" do
@@ -54,7 +54,7 @@ describe Chef::Mixin::Template, "render_template" do
 
   describe "when running on unix" do
     before do
-      Chef::Platform.stub!(:windows?).and_return(false)
+      Chef::Platform.stub(:windows?).and_return(false)
     end
 
     it "should render the templates with unix line endings" do

data/spec/unit/node/attribute_spec.rb

@@ -437,7 +437,7 @@ describe Chef::Node::Attribute do
 
     it "should let you set an attribute value when another hash has an intermediate value" do
       @attributes.normal["the_ghost"] = { "exterminate" => "the future" }
-      lambda { @attributes.normal["the_ghost"]["exterminate"]["tomorrow"] = false }.should_not raise_error(NoMethodError)
+      lambda { @attributes.normal["the_ghost"]["eviscerate"]["tomorrow"] = false }.should_not raise_error
     end
 
     it "should set the attribute value" do
@@ -597,7 +597,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should not raise an exception if one of the hashes has a nil value on a deep lookup" do
-      lambda { @attributes.place.keys { |k| } }.should_not raise_error(NoMethodError)
+      lambda { @attributes.place.keys { |k| } }.should_not raise_error
     end
   end
 
@@ -981,7 +981,7 @@ describe Chef::Node::Attribute do
 
     if RUBY_VERSION >= "1.8.7"
       it "should not raise a LocalJumpError if no block is given" do
-        lambda { @attributes.select }.should_not raise_error(LocalJumpError)
+        lambda { @attributes.select }.should_not raise_error
       end
     else
       it "should raise a LocalJumpError if no block is given" do

data/spec/unit/node_spec.rb

@@ -46,12 +46,12 @@ describe Chef::Node do
     before do
       response = OpenStruct.new(:code => '404')
       exception = Net::HTTPServerException.new("404 not found", response)
-      Chef::Node.stub!(:load).and_raise(exception)
+      Chef::Node.stub(:load).and_raise(exception)
       node.name("created-node")
     end
 
     it "creates a new node for find_or_create" do
-      Chef::Node.stub!(:new).and_return(node)
+      Chef::Node.stub(:new).and_return(node)
       node.should_receive(:create).and_return(node)
       node = Chef::Node.find_or_create("created-node")
       node.name.should == 'created-node'
@@ -62,7 +62,7 @@ describe Chef::Node do
   describe "when the node exists on the server" do
     before do
       node.name('existing-node')
-      Chef::Node.stub!(:load).and_return(node)
+      Chef::Node.stub(:load).and_return(node)
     end
 
     it "loads the node via the REST API for find_or_create" do
@@ -405,7 +405,7 @@ describe Chef::Node do
 
     it "saves non-runlist json attrs for later" do
       expansion = Chef::RunList::RunListExpansion.new('_default', [])
-      node.run_list.stub!(:expand).and_return(expansion)
+      node.run_list.stub(:expand).and_return(expansion)
       node.consume_external_attrs(@ohai_data, {"foo" => "bar"})
       node.expand!
       node.normal_attrs.should == {"foo" => "bar", "tags" => []}
@@ -423,7 +423,7 @@ describe Chef::Node do
       Chef::Environment.should_receive(:load).with("rspec_env").and_return(@environment)
       @expansion = Chef::RunList::RunListExpansion.new("rspec_env", [])
       node.chef_environment("rspec_env")
-      node.run_list.stub!(:expand).and_return(@expansion)
+      node.run_list.stub(:expand).and_return(@expansion)
     end
 
     it "sets the 'recipes' automatic attribute to the recipes in the expanded run_list" do
@@ -540,7 +540,7 @@ describe Chef::Node do
       @environment = Chef::Environment.new
       @environment.default_attributes = {:default => "from env", :d_env => "env only" }
       @environment.override_attributes = {:override => "from env", :o_env => "env only"}
-      Chef::Environment.stub!(:load).and_return(@environment)
+      Chef::Environment.stub(:load).and_return(@environment)
       node.apply_expansion_attributes(@expansion)
     end
 
@@ -764,16 +764,16 @@ describe Chef::Node do
 
   describe "api model" do
     before(:each) do
-      @rest = mock("Chef::REST")
-      Chef::REST.stub!(:new).and_return(@rest)
-      @query = mock("Chef::Search::Query")
-      Chef::Search::Query.stub!(:new).and_return(@query)
+      @rest = double("Chef::REST")
+      Chef::REST.stub(:new).and_return(@rest)
+      @query = double("Chef::Search::Query")
+      Chef::Search::Query.stub(:new).and_return(@query)
     end
 
     describe "list" do
       describe "inflated" do
         it "should return a hash of node names and objects" do
-          n1 = mock("Chef::Node", :name => "one")
+          n1 = double("Chef::Node", :name => "one")
           @query.should_receive(:search).with(:node).and_yield(n1)
           r = Chef::Node.list(true)
           r["one"].should == n1
@@ -818,7 +818,7 @@ describe Chef::Node do
 
       it "should create if it cannot update" do
         node.name("monkey")
-        exception = mock("404 error", :code => "404")
+        exception = double("404 error", :code => "404")
         @rest.should_receive(:put_rest).and_raise(Net::HTTPServerException.new("foo", exception))
         @rest.should_receive(:post_rest).with("nodes", node)
         node.save

data/spec/unit/platform_spec.rb

@@ -151,7 +151,7 @@ describe Chef::Platform do
 
   it "should prefer an explicit provider" do
     kitty = Chef::Resource::Cat.new("loulou")
-    kitty.stub!(:provider).and_return(Chef::Provider::File)
+    kitty.stub(:provider).and_return(Chef::Provider::File)
     node = Chef::Node.new
     node.name("Intel")
     node.automatic_attrs[:platform] = "mac_os_x"

data/spec/unit/policy_builder/expand_node_object_spec.rb

@@ -55,6 +55,14 @@ describe Chef::PolicyBuilder::ExpandNodeObject do
       expect(policy_builder).to respond_to(:expand_run_list)
     end
 
+    it "implements a sync_cookbooks method" do
+      expect(policy_builder).to respond_to(:sync_cookbooks)
+    end
+
+    it "implements a temporary_policy? method" do
+      expect(policy_builder).to respond_to(:temporary_policy?)
+    end
+
     describe "loading the node" do
 
       context "on chef-solo" do
@@ -177,6 +185,10 @@ describe Chef::PolicyBuilder::ExpandNodeObject do
       expect(node["fqdn"]).to eq(ohai_data["fqdn"])
     end
 
+    it "reports that a temporary_policy is not being used" do
+      expect(policy_builder.temporary_policy?).to be_false
+    end
+
     describe "when the given run list is not in expanded form" do
 
       # NOTE: for chef-client, the behavior is always to expand the run list,
@@ -235,6 +247,10 @@ describe Chef::PolicyBuilder::ExpandNodeObject do
         expect(policy_builder.original_runlist).to eq(primary_runlist)
       end
 
+      it "reports that a temporary policy is being used" do
+        expect(policy_builder.temporary_policy?).to be_true
+      end
+
     end
 
     context "when no environment is specified" do

data/spec/unit/policy_builder/policyfile_spec.rb

@@ -106,6 +106,10 @@ describe Chef::PolicyBuilder::Policyfile do
       Chef::PolicyBuilder::Policyfile.new(node_name, ohai_data, json_attribs, override_runlist, events)
     end
 
+    it "always gives `false` for #temporary_policy?" do
+      expect(initialize_pb.temporary_policy?).to be_false
+    end
+
     context "chef-solo" do
       before { Chef::Config[:solo] = true }
 

data/spec/unit/provider/breakpoint_spec.rb

@@ -25,8 +25,8 @@ describe Chef::Provider::Breakpoint do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @collection = mock("resource collection")
-    @run_context.stub!(:resource_collection).and_return(@collection)
+    @collection = double("resource collection")
+    @run_context.stub(:resource_collection).and_return(@collection)
     @provider = Chef::Provider::Breakpoint.new(@resource, @run_context)
   end
 
@@ -35,18 +35,18 @@ describe Chef::Provider::Breakpoint do
   end
 
   it "gets the iterator from @collection and pauses it" do
-    Shell.stub!(:running?).and_return(true)
-    @iterator = mock("stepable_iterator")
-    @collection.stub!(:iterator).and_return(@iterator)
+    Shell.stub(:running?).and_return(true)
+    @iterator = double("stepable_iterator")
+    @collection.stub(:iterator).and_return(@iterator)
     @iterator.should_receive(:pause)
     @provider.action_break
     @resource.should be_updated
   end
 
   it "doesn't pause the iterator if chef-shell isn't running" do
-    Shell.stub!(:running?).and_return(false)
-    @iterator = mock("stepable_iterator")
-    @collection.stub!(:iterator).and_return(@iterator)
+    Shell.stub(:running?).and_return(false)
+    @iterator = double("stepable_iterator")
+    @collection.stub(:iterator).and_return(@iterator)
     @iterator.should_not_receive(:pause)
     @provider.action_break
   end

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

@@ -20,15 +20,15 @@ require 'spec_helper'
 
 describe Chef::Provider::CookbookFile::Content do
 
-  let(:new_resource) { mock('Chef::Resource::CookbookFile (new)', :cookbook_name => 'apache2', :cookbook => 'apache2') }
+  let(:new_resource) { double('Chef::Resource::CookbookFile (new)', :cookbook_name => 'apache2', :cookbook => 'apache2') }
   let(:content) do
-    @run_context = mock('Chef::RunContext')
-    @current_resource = mock('Chef::Resource::CookbookFile (current)')
+    @run_context = double('Chef::RunContext')
+    @current_resource = double('Chef::Resource::CookbookFile (current)')
     Chef::Provider::CookbookFile::Content.new(new_resource, @current_resource, @run_context)
   end
 
   it "prefers the explicit cookbook name on the resource to the implicit one" do
-    new_resource.stub!(:cookbook).and_return('nginx')
+    new_resource.stub(:cookbook).and_return('nginx')
     content.send(:resource_cookbook).should == 'nginx'
   end
 

data/spec/unit/provider/cookbook_file_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Provider::CookbookFile do
   end
 
   let(:content) do
-    content = mock('Chef::Provider::CookbookFile::Content')
+    content = double('Chef::Provider::CookbookFile::Content')
   end
 
   it_behaves_like Chef::Provider::File

data/spec/unit/provider/cron/unix_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Provider::Cron::Unix do
 
   describe "read_crontab" do
     before :each do
-      @status = mock("Status", :exitstatus => 0)
+      @status = double("Status", :exitstatus => 0)
       @stdout = StringIO.new(<<-CRONTAB)
 0 2 * * * /some/other/command
 
@@ -48,7 +48,7 @@ describe Chef::Provider::Cron::Unix do
 
 # Another comment
       CRONTAB
-      @provider.stub!(:popen4).and_yield(1234, StringIO.new, @stdout, StringIO.new).and_return(@status)
+      @provider.stub(:popen4).and_yield(1234, StringIO.new, @stdout, StringIO.new).and_return(@status)
     end
 
     it "should call crontab -l with the user" do
@@ -69,14 +69,14 @@ CRONTAB
     end
 
     it "should return nil if the user has no crontab" do
-      status = mock("Status", :exitstatus => 1)
-      @provider.stub!(:popen4).and_return(status)
+      status = double("Status", :exitstatus => 1)
+      @provider.stub(:popen4).and_return(status)
       @provider.send(:read_crontab).should == nil
     end
 
     it "should raise an exception if another error occurs" do
-      status = mock("Status", :exitstatus => 2)
-      @provider.stub!(:popen4).and_return(status)
+      status = double("Status", :exitstatus => 2)
+      @provider.stub(:popen4).and_return(status)
       lambda do
         @provider.send(:read_crontab)
       end.should raise_error(Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: 2")
@@ -85,10 +85,10 @@ CRONTAB
 
   describe "write_crontab" do
     before :each do
-      @status = mock("Status", :exitstatus => 0)
-      @provider.stub!(:run_command_and_return_stdout_stderr).and_return(@status, String.new, String.new)
-      @tempfile = mock("foo", :path => "/tmp/foo", :close => true)
-      Tempfile.stub!(:new).and_return(@tempfile)
+      @status = double("Status", :exitstatus => 0)
+      @provider.stub(:run_command_and_return_stdout_stderr).and_return(@status, String.new, String.new)
+      @tempfile = double("foo", :path => "/tmp/foo", :close => true)
+      Tempfile.stub(:new).and_return(@tempfile)
       @tempfile.should_receive(:flush)
       @tempfile.should_receive(:chmod).with(420)
       @tempfile.should_receive(:close!)
@@ -112,7 +112,7 @@ CRONTAB
 
     it "should raise an exception if the command returns non-zero" do
       @tempfile.should_receive(:<<).with("Foo")
-      @status.stub!(:exitstatus).and_return(1)
+      @status.stub(:exitstatus).and_return(1)
       lambda do
         @provider.send(:write_crontab, "Foo")
       end.should raise_error(Chef::Exceptions::Cron, /Error updating state of #{@new_resource.name}, exit: 1/)

data/spec/unit/provider/cron_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Provider::Cron do
   describe "when examining the current system state" do
     context "with no crontab for the user" do
       before :each do
-        @provider.stub!(:read_crontab).and_return(nil)
+        @provider.stub(:read_crontab).and_return(nil)
       end
 
       it "should set cron_empty" do
@@ -51,7 +51,7 @@ describe Chef::Provider::Cron do
 
     context "with no matching entry in the user's crontab" do
       before :each do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: something else
@@ -73,7 +73,7 @@ CRONTAB
       end
 
       it "should not fail if there's an existing cron with a numerical argument" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 # Chef Name: foo[bar] (baz)
 21 */4 * * * some_prog 1234567
 CRONTAB
@@ -85,7 +85,7 @@ CRONTAB
 
     context "with a matching entry in the user's crontab" do
       before :each do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -114,7 +114,7 @@ CRONTAB
       end
 
       it "should pull env vars out" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -142,7 +142,7 @@ CRONTAB
       end
 
       it "should parse and load generic and standard environment variables from cron entry" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 # Chef Name: cronhole some stuff
 MAILTO=warn@example.com
 TEST=lol
@@ -156,7 +156,7 @@ CRONTAB
       end
 
       it "should not break with variabels that match the cron resource internals" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 # Chef Name: cronhole some stuff
 MINUTE=40
 HOUR=midnight
@@ -179,7 +179,7 @@ CRONTAB
 
     context "with a matching entry in the user's crontab using month names and weekday names (#CHEF-3178)" do
       before :each do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -215,7 +215,7 @@ CRONTAB
 
     context "with a matching entry without a crontab line" do
       it "should set cron_exists and leave current_resource values at defaults" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -231,7 +231,7 @@ CRONTAB
       end
 
       it "should not pick up a commented out crontab line" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -248,7 +248,7 @@ CRONTAB
       end
 
       it "should not pick up a later crontab entry" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -304,8 +304,8 @@ CRONTAB
 
   describe "action_create" do
     before :each do
-      @provider.stub!(:write_crontab)
-      @provider.stub!(:read_crontab).and_return(nil)
+      @provider.stub(:write_crontab)
+      @provider.stub(:read_crontab).and_return(nil)
     end
 
     context "when there is no existing crontab" do
@@ -354,7 +354,7 @@ TEST=LOL
     context "when there is a crontab with no matching section" do
       before :each do
         @provider.cron_exists = false
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: something else
@@ -416,8 +416,8 @@ TEST=LOL
     context "when there is a crontab with a matching but different section" do
       before :each do
         @provider.cron_exists = true
-        @provider.stub!(:cron_different?).and_return(true)
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:cron_different?).and_return(true)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -481,11 +481,11 @@ TEST=LOL
     context "when there is a crontab with a matching section with no crontab line in it" do
       before :each do
         @provider.cron_exists = true
-        @provider.stub!(:cron_different?).and_return(true)
+        @provider.stub(:cron_different?).and_return(true)
       end
 
       it "should add the crontab to the entry" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -500,7 +500,7 @@ TEST=LOL
       end
 
       it "should not blat any following entries" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -525,7 +525,7 @@ TEST=LOL
       end
 
       it "should handle env vars with no crontab" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -565,8 +565,8 @@ HOME=/home/foo
     context "when there is a crontab with a matching and identical section" do
       before :each do
         @provider.cron_exists = true
-        @provider.stub!(:cron_different?).and_return(false)
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:cron_different?).and_return(false)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -596,8 +596,8 @@ CRONTAB
 
   describe "action_delete" do
     before :each do
-      @provider.stub!(:write_crontab)
-      @provider.stub!(:read_crontab).and_return(nil)
+      @provider.stub(:write_crontab)
+      @provider.stub(:read_crontab).and_return(nil)
     end
 
     context "when the user's crontab has no matching section" do
@@ -620,7 +620,7 @@ CRONTAB
     context "when the user has a crontab with a matching section" do
       before :each do
         @provider.cron_exists = true
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -645,7 +645,7 @@ CRONTAB
       end
 
       it "should remove any env vars with the entry" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -685,7 +685,7 @@ FOO=test
       end
 
       it "should remove the section" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -698,7 +698,7 @@ FOO=test
       end
 
       it "should not blat following sections" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -721,7 +721,7 @@ FOO=test
       end
 
       it "should remove any envvars with the section" do
-        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+        @provider.stub(:read_crontab).and_return(<<-CRONTAB)
 0 2 * * * /some/other/command
 
 # Chef Name: cronhole some stuff
@@ -748,7 +748,7 @@ MAILTO=foo@example.com
 
   describe "read_crontab" do
     before :each do
-      @status = mock("Status", :exitstatus => 0)
+      @status = double("Status", :exitstatus => 0)
       @stdout = StringIO.new(<<-CRONTAB)
 0 2 * * * /some/other/command
 
@@ -757,7 +757,7 @@ MAILTO=foo@example.com
 
 # Another comment
       CRONTAB
-      @provider.stub!(:popen4).and_yield(1234, StringIO.new, @stdout, StringIO.new).and_return(@status)
+      @provider.stub(:popen4).and_yield(1234, StringIO.new, @stdout, StringIO.new).and_return(@status)
     end
 
     it "should call crontab -l with the user" do
@@ -778,14 +778,14 @@ MAILTO=foo@example.com
     end
 
     it "should return nil if the user has no crontab" do
-      status = mock("Status", :exitstatus => 1)
-      @provider.stub!(:popen4).and_return(status)
+      status = double("Status", :exitstatus => 1)
+      @provider.stub(:popen4).and_return(status)
       @provider.send(:read_crontab).should == nil
     end
 
     it "should raise an exception if another error occurs" do
-      status = mock("Status", :exitstatus => 2)
-      @provider.stub!(:popen4).and_return(status)
+      status = double("Status", :exitstatus => 2)
+      @provider.stub(:popen4).and_return(status)
       lambda do
         @provider.send(:read_crontab)
       end.should raise_error(Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: 2")
@@ -794,9 +794,9 @@ MAILTO=foo@example.com
 
   describe "write_crontab" do
     before :each do
-      @status = mock("Status", :exitstatus => 0)
+      @status = double("Status", :exitstatus => 0)
       @stdin = StringIO.new
-      @provider.stub!(:popen4).and_yield(1234, @stdin, StringIO.new, StringIO.new).and_return(@status)
+      @provider.stub(:popen4).and_yield(1234, @stdin, StringIO.new, StringIO.new).and_return(@status)
     end
 
     it "should call crontab for the user" do
@@ -810,7 +810,7 @@ MAILTO=foo@example.com
     end
 
     it "should raise an exception if the command returns non-zero" do
-      @status.stub!(:exitstatus).and_return(1)
+      @status.stub(:exitstatus).and_return(1)
       lambda do
         @provider.send(:write_crontab, "Foo")
       end.should raise_error(Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: 1")
@@ -822,8 +822,8 @@ MAILTO=foo@example.com
           raise Errno::EPIPE, "Test"
         end
       end
-      @status.stub!(:exitstatus).and_return(1)
-      @provider.stub!(:popen4).and_yield(1234, WriteErrPipe.new, StringIO.new, StringIO.new).and_return(@status)
+      @status.stub(:exitstatus).and_return(1)
+      @provider.stub(:popen4).and_yield(1234, WriteErrPipe.new, StringIO.new, StringIO.new).and_return(@status)
 
       Chef::Log.should_receive(:debug).with("Broken pipe - Test")