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

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

@@ -46,7 +46,7 @@ describe Chef::Provider::Service::Debian do
 
     context "when update-rc.d shows init linked to rc*.d/" do
       before do
-        @provider.stub!(:assert_update_rcd_available)
+        @provider.stub(:assert_update_rcd_available)
 
         result = <<-UPDATE_RC_D_SUCCESS
   Removing any system startup links for /etc/init.d/chef ...
@@ -61,9 +61,9 @@ describe Chef::Provider::Service::Debian do
 
         @stdout = StringIO.new(result)
         @stderr = StringIO.new
-        @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-        @provider.stub!(:shell_out!).and_return(@status)
-        @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+        @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+        @provider.stub(:shell_out!).and_return(@status)
+        @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       end
 
       it "says the service is enabled" do
@@ -71,7 +71,7 @@ describe Chef::Provider::Service::Debian do
       end
 
       it "stores the 'enabled' state" do
-        Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+        Chef::Resource::Service.stub(:new).and_return(@current_resource)
         @provider.load_current_resource.should equal(@current_resource)
         @current_resource.enabled.should be_true
       end
@@ -79,14 +79,14 @@ describe Chef::Provider::Service::Debian do
 
     context "when update-rc.d shows init isn't linked to rc*.d/" do
       before do
-        @provider.stub!(:assert_update_rcd_available)
-        @status = mock("Status", :exitstatus => 0)
+        @provider.stub(:assert_update_rcd_available)
+        @status = double("Status", :exitstatus => 0)
         @stdout = StringIO.new(
           " Removing any system startup links for /etc/init.d/chef ...")
         @stderr = StringIO.new
-        @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-        @provider.stub!(:shell_out!).and_return(@status)
-        @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+        @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+        @provider.stub(:shell_out!).and_return(@status)
+        @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       end
 
       it "says the service is disabled" do
@@ -94,7 +94,7 @@ describe Chef::Provider::Service::Debian do
       end
 
       it "stores the 'disabled' state" do
-        Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+        Chef::Resource::Service.stub(:new).and_return(@current_resource)
         @provider.load_current_resource.should equal(@current_resource)
         @current_resource.enabled.should be_false
       end
@@ -102,8 +102,8 @@ describe Chef::Provider::Service::Debian do
 
     context "when update-rc.d fails" do
       before do
-        @status = mock("Status", :exitstatus => -1)
-        @provider.stub!(:popen4).and_return(@status)
+        @status = double("Status", :exitstatus => -1)
+        @provider.stub(:popen4).and_return(@status)
       end
 
       it "raises an error" do
@@ -196,13 +196,13 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
       context "on #{model}" do
         context "when update-rc.d shows init linked to rc*.d/" do
           before do
-            @provider.stub!(:assert_update_rcd_available)
+            @provider.stub(:assert_update_rcd_available)
 
             @stdout = StringIO.new(expected_results["linked"]["stdout"])
             @stderr = StringIO.new(expected_results["linked"]["stderr"])
-            @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-            @provider.stub!(:shell_out!).and_return(@status)
-            @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+            @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+            @provider.stub(:shell_out!).and_return(@status)
+            @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
           end
 
           it "says the service is enabled" do
@@ -210,7 +210,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
           end
 
           it "stores the 'enabled' state" do
-            Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+            Chef::Resource::Service.stub(:new).and_return(@current_resource)
             @provider.load_current_resource.should equal(@current_resource)
             @current_resource.enabled.should be_true
           end
@@ -223,12 +223,12 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
 
         context "when update-rc.d shows init isn't linked to rc*.d/" do
           before do
-            @provider.stub!(:assert_update_rcd_available)
+            @provider.stub(:assert_update_rcd_available)
             @stdout = StringIO.new(expected_results["not linked"]["stdout"])
             @stderr = StringIO.new(expected_results["not linked"]["stderr"])
-            @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-            @provider.stub!(:shell_out!).and_return(@status)
-            @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+            @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+            @provider.stub(:shell_out!).and_return(@status)
+            @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
           end
 
           it "says the service is disabled" do
@@ -236,7 +236,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
           end
 
           it "stores the 'disabled' state" do
-            Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+            Chef::Resource::Service.stub(:new).and_return(@current_resource)
             @provider.load_current_resource.should equal(@current_resource)
             @current_resource.enabled.should be_false
           end

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

@@ -34,7 +34,7 @@ describe Chef::Provider::Service::Freebsd do
     @provider = Chef::Provider::Service::Freebsd.new(@new_resource,@run_context)
     @provider.action = :start
     @init_command = "/usr/local/etc/rc.d/apache22"
-    Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Service.stub(:new).and_return(@current_resource)
   end
 
   describe "load_current_resource" do
@@ -44,21 +44,21 @@ describe Chef::Provider::Service::Freebsd do
 539  ??  Is     0:00.14 /usr/sbin/sshd
 545  ??  Ss     0:17.53 sendmail: accepting connections (sendmail)
 PS_SAMPLE
-      @status = mock(:stdout => @stdout, :exitstatus => 0)
-      @provider.stub!(:shell_out!).with(@node[:command][:ps]).and_return(@status)
+      @status = double(:stdout => @stdout, :exitstatus => 0)
+      @provider.stub(:shell_out!).with(@node[:command][:ps]).and_return(@status)
 
-      ::File.stub!(:exists?).and_return(false)
-      ::File.stub!(:exists?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
-      @lines = mock("lines")
-      @lines.stub!(:each).and_yield("sshd_enable=\"YES\"").
+      ::File.stub(:exists?).and_return(false)
+      ::File.stub(:exists?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
+      @lines = double("lines")
+      @lines.stub(:each).and_yield("sshd_enable=\"YES\"").
                           and_yield("#{@new_resource.name}_enable=\"YES\"")
-      ::File.stub!(:open).and_return(@lines)
+      ::File.stub(:open).and_return(@lines)
 
       @rc_with_name = StringIO.new(<<-RC_SAMPLE)
 name="apache22"
 rcvar=`set_rcvar`
 RC_SAMPLE
-      ::File.stub!(:open).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(@rc_with_name)
+      ::File.stub(:open).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(@rc_with_name)
       @provider.stub(:service_enable_variable_name).and_return nil
 
     end
@@ -75,7 +75,7 @@ RC_SAMPLE
 
     it "should not raise an exception if the rcscript have a name variable" do
       @provider.load_current_resource
-      lambda { @provider.service_enable_variable_name }.should_not raise_error(Chef::Exceptions::Service)
+      lambda { @provider.service_enable_variable_name }.should_not raise_error
     end
 
     describe "when the service supports status" do
@@ -129,14 +129,14 @@ RC_SAMPLE
     describe "when executing assertions" do
       it "should verify that /etc/rc.conf exists" do
         ::File.should_receive(:exists?).with("/etc/rc.conf")
-        @provider.stub!(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
+        @provider.stub(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
         @provider.load_current_resource
       end
 
       context "and the init script is not found" do
         [ "start", "reload", "restart", "enable" ].each do |action|
           it "should raise an exception when the action is #{action}" do
-            ::File.stub!(:exists?).and_return(false)
+            ::File.stub(:exists?).and_return(false)
             @provider.load_current_resource
             @provider.define_resource_requirements
             @provider.instance_variable_get("@rcd_script_found").should be_false
@@ -160,7 +160,7 @@ RC_SAMPLE
       end
 
       it "update state when current resource enabled state could be determined" do
-        ::File.stub!(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
+        ::File.stub(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
         ::File.should_receive(:exists?).with("/etc/rc.conf").and_return  true
         @provider.load_current_resource
         @provider.instance_variable_get("@enabled_state_found").should be_false
@@ -189,26 +189,26 @@ RC_SAMPLE
       end
 
       it "should read stdout of the ps command" do
-        @provider.stub!(:shell_out!).and_return(@status)
+        @provider.stub(:shell_out!).and_return(@status)
         @stdout.should_receive(:each_line).and_return(true)
         @provider.load_current_resource
       end
 
       it "should set running to true if the regex matches the output" do
-        @stdout.stub!(:each_line).and_yield("555  ??  Ss     0:05.16 /usr/sbin/cron -s").
+        @stdout.stub(:each_line).and_yield("555  ??  Ss     0:05.16 /usr/sbin/cron -s").
                                   and_yield(" 9881  ??  Ss     0:06.67 /usr/local/sbin/httpd -DNOHTTPACCEPT")
         @provider.load_current_resource
         @current_resource.running.should be_true
       end
 
       it "should set running to false if the regex doesn't match" do
-        @provider.stub!(:shell_out!).and_return(@status)
+        @provider.stub(:shell_out!).and_return(@status)
         @provider.load_current_resource
         @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.define_resource_requirements
         lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
@@ -270,7 +270,7 @@ RC_SAMPLE
         @rc_without_name = StringIO.new(<<-RC_SAMPLE)
 rcvar=`set_rcvar`
 RC_SAMPLE
-        ::File.stub!(:open).with("/usr/local/etc/rc.d/#{@current_resource.service_name}").and_return(@rc_with_noname)
+        ::File.stub(:open).with("/usr/local/etc/rc.d/#{@current_resource.service_name}").and_return(@rc_with_noname)
         @provider.current_resource = @current_resource
       end
 
@@ -282,19 +282,19 @@ RC_SAMPLE
 # #{@current_resource.service_name}_enable="YES"
 #   (default: "")
 RCVAR_SAMPLE
-          @status = mock(:stdout => @rcvar_stdout, :exitstatus => 0)
-          @provider.stub!(:shell_out!).with("/usr/local/etc/rc.d/#{@current_resource.service_name} rcvar").and_return(@status)
+          @status = double(:stdout => @rcvar_stdout, :exitstatus => 0)
+          @provider.stub(:shell_out!).with("/usr/local/etc/rc.d/#{@current_resource.service_name} rcvar").and_return(@status)
         end
 
         it "should get the service name from rcvar if the rcscript does not have a name variable" do
           @provider.load_current_resource
-          @provider.unstub!(:service_enable_variable_name)
+          @provider.unstub(:service_enable_variable_name)
           @provider.service_enable_variable_name.should == "#{@current_resource.service_name}_enable"
         end
 
         it "should not raise an exception if the rcscript does not have a name variable" do
           @provider.load_current_resource
-          lambda { @provider.service_enable_variable_name }.should_not raise_error(Chef::Exceptions::Service)
+          lambda { @provider.service_enable_variable_name }.should_not raise_error
         end
       end
 
@@ -304,8 +304,8 @@ RCVAR_SAMPLE
 # service_with_noname
 #
 RCVAR_SAMPLE
-          @status = mock(:stdout => @rcvar_stdout, :exitstatus => 0)
-          @provider.stub!(:shell_out!).with("/usr/local/etc/rc.d/#{@current_resource.service_name} rcvar").and_return(@status)
+          @status = double(:stdout => @rcvar_stdout, :exitstatus => 0)
+          @provider.stub(:shell_out!).with("/usr/local/etc/rc.d/#{@current_resource.service_name} rcvar").and_return(@status)
         end
 
         [ "start", "reload", "restart", "enable" ].each do |action|
@@ -319,11 +319,11 @@ RCVAR_SAMPLE
 
         [ "stop", "disable" ].each do |action|
           it "should not raise an error when the action is #{action}" do
-            ::File.stub!(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
+            ::File.stub(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
             @provider.action = action
             @provider.load_current_resource
             @provider.define_resource_requirements
-            lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Service)
+            lambda { @provider.process_resource_requirements }.should_not raise_error
           end
         end
       end
@@ -333,25 +333,25 @@ RCVAR_SAMPLE
   describe Chef::Provider::Service::Freebsd, "enable_service" do
     before do
       @provider.current_resource = @current_resource
-      @provider.stub!(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
+      @provider.stub(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
     end
 
     it "should enable the service if it is not enabled" do
-      @current_resource.stub!(:enabled).and_return(false)
+      @current_resource.stub(:enabled).and_return(false)
       @provider.should_receive(:read_rc_conf).and_return([ "foo", "#{@current_resource.service_name}_enable=\"NO\"", "bar" ])
       @provider.should_receive(:write_rc_conf).with(["foo", "bar", "#{@current_resource.service_name}_enable=\"YES\""])
       @provider.enable_service()
     end
 
     it "should enable the service if it is not enabled and not already specified in the rc.conf file" do
-      @current_resource.stub!(:enabled).and_return(false)
+      @current_resource.stub(:enabled).and_return(false)
       @provider.should_receive(:read_rc_conf).and_return([ "foo", "bar" ])
       @provider.should_receive(:write_rc_conf).with(["foo", "bar", "#{@current_resource.service_name}_enable=\"YES\""])
       @provider.enable_service()
     end
 
     it "should not enable the service if it is already enabled" do
-      @current_resource.stub!(:enabled).and_return(true)
+      @current_resource.stub(:enabled).and_return(true)
       @provider.should_not_receive(:write_rc_conf)
       @provider.enable_service
     end
@@ -360,18 +360,18 @@ RCVAR_SAMPLE
   describe Chef::Provider::Service::Freebsd, "disable_service" do
     before do
       @provider.current_resource = @current_resource
-      @provider.stub!(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
+      @provider.stub(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
     end
 
     it "should should disable the service if it is not disabled" do
-      @current_resource.stub!(:enabled).and_return(true)
+      @current_resource.stub(:enabled).and_return(true)
       @provider.should_receive(:read_rc_conf).and_return([ "foo", "#{@current_resource.service_name}_enable=\"YES\"", "bar" ])
       @provider.should_receive(:write_rc_conf).with(["foo", "bar", "#{@current_resource.service_name}_enable=\"NO\""])
       @provider.disable_service()
     end
 
     it "should not disable the service if it is already disabled" do
-      @current_resource.stub!(:enabled).and_return(false)
+      @current_resource.stub(:enabled).and_return(false)
       @provider.should_not_receive(:write_rc_conf)
       @provider.disable_service()
     end

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

@@ -29,13 +29,13 @@ describe Chef::Provider::Service::Gentoo do
     @current_resource = Chef::Resource::Service.new("chef")
 
     @provider = Chef::Provider::Service::Gentoo.new(@new_resource, @run_context)
-    Chef::Resource::Service.stub!(:new).and_return(@current_resource)
-    @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-    @provider.stub!(:shell_out).and_return(@status)
-    File.stub!(:exists?).with("/etc/init.d/chef").and_return(true)
-    File.stub!(:exists?).with("/sbin/rc-update").and_return(true)
-    File.stub!(:exists?).with("/etc/runlevels/default/chef").and_return(false)
-    File.stub!(:readable?).with("/etc/runlevels/default/chef").and_return(false)
+    Chef::Resource::Service.stub(:new).and_return(@current_resource)
+    @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+    @provider.stub(:shell_out).and_return(@status)
+    File.stub(:exists?).with("/etc/init.d/chef").and_return(true)
+    File.stub(:exists?).with("/sbin/rc-update").and_return(true)
+    File.stub(:exists?).with("/etc/runlevels/default/chef").and_return(false)
+    File.stub(:readable?).with("/etc/runlevels/default/chef").and_return(false)
   end
  # new test: found_enabled state
   #
@@ -52,7 +52,7 @@ describe Chef::Provider::Service::Gentoo do
     end
 
     it "should track when service file is found in /etc/runlevels/**/" do
-      Dir.stub!(:glob).with("/etc/runlevels/**/chef").and_return(["/etc/runlevels/default/chef"])
+      Dir.stub(:glob).with("/etc/runlevels/**/chef").and_return(["/etc/runlevels/default/chef"])
       @provider.load_current_resource
       @provider.instance_variable_get("@found_script").should be_true
     end
@@ -60,13 +60,13 @@ describe Chef::Provider::Service::Gentoo do
     describe "when detecting the service enable state" do
       describe "and the glob returns a default service script file" do
         before do
-          Dir.stub!(:glob).with("/etc/runlevels/**/chef").and_return(["/etc/runlevels/default/chef"])
+          Dir.stub(:glob).with("/etc/runlevels/**/chef").and_return(["/etc/runlevels/default/chef"])
         end
 
         describe "and the file exists and is readable" do
           before do
-            File.stub!(:exists?).with("/etc/runlevels/default/chef").and_return(true)
-            File.stub!(:readable?).with("/etc/runlevels/default/chef").and_return(true)
+            File.stub(:exists?).with("/etc/runlevels/default/chef").and_return(true)
+            File.stub(:readable?).with("/etc/runlevels/default/chef").and_return(true)
           end
           it "should set enabled to true" do
             @provider.load_current_resource
@@ -76,8 +76,8 @@ describe Chef::Provider::Service::Gentoo do
 
         describe "and the file exists but is not readable" do
           before do
-            File.stub!(:exists?).with("/etc/runlevels/default/chef").and_return(true)
-            File.stub!(:readable?).with("/etc/runlevels/default/chef").and_return(false)
+            File.stub(:exists?).with("/etc/runlevels/default/chef").and_return(true)
+            File.stub(:readable?).with("/etc/runlevels/default/chef").and_return(false)
           end
 
           it "should set enabled to false" do
@@ -88,8 +88,8 @@ describe Chef::Provider::Service::Gentoo do
 
         describe "and the file does not exist" do
           before do
-            File.stub!(:exists?).with("/etc/runlevels/default/chef").and_return(false)
-            File.stub!(:readable?).with("/etc/runlevels/default/chef").and_return("foobarbaz")
+            File.stub(:exists?).with("/etc/runlevels/default/chef").and_return(false)
+            File.stub(:readable?).with("/etc/runlevels/default/chef").and_return("foobarbaz")
           end
 
           it "should set enabled to false" do
@@ -124,7 +124,7 @@ describe Chef::Provider::Service::Gentoo do
   end
 
   describe "action_methods" do
-    before(:each) { @provider.stub!(:load_current_resource).and_return(@current_resource) }
+    before(:each) { @provider.stub(:load_current_resource).and_return(@current_resource) }
 
     describe Chef::Provider::Service::Gentoo, "enable_service" do
       it "should call rc-update add *service* default" do

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

@@ -30,15 +30,15 @@ describe Chef::Provider::Service::Init, "load_current_resource" do
     @current_resource = Chef::Resource::Service.new("chef")
 
     @provider = Chef::Provider::Service::Init.new(@new_resource, @run_context)
-    Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Service.stub(:new).and_return(@current_resource)
 
     @stdout = StringIO.new(<<-PS)
 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
 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)
   end
 
   it "should create a current resource with the name of the new resource" do
@@ -62,20 +62,20 @@ PS
     end
 
     it "should set running to true if the status command returns 0" do
-      @provider.stub!(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
+      @provider.stub(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
       @provider.load_current_resource
       @current_resource.running.should be_true
     end
 
     it "should set running to false if the status command returns anything except 0" do
-      @status.stub!(:exitstatus).and_return(1)
-      @provider.stub!(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
+      @status.stub(:exitstatus).and_return(1)
+      @provider.stub(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
       @provider.load_current_resource
       @current_resource.running.should be_false
     end
 
     it "should set running to false if the status command raises" do
-      @provider.stub!(:shell_out).and_raise(Mixlib::ShellOut::ShellCommandFailed)
+      @provider.stub(:shell_out).and_raise(Mixlib::ShellOut::ShellCommandFailed)
       @provider.load_current_resource
       @current_resource.running.should be_false
     end
@@ -83,7 +83,7 @@ PS
 
   describe "when a status command has been specified" do
     before do
-      @new_resource.stub!(:status_command).and_return("/etc/init.d/chefhasmonkeypants status")
+      @new_resource.stub(:status_command).and_return("/etc/init.d/chefhasmonkeypants status")
     end
 
     it "should run the services status command if one has been specified" do
@@ -95,7 +95,7 @@ PS
 
   describe "when an init command has been specified" do
     before do
-      @new_resource.stub!(:init_command).and_return("/opt/chef-server/service/erchef")
+      @new_resource.stub(:init_command).and_return("/opt/chef-server/service/erchef")
       @provider = Chef::Provider::Service::Init.new(@new_resource, @run_context)
     end
 
@@ -138,19 +138,19 @@ 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
       @current_resource.running.should be_true
     end
 
     it "should set running to false if the regex doesn't match" do
-      @provider.stub!(:shell_out!).and_return(@status)
+      @provider.stub(:shell_out!).and_return(@status)
       @provider.load_current_resource
       @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
@@ -229,7 +229,7 @@ RUNNING_PS
     end
 
     it "should still pass all why run assertions" do
-      lambda { @provider.run_action(:start) }.should_not raise_error(Chef::Exceptions::Service)
+      lambda { @provider.run_action(:start) }.should_not raise_error
     end
   end
 end