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

data/spec/unit/provider/service_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Provider::Service do
 
     @provider = Chef::Provider::Service.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
-    @provider.stub!(:load_current_resource)
+    @provider.stub(:load_current_resource)
   end
 
   describe "when enabling the service" do
@@ -52,14 +52,14 @@ describe Chef::Provider::Service do
 
   describe "when disabling the service" do
     it "should disable the service if enabled and set the resource as updated" do
-      @current_resource.stub!(:enabled).and_return(true)
+      @current_resource.stub(:enabled).and_return(true)
       @provider.should_receive(:disable_service).and_return(true)
       @provider.run_action(:disable)
       @provider.new_resource.should be_updated
     end
 
     it "should not disable the service if already disabled" do
-      @current_resource.stub!(:enabled).and_return(false)
+      @current_resource.stub(:enabled).and_return(false)
       @provider.should_not_receive(:disable_service)
       @provider.run_action(:disable)
       @provider.new_resource.should_not be_updated
@@ -84,14 +84,14 @@ describe Chef::Provider::Service do
 
   describe "action_stop" do
     it "should stop the service if it is running and set the resource as updated" do
-      @current_resource.stub!(:running).and_return(true)
+      @current_resource.stub(:running).and_return(true)
       @provider.should_receive(:stop_service).and_return(true)
       @provider.run_action(:stop)
       @provider.new_resource.should be_updated
     end
 
     it "should not stop the service if it's already stopped" do
-      @current_resource.stub!(:running).and_return(false)
+      @current_resource.stub(:running).and_return(false)
       @provider.should_not_receive(:stop_service)
       @provider.run_action(:stop)
       @provider.new_resource.should_not be_updated
@@ -110,7 +110,7 @@ describe Chef::Provider::Service do
     end
 
     it "should restart the service even if it isn't running and set the resource as updated" do
-      @current_resource.stub!(:running).and_return(false)
+      @current_resource.stub(:running).and_return(false)
       @provider.should_receive(:restart_service).and_return(true)
       @provider.run_action(:restart)
       @provider.new_resource.should be_updated
@@ -124,19 +124,19 @@ describe Chef::Provider::Service do
 
     it "should raise an exception if reload isn't supported" do
       @new_resource.supports(:reload => false)
-      @new_resource.stub!(:reload_command).and_return(false)
+      @new_resource.stub(:reload_command).and_return(false)
       lambda { @provider.run_action(:reload) }.should raise_error(Chef::Exceptions::UnsupportedAction)
     end
 
     it "should reload the service if it is running and set the resource as updated" do
-      @current_resource.stub!(:running).and_return(true)
+      @current_resource.stub(:running).and_return(true)
       @provider.should_receive(:reload_service).and_return(true)
       @provider.run_action(:reload)
       @provider.new_resource.should be_updated
     end
 
     it "should not reload the service if it's stopped" do
-      @current_resource.stub!(:running).and_return(false)
+      @current_resource.stub(:running).and_return(false)
       @provider.should_not_receive(:reload_service)
       @provider.run_action(:stop)
       @provider.new_resource.should_not be_updated

data/spec/unit/provider/subversion_spec.rb

@@ -43,9 +43,9 @@ describe Chef::Provider::Subversion do
   context "determining the revision of the currently deployed code" do
 
     before do
-      @stdout = mock("stdout")
-      @stderr = mock("stderr")
-      @exitstatus = mock("exitstatus")
+      @stdout = double("stdout")
+      @stderr = double("stderr")
+      @exitstatus = double("exitstatus")
     end
 
     it "sets the revision to nil if there isn't any deployed code yet" do
@@ -66,9 +66,9 @@ describe Chef::Provider::Subversion do
       ::File.should_receive(:exist?).at_least(1).times.with("/my/deploy/dir/.svn").and_return(true)
       ::File.should_receive(:directory?).with("/my/deploy/dir").and_return(true)
       ::Dir.should_receive(:chdir).with("/my/deploy/dir").and_yield
-      @stdout.stub!(:string).and_return(example_svn_info)
-      @stderr.stub!(:string).and_return("")
-      @exitstatus.stub!(:exitstatus).and_return(0)
+      @stdout.stub(:string).and_return(example_svn_info)
+      @stderr.stub(:string).and_return("")
+      @exitstatus.stub(:exitstatus).and_return(0)
       expected_command = ["svn info", {:cwd=>"/my/deploy/dir"}]
       @provider.should_receive(:popen4).with(*expected_command).
                                         and_yield("no-pid", "no-stdin", @stdout,@stderr).
@@ -81,9 +81,9 @@ describe Chef::Provider::Subversion do
       ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").and_return(true)
       ::File.should_receive(:directory?).with("/my/deploy/dir").and_return(true)
       ::Dir.should_receive(:chdir).with("/my/deploy/dir").and_yield
-      @stdout.stub!(:string).and_return(example_svn_info)
-      @stderr.stub!(:string).and_return("")
-      @exitstatus.stub!(:exitstatus).and_return(1)
+      @stdout.stub(:string).and_return(example_svn_info)
+      @stderr.stub(:string).and_return("")
+      @exitstatus.stub(:exitstatus).and_return(1)
       @provider.should_receive(:popen4).and_yield("no-pid", "no-stdin", @stdout,@stderr).
                                         and_return(@exitstatus)
       @provider.find_current_revision.should be_nil
@@ -99,7 +99,7 @@ describe Chef::Provider::Subversion do
   end
 
   it "creates the current_resource object and sets its revision to the current deployment's revision as long as we're not exporting" do
-    @provider.stub!(:find_current_revision).and_return("11410")
+    @provider.stub(:find_current_revision).and_return("11410")
     @provider.new_resource.instance_variable_set :@action, [:checkout]
     @provider.load_current_resource
     @provider.current_resource.name.should eql(@resource.name)
@@ -109,8 +109,8 @@ describe Chef::Provider::Subversion do
   context "resolving revisions to an integer" do
 
     before do
-      @stdout = mock("stdout")
-      @stderr = mock("stderr")
+      @stdout = double("stdout")
+      @stderr = double("stderr")
       @resource.svn_info_args "--no-auth-cache"
     end
 
@@ -128,11 +128,11 @@ describe Chef::Provider::Subversion do
                           "Last Changed Author: codeninja\n" +
                           "Last Changed Rev: 11410\n" + # Last Changed Rev is preferred to Revision
                           "Last Changed Date: 2009-03-25 06:09:56 -0600 (Wed, 25 Mar 2009)\n\n"
-      exitstatus = mock("exitstatus")
-      exitstatus.stub!(:exitstatus).and_return(0)
+      exitstatus = double("exitstatus")
+      exitstatus.stub(:exitstatus).and_return(0)
       @resource.revision "HEAD"
-      @stdout.stub!(:string).and_return(example_svn_info)
-      @stderr.stub!(:string).and_return("")
+      @stdout.stub(:string).and_return(example_svn_info)
+      @stderr.stub(:string).and_return("")
       expected_command = ["svn info http://svn.example.org/trunk/ --no-auth-cache  -rHEAD", {:cwd=>Dir.tmpdir}]
       @provider.should_receive(:popen4).with(*expected_command).
                                         and_yield("no-pid","no-stdin",@stdout,@stderr).
@@ -142,11 +142,11 @@ describe Chef::Provider::Subversion do
 
     it "returns a helpful message if data from `svn info` can't be parsed" do
       example_svn_info =  "some random text from an error message\n"
-      exitstatus = mock("exitstatus")
-      exitstatus.stub!(:exitstatus).and_return(0)
+      exitstatus = double("exitstatus")
+      exitstatus.stub(:exitstatus).and_return(0)
       @resource.revision "HEAD"
-      @stdout.stub!(:string).and_return(example_svn_info)
-      @stderr.stub!(:string).and_return("")
+      @stdout.stub(:string).and_return(example_svn_info)
+      @stderr.stub(:string).and_return("")
       @provider.should_receive(:popen4).and_yield("no-pid","no-stdin",@stdout,@stderr).
                                         and_return(exitstatus)
       lambda {@provider.revision_int}.should raise_error(RuntimeError, "Could not parse `svn info` data: some random text from an error message")
@@ -197,7 +197,7 @@ describe Chef::Provider::Subversion do
   end
 
   it "runs an export with the --force option" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn export --force -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
     @provider.should_receive(:run_command).with(:command => expected_cmd)
     @provider.run_action(:force_export)
@@ -205,7 +205,7 @@ describe Chef::Provider::Subversion do
   end
 
   it "runs the checkout command for action_checkout" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn checkout -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
     @provider.should_receive(:run_command).with(:command => expected_cmd)
     @provider.run_action(:checkout)
@@ -217,17 +217,17 @@ describe Chef::Provider::Subversion do
   end
 
   it "should not checkout if the destination exists or is a non empty directory" do
-    ::File.stub!(:exist?).with("/my/deploy/dir/.svn").and_return(false)
-    ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true)
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
-    ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['.','..','foo','bar'])
+    ::File.stub(:exist?).with("/my/deploy/dir/.svn").and_return(false)
+    ::File.stub(:exist?).with("/my/deploy/dir").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
+    ::Dir.stub(:entries).with("/my/deploy/dir").and_return(['.','..','foo','bar'])
     @provider.should_not_receive(:checkout_command)
     @provider.run_action(:checkout)
     @resource.should_not be_updated
   end
 
   it "runs commands with the user and group specified in the resource" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     @resource.user "whois"
     @resource.group "thisis"
     expected_cmd = "svn checkout -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
@@ -237,24 +237,24 @@ describe Chef::Provider::Subversion do
   end
 
   it "does a checkout for action_sync if there's no deploy dir" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").twice.and_return(false)
     @provider.should_receive(:action_checkout)
     @provider.run_action(:sync)
   end
 
   it "does a checkout for action_sync if the deploy dir exists but is empty" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").twice.and_return(false)
     @provider.should_receive(:action_checkout)
     @provider.run_action(:sync)
   end
 
   it "runs the sync_command on action_sync if the deploy dir exists and isn't empty" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").and_return(true)
-    @provider.stub!(:find_current_revision).and_return("11410")
-    @provider.stub!(:current_revision_matches_target_revision?).and_return(false)
+    @provider.stub(:find_current_revision).and_return("11410")
+    @provider.stub(:current_revision_matches_target_revision?).and_return(false)
     expected_cmd = "svn update -q  -r12345 /my/deploy/dir"
     @provider.should_receive(:run_command).with(:command => expected_cmd)
     @provider.run_action(:sync)
@@ -262,16 +262,16 @@ describe Chef::Provider::Subversion do
   end
 
   it "does not fetch any updates if the remote revision matches the current revision" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").and_return(true)
-    @provider.stub!(:find_current_revision).and_return('12345')
-    @provider.stub!(:current_revision_matches_target_revision?).and_return(true)
+    @provider.stub(:find_current_revision).and_return('12345')
+    @provider.stub(:current_revision_matches_target_revision?).and_return(true)
     @provider.run_action(:sync)
     @resource.should_not be_updated
   end
 
   it "runs the export_command on action_export" do
-    ::File.stub!(:directory?).with("/my/deploy").and_return(true)
+    ::File.stub(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn export --force -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
     @provider.should_receive(:run_command).with(:command => expected_cmd)
     @provider.run_action(:export)

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

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Template::Content do
 
   let(:new_resource) do
-    mock("Chef::Resource::Template (new)",
+    double("Chef::Resource::Template (new)",
          :cookbook_name => 'openldap',
          :source => 'openldap_stuff.conf.erb',
          :local => false,
@@ -41,11 +41,11 @@ describe Chef::Provider::Template::Content do
     cl.load_cookbooks
     cookbook_collection = Chef::CookbookCollection.new(cl)
     node = Chef::Node.new
-    mock("Chef::Resource::RunContext", :node => node, :cookbook_collection => cookbook_collection)
+    double("Chef::Resource::RunContext", :node => node, :cookbook_collection => cookbook_collection)
   end
 
   let(:content) do
-    current_resource = mock("Chef::Resource::Template (current)")
+    current_resource = double("Chef::Resource::Template (current)")
     Chef::Provider::Template::Content.new(new_resource, current_resource, run_context)
   end
 
@@ -58,15 +58,15 @@ describe Chef::Provider::Template::Content do
   end
 
   it "finds the template file locally if it is local" do
-    new_resource.stub!(:local).and_return(true)
-    new_resource.stub!(:source).and_return('/tmp/its_on_disk.erb')
+    new_resource.stub(:local).and_return(true)
+    new_resource.stub(:source).and_return('/tmp/its_on_disk.erb')
     content.template_location.should == '/tmp/its_on_disk.erb'
   end
 
   it "should use the cookbook name if defined in the template resource" do
-    new_resource.stub!(:cookbook_name).and_return('apache2')
-    new_resource.stub!(:cookbook).and_return('openldap')
-    new_resource.stub!(:source).and_return("test.erb")
+    new_resource.stub(:cookbook_name).and_return('apache2')
+    new_resource.stub(:cookbook).and_return('openldap')
+    new_resource.stub(:source).and_return("test.erb")
     content.template_location.should == CHEF_SPEC_DATA + '/cookbooks/openldap/templates/default/test.erb'
   end
 

data/spec/unit/provider/template_spec.rb

@@ -50,7 +50,7 @@ describe Chef::Provider::Template do
   end
 
   let(:content) do
-    content = mock('Chef::Provider::File::Content::Template', :template_location => "/foo/bar/baz")
+    content = double('Chef::Provider::File::Content::Template', :template_location => "/foo/bar/baz")
     File.stub(:exists?).with("/foo/bar/baz").and_return(true)
     content
   end

data/spec/unit/provider/user/dscl_spec.rb

@@ -64,7 +64,7 @@ describe Chef::Provider::User::Dscl do
 
   describe "get_free_uid" do
     before do
-      @provider.stub!(:safe_dscl).and_return("\nwheel      200\nstaff      201\n")
+      @provider.stub(:safe_dscl).and_return("\nwheel      200\nstaff      201\n")
     end
 
     it "should run safe_dscl with list /Users uid" do
@@ -84,7 +84,7 @@ describe Chef::Provider::User::Dscl do
 
   describe "uid_used?" do
     before do
-      @provider.stub!(:safe_dscl).and_return("\naj      500\n")
+      @provider.stub(:safe_dscl).and_return("\naj      500\n")
     end
 
     it "should run safe_dscl with list /Users uid" do
@@ -107,7 +107,7 @@ describe Chef::Provider::User::Dscl do
 
   describe "when determining the uid to set" do
     it "raises RequestedUIDUnavailable if the requested uid is already in use" do
-      @provider.stub!(:uid_used?).and_return(true)
+      @provider.stub(:uid_used?).and_return(true)
       @provider.should_receive(:get_free_uid).and_return(501)
       lambda { @provider.set_uid }.should raise_error(Chef::Exceptions::RequestedUIDUnavailable)
     end
@@ -156,8 +156,8 @@ describe Chef::Provider::User::Dscl do
       current_home_files = [current_home + '/my-dot-emacs', current_home + '/my-dot-vim']
       @current_resource.home(current_home)
       @new_resource.gid(23)
-      ::File.stub!(:exists?).with('/old/home/toor').and_return(true)
-      ::File.stub!(:exists?).with('/Users/toor').and_return(true)
+      ::File.stub(:exists?).with('/old/home/toor').and_return(true)
+      ::File.stub(:exists?).with('/Users/toor').and_return(true)
 
       FileUtils.should_receive(:mkdir_p).with('/Users/toor').and_return(true)
       FileUtils.should_receive(:rmdir).with(current_home)
@@ -170,7 +170,7 @@ describe Chef::Provider::User::Dscl do
     end
 
     it "should raise an exception when the systems user template dir (skel) cannot be found" do
-      ::File.stub!(:exists?).and_return(false,false,false)
+      ::File.stub(:exists?).and_return(false,false,false)
       lambda { @provider.modify_home }.should raise_error(Chef::Exceptions::User)
     end
 
@@ -284,7 +284,7 @@ describe Chef::Provider::User::Dscl do
         uuid = "B398449E-CEE0-45E0-80F8-B0B5B1BFDEAA"
         File.should_receive(:open).with('/var/db/shadow/hash/B398449E-CEE0-45E0-80F8-B0B5B1BFDEAA', "w", 384).and_yield(@output)
         @new_resource.password("password")
-        OpenSSL::Random.stub!(:random_bytes).and_return("\377\377\377\377\377\377\377\377")
+        OpenSSL::Random.stub(:random_bytes).and_return("\377\377\377\377\377\377\377\377")
         expected_salted_sha1 = "F"*8+"SHA1-"*8
         expected_shadow_hash = "00000000"*155
         expected_shadow_hash[168] = expected_salted_sha1
@@ -324,8 +324,8 @@ describe Chef::Provider::User::Dscl do
     end
 
     it "shouldn't raise an error if /usr/bin/dscl exists" do
-      ::File.stub!(:exists?).and_return(true)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::User)
+      ::File.stub(:exists?).and_return(true)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
   end
 

data/spec/unit/provider/user/pw_spec.rb

@@ -62,13 +62,13 @@ describe Chef::Provider::User::Pw do
       end
 
       it "should set the option for #{attribute} if the new resources #{attribute} is not null" do
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(attribute).and_return("hola")
         @provider.set_options.should eql(" #{@new_resource.username} #{option} '#{@new_resource.send(attribute)}' -m")
       end
 
       it "should set the option for #{attribute} if the new resources #{attribute} is not null, without homedir management" do
-        @new_resource.stub!(:supports).and_return({:manage_home => false})
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(:supports).and_return({:manage_home => false})
+        @new_resource.stub(attribute).and_return("hola")
         @provider.set_options.should eql(" #{@new_resource.username} #{option} '#{@new_resource.send(attribute)}'")
       end
     end
@@ -76,7 +76,7 @@ describe Chef::Provider::User::Pw do
     it "should combine all the possible options" do
       match_string = " adam"
       field_list.sort{ |a,b| a[0] <=> b[0] }.each do |attribute, option|
-        @new_resource.stub!(attribute).and_return("hola")
+        @new_resource.stub(attribute).and_return("hola")
         match_string << " #{option} 'hola'"
       end
       match_string << " -m"
@@ -86,8 +86,8 @@ describe Chef::Provider::User::Pw do
 
   describe "create_user" do
     before(:each) do
-      @provider.stub!(:run_command).and_return(true)
-      @provider.stub!(:modify_password).and_return(true)
+      @provider.stub(:run_command).and_return(true)
+      @provider.stub(:modify_password).and_return(true)
     end
 
     it "should run pw useradd with the return of set_options" do
@@ -103,8 +103,8 @@ describe Chef::Provider::User::Pw do
 
   describe "manage_user" do
     before(:each) do
-      @provider.stub!(:run_command).and_return(true)
-      @provider.stub!(:modify_password).and_return(true)
+      @provider.stub(:run_command).and_return(true)
+      @provider.stub(:modify_password).and_return(true)
     end
 
     it "should run pw usermod with the return of set_options" do
@@ -133,12 +133,12 @@ describe Chef::Provider::User::Pw do
 
   describe "determining if the user is locked" do
     it "should return true if user is locked" do
-      @current_resource.stub!(:password).and_return("*LOCKED*abracadabra")
+      @current_resource.stub(:password).and_return("*LOCKED*abracadabra")
       @provider.check_lock.should eql(true)
     end
 
     it "should return false if user is not locked" do
-      @current_resource.stub!(:password).and_return("abracadabra")
+      @current_resource.stub(:password).and_return("abracadabra")
       @provider.check_lock.should eql(false)
     end
   end
@@ -159,8 +159,8 @@ describe Chef::Provider::User::Pw do
 
   describe "when modifying the password" do
     before(:each) do
-      @status = mock("Status", :exitstatus => 0)
-      @provider.stub!(:popen4).and_return(@status)
+      @status = double("Status", :exitstatus => 0)
+      @provider.stub(:popen4).and_return(@status)
       @pid, @stdin, @stdout, @stderr = nil, nil, nil, nil
     end
 
@@ -172,8 +172,8 @@ describe Chef::Provider::User::Pw do
 
     describe "and the passwords are identical" do
       before(:each) do
-        @new_resource.stub!(:password).and_return("abracadabra")
-        @current_resource.stub!(:password).and_return("abracadabra")
+        @new_resource.stub(:password).and_return("abracadabra")
+        @current_resource.stub(:password).and_return("abracadabra")
       end
 
       it "logs an appropriate message" do
@@ -184,8 +184,8 @@ describe Chef::Provider::User::Pw do
 
     describe "and the passwords are different" do
       before(:each) do
-        @new_resource.stub!(:password).and_return("abracadabra")
-        @current_resource.stub!(:password).and_return("sesame")
+        @new_resource.stub(:password).and_return("abracadabra")
+        @current_resource.stub(:password).and_return("sesame")
       end
 
       it "should log an appropriate message" do
@@ -200,7 +200,7 @@ describe Chef::Provider::User::Pw do
 
       it "should send the new password to the stdin of pw usermod" do
         @stdin = StringIO.new
-        @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+        @provider.stub(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
         @provider.modify_password
         @stdin.string.should == "abracadabra\n"
       end
@@ -212,7 +212,7 @@ describe Chef::Provider::User::Pw do
 
       it "should not raise an exception if pw usermod succeeds" do
         @status.should_receive(:exitstatus).and_return(0)
-        lambda { @provider.modify_password }.should_not raise_error(Chef::Exceptions::User)
+        lambda { @provider.modify_password }.should_not raise_error
       end
     end
   end
@@ -228,8 +228,8 @@ describe Chef::Provider::User::Pw do
     end
 
     it "shouldn't raise an error if /usr/sbin/pw exists" do
-      File.stub!(:exists?).and_return(true)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::User)
+      File.stub(:exists?).and_return(true)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
   end
 end