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

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

@@ -29,14 +29,14 @@ describe Chef::Provider::Service::Insserv do
     @current_resource = Chef::Resource::Service.new("initgrediant")
 
     @provider = Chef::Provider::Service::Insserv.new(@new_resource, @run_context)
-    @status = mock("Process::Status mock", :exitstatus => 0, :stdout => "")
-    @provider.stub!(:shell_out!).and_return(@status)
+    @status = double("Process::Status mock", :exitstatus => 0, :stdout => "")
+    @provider.stub(:shell_out!).and_return(@status)
   end
 
   describe "load_current_resource" do
     describe "when startup links exist" do
       before do
-        Dir.stub!(:glob).with("/etc/rc**/S*initgrediant").and_return(["/etc/rc5.d/S18initgrediant", "/etc/rc2.d/S18initgrediant", "/etc/rc4.d/S18initgrediant", "/etc/rc3.d/S18initgrediant"])
+        Dir.stub(:glob).with("/etc/rc**/S*initgrediant").and_return(["/etc/rc5.d/S18initgrediant", "/etc/rc2.d/S18initgrediant", "/etc/rc4.d/S18initgrediant", "/etc/rc3.d/S18initgrediant"])
       end
 
       it "sets the current enabled status to true" do
@@ -47,7 +47,7 @@ describe Chef::Provider::Service::Insserv do
 
     describe "when startup links do not exist" do
       before do
-        Dir.stub!(:glob).with("/etc/rc**/S*initgrediant").and_return([])
+        Dir.stub(:glob).with("/etc/rc**/S*initgrediant").and_return([])
       end
 
       it "sets the current enabled status to false" do

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

@@ -30,15 +30,15 @@ describe Chef::Provider::Service::Invokercd, "load_current_resource" do
     @current_resource = Chef::Resource::Service.new("chef")
 
     @provider = Chef::Provider::Service::Invokercd.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("/usr/sbin/invoke-rc.d #{@current_resource.service_name} status").and_return(@status)
+      @provider.stub(:shell_out).with("/usr/sbin/invoke-rc.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("/usr/sbin/invoke-rc.d #{@current_resource.service_name} status").and_return(@status)
+      @status.stub(:exitstatus).and_return(1)
+      @provider.stub(:shell_out).with("/usr/sbin/invoke-rc.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).with("/usr/sbin/invoke-rc.d #{@current_resource.service_name} status").and_raise(Mixlib::ShellOut::ShellCommandFailed)
+      @provider.stub(:shell_out).with("/usr/sbin/invoke-rc.d #{@current_resource.service_name} status").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("/usr/sbin/invoke-rc.d chefhasmonkeypants status")
+      @new_resource.stub(:status_command).and_return("/usr/sbin/invoke-rc.d chefhasmonkeypants status")
     end
 
     it "should run the services status command if one has been specified" do
@@ -113,7 +113,7 @@ PS
 
   describe "when we have a 'ps' attribute" do
     it "should shell_out! the node's ps command" do
-      @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
+      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
       @provider.should_receive(:shell_out!).with(@node[:command][:ps]).and_return(@status)
       @provider.load_current_resource
     end
@@ -123,21 +123,21 @@ 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 = mock("Status", :exitstatus => 0, :stdout => @stdout)
+      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
       @provider.should_receive(:shell_out!).and_return(@status)
       @provider.load_current_resource
       @current_resource.running.should be_true
     end
 
     it "should set running to false if the regex doesn't match" do
-      @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
+      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
       @provider.should_receive(: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.action = :start
       @provider.load_current_resource
       @provider.define_resource_requirements

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

@@ -50,12 +50,12 @@ describe Chef::Provider::Service::Macosx do
 
     ["redis-server", "io.redis.redis-server"].each do |service_name|
       before do
-        Dir.stub!(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
-        provider.stub!(:shell_out!).
+        Dir.stub(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
+        provider.stub(:shell_out!).
                  with("launchctl list", {:group => 1001, :user => 101}).
-                 and_return(mock("ouput", :stdout => stdout))
+                 and_return(double("ouput", :stdout => stdout))
 
-        File.stub!(:stat).and_return(mock("stat", :gid => 1001, :uid => 101))
+        File.stub(:stat).and_return(double("stat", :gid => 1001, :uid => 101))
       end
 
       context "#{service_name}" do
@@ -85,7 +85,7 @@ describe Chef::Provider::Service::Macosx do
 
           describe "running unsupported actions" do
             before do
-              Dir.stub!(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
+              Dir.stub(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
             end
             it "should throw an exception when enable action is attempted" do
               lambda {provider.run_action(:enable)}.should raise_error(Chef::Exceptions::UnsupportedAction)
@@ -130,7 +130,7 @@ describe Chef::Provider::Service::Macosx do
 
             context "and plist for service is not available" do
               before do
-                Dir.stub!(:glob).and_return([])
+                Dir.stub(:glob).and_return([])
                 provider.load_current_resource
               end
 
@@ -141,7 +141,7 @@ describe Chef::Provider::Service::Macosx do
 
             context "and plist for service is available" do
               before do
-                Dir.stub!(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
+                Dir.stub(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist"], [])
                 provider.load_current_resource
               end
 
@@ -152,7 +152,7 @@ describe Chef::Provider::Service::Macosx do
 
             describe "and several plists match service name" do
               it "throws exception" do
-                Dir.stub!(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist",
+                Dir.stub(:glob).and_return(["/Users/igor/Library/LaunchAgents/io.redis.redis-server.plist",
                                              "/Users/wtf/something.plist"])
                 provider.load_current_resource
                 provider.define_resource_requirements
@@ -163,20 +163,20 @@ describe Chef::Provider::Service::Macosx do
         end
         describe "#start_service" do
           before do
-            Chef::Resource::Service.stub!(:new).and_return(current_resource)
+            Chef::Resource::Service.stub(:new).and_return(current_resource)
             provider.load_current_resource
-            current_resource.stub!(:running).and_return(false)
+            current_resource.stub(:running).and_return(false)
           end
 
           it "calls the start command if one is specified and service is not running" do
-            new_resource.stub!(:start_command).and_return("cowsay dirty")
+            new_resource.stub(:start_command).and_return("cowsay dirty")
 
             provider.should_receive(:shell_out!).with("cowsay dirty")
             provider.start_service
           end
 
           it "shows warning message if service is already running" do
-            current_resource.stub!(:running).and_return(true)
+            current_resource.stub(:running).and_return(true)
             Chef::Log.should_receive(:debug).with("service[#{service_name}] already running, not starting")
 
             provider.start_service
@@ -194,21 +194,21 @@ describe Chef::Provider::Service::Macosx do
 
         describe "#stop_service" do
           before do
-            Chef::Resource::Service.stub!(:new).and_return(current_resource)
+            Chef::Resource::Service.stub(:new).and_return(current_resource)
 
             provider.load_current_resource
-            current_resource.stub!(:running).and_return(true)
+            current_resource.stub(:running).and_return(true)
           end
 
           it "calls the stop command if one is specified and service is running" do
-            new_resource.stub!(:stop_command).and_return("kill -9 123")
+            new_resource.stub(:stop_command).and_return("kill -9 123")
 
             provider.should_receive(:shell_out!).with("kill -9 123")
             provider.stop_service
           end
 
           it "shows warning message if service is not running" do
-            current_resource.stub!(:running).and_return(false)
+            current_resource.stub(:running).and_return(false)
             Chef::Log.should_receive(:debug).with("service[#{service_name}] not running, not stopping")
 
             provider.stop_service
@@ -226,15 +226,15 @@ describe Chef::Provider::Service::Macosx do
 
         describe "#restart_service" do
           before do
-            Chef::Resource::Service.stub!(:new).and_return(current_resource)
+            Chef::Resource::Service.stub(:new).and_return(current_resource)
 
             provider.load_current_resource
-            current_resource.stub!(:running).and_return(true)
-            provider.stub!(:sleep)
+            current_resource.stub(:running).and_return(true)
+            provider.stub(:sleep)
           end
 
           it "issues a command if given" do
-            new_resource.stub!(:restart_command).and_return("reload that thing")
+            new_resource.stub(:restart_command).and_return("reload that thing")
 
             provider.should_receive(:shell_out!).with("reload that thing")
             provider.restart_service

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

@@ -21,18 +21,18 @@ require 'ostruct'
 
 shared_examples_for "define_resource_requirements_common" do
   it "should raise an error if /sbin/chkconfig does not exist" do
-    File.stub!(:exists?).with("/sbin/chkconfig").and_return(false)
-    @provider.stub!(:shell_out).with("/sbin/service chef status").and_raise(Errno::ENOENT)
-    @provider.stub!(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_raise(Errno::ENOENT)
+    File.stub(:exists?).with("/sbin/chkconfig").and_return(false)
+    @provider.stub(:shell_out).with("/sbin/service chef status").and_raise(Errno::ENOENT)
+    @provider.stub(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_raise(Errno::ENOENT)
     @provider.load_current_resource
     @provider.define_resource_requirements
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end
 
   it "should not raise an error if the service exists but is not added to any runlevels" do
-    status = mock("Status", :exitstatus => 0, :stdout => "" , :stderr => "")
+    status = double("Status", :exitstatus => 0, :stdout => "" , :stderr => "")
     @provider.should_receive(:shell_out).with("/sbin/service chef status").and_return(status)
-    chkconfig = mock("Chkconfig", :exitstatus => 0, :stdout => "", :stderr => "service chef supports chkconfig, but is not referenced in any runlevel (run 'chkconfig --add chef')")
+    chkconfig = double("Chkconfig", :exitstatus => 0, :stdout => "", :stderr => "service chef supports chkconfig, but is not referenced in any runlevel (run 'chkconfig --add chef')")
     @provider.should_receive(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_return(chkconfig)
     @provider.load_current_resource
     @provider.define_resource_requirements
@@ -54,8 +54,8 @@ describe "Chef::Provider::Service::Redhat" do
 
     @provider = Chef::Provider::Service::Redhat.new(@new_resource, @run_context)
     @provider.action = :start
-    Chef::Resource::Service.stub!(:new).and_return(@current_resource)
-    File.stub!(:exists?).with("/sbin/chkconfig").and_return(true)
+    Chef::Resource::Service.stub(:new).and_return(@current_resource)
+    File.stub(:exists?).with("/sbin/chkconfig").and_return(true)
   end
 
   describe "while not in why run mode" do
@@ -65,9 +65,9 @@ describe "Chef::Provider::Service::Redhat" do
 
     describe "load current resource" do
       it "sets the current enabled status to true if the service is enabled for any run level" do
-        status = mock("Status", :exitstatus => 0, :stdout => "" , :stderr => "")
+        status = double("Status", :exitstatus => 0, :stdout => "" , :stderr => "")
         @provider.should_receive(:shell_out).with("/sbin/service chef status").and_return(status)
-        chkconfig = mock("Chkconfig", :exitstatus => 0, :stdout => "chef    0:off   1:off   2:off   3:off   4:off   5:on  6:off", :stderr => "")
+        chkconfig = double("Chkconfig", :exitstatus => 0, :stdout => "chef    0:off   1:off   2:off   3:off   4:off   5:on  6:off", :stderr => "")
         @provider.should_receive(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_return(chkconfig)
         @provider.instance_variable_get("@service_missing").should be_false
         @provider.load_current_resource
@@ -75,9 +75,9 @@ describe "Chef::Provider::Service::Redhat" do
       end
 
       it "sets the current enabled status to false if the regex does not match" do
-        status = mock("Status", :exitstatus => 0, :stdout => "" , :stderr => "")
+        status = double("Status", :exitstatus => 0, :stdout => "" , :stderr => "")
         @provider.should_receive(:shell_out).with("/sbin/service chef status").and_return(status)
-        chkconfig = mock("Chkconfig", :exitstatus => 0, :stdout => "chef    0:off   1:off   2:off   3:off   4:off   5:off   6:off", :stderr => "")
+        chkconfig = double("Chkconfig", :exitstatus => 0, :stdout => "chef    0:off   1:off   2:off   3:off   4:off   5:off   6:off", :stderr => "")
         @provider.should_receive(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_return(chkconfig)
         @provider.instance_variable_get("@service_missing").should be_false
         @provider.load_current_resource.should eql(@current_resource)
@@ -90,9 +90,9 @@ describe "Chef::Provider::Service::Redhat" do
 
       context "when the service does not exist" do
         before do
-          status = mock("Status", :exitstatus => 1, :stdout => "", :stderr => "chef: unrecognized service")
+          status = double("Status", :exitstatus => 1, :stdout => "", :stderr => "chef: unrecognized service")
           @provider.should_receive(:shell_out).with("/sbin/service chef status").and_return(status)
-          chkconfig = mock("Chkconfig", :existatus=> 1, :stdout => "", :stderr => "error reading information on service chef: No such file or directory")
+          chkconfig = double("Chkconfig", :existatus=> 1, :stdout => "", :stderr => "error reading information on service chef: No such file or directory")
           @provider.should_receive(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_return(chkconfig)
           @provider.load_current_resource
           @provider.define_resource_requirements
@@ -128,9 +128,9 @@ describe "Chef::Provider::Service::Redhat" do
       it_should_behave_like "define_resource_requirements_common"
 
       it "should not raise an error if the service does not exist" do
-        status = mock("Status", :exitstatus => 1, :stdout => "", :stderr => "chef: unrecognized service")
+        status = double("Status", :exitstatus => 1, :stdout => "", :stderr => "chef: unrecognized service")
         @provider.should_receive(:shell_out).with("/sbin/service chef status").and_return(status)
-        chkconfig = mock("Chkconfig", :existatus=> 1, :stdout => "", :stderr => "error reading information on service chef: No such file or directory")
+        chkconfig = double("Chkconfig", :existatus=> 1, :stdout => "", :stderr => "error reading information on service chef: No such file or directory")
         @provider.should_receive(:shell_out!).with("/sbin/chkconfig --list chef", :returns => [0,1]).and_return(chkconfig)
         @provider.load_current_resource
         @provider.define_resource_requirements

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

@@ -29,15 +29,15 @@ describe Chef::Provider::Service::Simple, "load_current_resource" do
     @current_resource = Chef::Resource::Service.new("chef")
 
     @provider = Chef::Provider::Service::Simple.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(<<-NOMOCKINGSTRINGSPLZ)
 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 simple_service_spec.rb
 NOMOCKINGSTRINGSPLZ
-    @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
@@ -69,7 +69,7 @@ NOMOCKINGSTRINGSPLZ
     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
@@ -79,20 +79,20 @@ NOMOCKINGSTRINGSPLZ
 aj        7842  5057  0 21:26 pts/2    00:00:06 chef
 aj        7842  5057  0 21:26 pts/2    00:00:06 poos
 NOMOCKINGSTRINGSPLZ
-      @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)
       @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.action = :start
       @provider.load_current_resource
       @provider.define_resource_requirements
@@ -108,7 +108,7 @@ NOMOCKINGSTRINGSPLZ
 
   describe "when starting the service" do
     it "should call the start command if one is specified" do
-      @new_resource.stub!(:start_command).and_return("#{@new_resource.start_command}")
+      @new_resource.stub(:start_command).and_return("#{@new_resource.start_command}")
       @provider.should_receive(:shell_out!).with("#{@new_resource.start_command}")
       @provider.start_service()
     end

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

@@ -29,16 +29,16 @@ describe Chef::Provider::Service::Solaris do
     @current_resource = Chef::Resource::Service.new('chef')
 
     @provider = Chef::Provider::Service::Solaris.new(@new_resource, @run_context)
-    Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+    Chef::Resource::Service.stub(:new).and_return(@current_resource)
 
     @stdin = StringIO.new
     @stdout = StringIO.new
     @stderr = StringIO.new
     @pid = 2342
     @stdout_string = "state disabled"
-    @stdout.stub!(:gets).and_return(@stdout_string)
-    @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
-    @provider.stub!(:shell_out!).and_return(@status)
+    @stdout.stub(:gets).and_return(@stdout_string)
+    @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+    @provider.stub(:shell_out!).and_return(@status)
   end
 
   it "should raise an error if /bin/svcs does not exist" do
@@ -49,19 +49,19 @@ describe Chef::Provider::Service::Solaris do
   describe "on a host with /bin/svcs" do
 
     before do
-      File.stub!(:exists?).with('/bin/svcs').and_return(true)
+      File.stub(:exists?).with('/bin/svcs').and_return(true)
     end
 
     describe "when discovering the current service state" do
       it "should create a current resource with the name of the new resource" do
-        @provider.stub!(:popen4).with("/bin/svcs -l chef").and_return(@status)
+        @provider.stub(:popen4).with("/bin/svcs -l chef").and_return(@status)
         Chef::Resource::Service.should_receive(:new).and_return(@current_resource)
         @provider.load_current_resource
       end
 
 
       it "should return the current resource" do
-        @provider.stub!(:popen4).with("/bin/svcs -l chef").and_return(@status)
+        @provider.stub(:popen4).with("/bin/svcs -l chef").and_return(@status)
         @provider.load_current_resource.should eql(@current_resource)
       end
 
@@ -71,14 +71,14 @@ describe Chef::Provider::Service::Solaris do
       end
 
       it "should mark service as not running" 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(:running).with(false)
         @provider.load_current_resource
       end
 
       it "should mark service as running" do
-        @stdout.stub!(:each).and_yield("state online")
-        @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+        @stdout.stub(:each).and_yield("state online")
+        @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
         @current_resource.should_receive(:running).with(true)
         @provider.load_current_resource
       end
@@ -91,14 +91,14 @@ describe Chef::Provider::Service::Solaris do
       end
 
       it "should call svcadm enable -s chef" do
-        @new_resource.stub!(:enable_command).and_return("#{@new_resource.enable_command}")
+        @new_resource.stub(:enable_command).and_return("#{@new_resource.enable_command}")
         @provider.should_receive(:shell_out!).with("/usr/sbin/svcadm enable -s #{@current_resource.service_name}").and_return(@status)
 				@provider.enable_service.should be_true
         @current_resource.enabled.should be_true
       end
 
       it "should call svcadm enable -s chef for start_service" do
-        @new_resource.stub!(:start_command).and_return("#{@new_resource.start_command}")
+        @new_resource.stub(:start_command).and_return("#{@new_resource.start_command}")
         @provider.should_receive(:shell_out!).with("/usr/sbin/svcadm enable -s #{@current_resource.service_name}").and_return(@status)
         @provider.start_service.should be_true
         @current_resource.enabled.should be_true
@@ -129,7 +129,7 @@ describe Chef::Provider::Service::Solaris do
 
     describe "when reloading the service" do
       before(:each) do
-        @status = mock("Process::Status", :exitstatus => 0)
+        @status = double("Process::Status", :exitstatus => 0)
         @provider.current_resource = @current_resource
       end