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

data/spec/unit/run_list/run_list_expansion_spec.rb

@@ -66,7 +66,7 @@ describe Chef::RunList::RunListExpansion do
 
   describe "after applying a role" do
     before do
-      @expansion.stub!(:fetch_role).and_return(Chef::Role.new)
+      @expansion.stub(:fetch_role).and_return(Chef::Role.new)
       @expansion.inflate_role('rage', "role[base]")
     end
 
@@ -89,7 +89,7 @@ describe Chef::RunList::RunListExpansion do
       @second_role.run_list('recipe[crabrevenge]')
       @second_role.default_attributes({'foo' => 'boo'})
       @second_role.override_attributes({'baz' => 'bux'})
-      @expansion.stub!(:fetch_role).and_return(@first_role, @second_role)
+      @expansion.stub(:fetch_role).and_return(@first_role, @second_role)
       @expansion.expand
     end
 
@@ -111,7 +111,7 @@ describe Chef::RunList::RunListExpansion do
 
   describe "after expanding a run list with a non existant role" do
     before do
-      @expansion.stub!(:fetch_role) { @expansion.role_not_found('crabrevenge', "role[base]") }
+      @expansion.stub(:fetch_role) { @expansion.role_not_found('crabrevenge', "role[base]") }
       @expansion.expand
     end
 

data/spec/unit/run_list_spec.rb

@@ -173,9 +173,9 @@ describe Chef::RunList do
       @role.default_attributes :one => :two
       @role.override_attributes :three => :four
 
-      Chef::Role.stub!(:load).and_return(@role)
-      @rest = mock("Chef::REST", { :get_rest => @role, :url => "/" })
-      Chef::REST.stub!(:new).and_return(@rest)
+      Chef::Role.stub(:load).and_return(@role)
+      @rest = double("Chef::REST", { :get_rest => @role, :url => "/" })
+      Chef::REST.stub(:new).and_return(@rest)
 
       @run_list << "role[stubby]"
       @run_list << "kitty"
@@ -188,7 +188,7 @@ describe Chef::RunList do
       end
 
       it "should log a helpful error if the role is not available" do
-        Chef::Role.stub!(:from_disk).and_raise(Chef::Exceptions::RoleNotFound)
+        Chef::Role.stub(:from_disk).and_raise(Chef::Exceptions::RoleNotFound)
         Chef::Log.should_receive(:error).with("Role stubby (included by 'top level') is in the runlist but does not exist. Skipping expand.")
         @run_list.expand("_default", "disk")
       end
@@ -218,7 +218,7 @@ describe Chef::RunList do
 
         describe "and multiply nested roles" do
           before do
-            @multiple_rest_requests = mock("Chef::REST")
+            @multiple_rest_requests = double("Chef::REST")
 
             @role.env_run_list["production"] << "role[prod-base]"
 
@@ -233,7 +233,7 @@ describe Chef::RunList do
           end
 
           it "expands the run list using the specified environment for all nested roles" do
-            Chef::REST.stub!(:new).and_return(@multiple_rest_requests)
+            Chef::REST.stub(:new).and_return(@multiple_rest_requests)
             @multiple_rest_requests.should_receive(:get_rest).with("roles/stubby").and_return(@role)
             @multiple_rest_requests.should_receive(:get_rest).with("roles/prod-base").and_return(@role_prod_base)
             @multiple_rest_requests.should_receive(:get_rest).with("roles/nested-deeper").and_return(@role_nested_deeper)
@@ -270,8 +270,8 @@ describe Chef::RunList do
       dog.default_attributes :seven => :nine
       dog.run_list "three"
       @role.run_list << "role[dog]"
-      Chef::Role.stub!(:from_disk).with("stubby").and_return(@role)
-      Chef::Role.stub!(:from_disk).with("dog").and_return(dog)
+      Chef::Role.stub(:from_disk).with("stubby").and_return(@role)
+      Chef::Role.stub(:from_disk).with("dog").and_return(dog)
 
       expansion = @run_list.expand("_default", 'disk')
       expansion.recipes[2].should == "three"
@@ -284,7 +284,7 @@ describe Chef::RunList do
       dog.default_attributes :seven => :nine
       dog.run_list "role[dog]", "three"
       @role.run_list << "role[dog]"
-      Chef::Role.stub!(:from_disk).with("stubby").and_return(@role)
+      Chef::Role.stub(:from_disk).with("stubby").and_return(@role)
       Chef::Role.should_receive(:from_disk).with("dog").once.and_return(dog)
 
       expansion = @run_list.expand("_default", 'disk')

data/spec/unit/run_status_spec.rb

@@ -55,7 +55,7 @@ describe Chef::RunStatus do
       before do
         @start_time = Time.new
         @end_time = @start_time + 23
-        Time.stub!(:now).and_return(@start_time, @end_time)
+        Time.stub(:now).and_return(@start_time, @end_time)
         @run_status.start_clock
         @run_status.stop_clock
       end

data/spec/unit/runner_spec.rb

@@ -125,24 +125,24 @@ describe Chef::Runner do
 
   it "should raise exceptions as thrown by a provider" do
     provider = Chef::Provider::SnakeOil.new(@run_context.resource_collection[0], @run_context)
-    Chef::Provider::SnakeOil.stub!(:new).once.and_return(provider)
-    provider.stub!(:action_sell).once.and_raise(ArgumentError)
+    Chef::Provider::SnakeOil.stub(:new).once.and_return(provider)
+    provider.stub(:action_sell).once.and_raise(ArgumentError)
     lambda { @runner.converge }.should raise_error(ArgumentError)
   end
 
   it "should not raise exceptions thrown by providers if the resource has ignore_failure set to true" do
-    @run_context.resource_collection[0].stub!(:ignore_failure).and_return(true)
+    @run_context.resource_collection[0].stub(:ignore_failure).and_return(true)
     provider = Chef::Provider::SnakeOil.new(@run_context.resource_collection[0], @run_context)
-    Chef::Provider::SnakeOil.stub!(:new).once.and_return(provider)
-    provider.stub!(:action_sell).once.and_raise(ArgumentError)
-    lambda { @runner.converge }.should_not raise_error(ArgumentError)
+    Chef::Provider::SnakeOil.stub(:new).once.and_return(provider)
+    provider.stub(:action_sell).once.and_raise(ArgumentError)
+    lambda { @runner.converge }.should_not raise_error
   end
 
   it "should retry with the specified delay if retries are specified" do
     @first_resource.retries 3
     provider = Chef::Provider::SnakeOil.new(@run_context.resource_collection[0], @run_context)
-    Chef::Provider::SnakeOil.stub!(:new).once.and_return(provider)
-    provider.stub!(:action_sell).and_raise(ArgumentError)
+    Chef::Provider::SnakeOil.stub(:new).once.and_return(provider)
+    provider.stub(:action_sell).and_raise(ArgumentError)
     @first_resource.should_receive(:sleep).with(2).exactly(3).times
     lambda { @runner.converge }.should raise_error(ArgumentError)
   end

data/spec/unit/scan_access_control_spec.rb

@@ -49,7 +49,7 @@ describe Chef::ScanAccessControl do
   describe "when the fs entity exists" do
 
     before do
-      @stat = mock("File::Stat for #{@new_resource.path}", :uid => 0, :gid => 0, :mode => 00100644)
+      @stat = double("File::Stat for #{@new_resource.path}", :uid => 0, :gid => 0, :mode => 00100644)
       File.should_receive(:realpath).with(@new_resource.path).and_return(@real_file)
       File.should_receive(:stat).with(@real_file).and_return(@stat)
       File.should_receive(:exist?).with(@new_resource.path).and_return(true)
@@ -128,7 +128,7 @@ describe Chef::ScanAccessControl do
       end
 
       it "sets the owner of current_resource to the username of the current owner" do
-        @root_passwd = mock("Struct::Passwd for uid 0", :name => "root")
+        @root_passwd = double("Struct::Passwd for uid 0", :name => "root")
         Etc.should_receive(:getpwuid).with(0).and_return(@root_passwd)
         @scanner.set_all!
 
@@ -163,7 +163,7 @@ describe Chef::ScanAccessControl do
       end
 
       it "sets the group of the current resource to the group name" do
-        @group_entry = mock("Struct::Group for wheel", :name => "wheel")
+        @group_entry = double("Struct::Group for wheel", :name => "wheel")
         Etc.should_receive(:getgrgid).with(0).and_return(@group_entry)
         @scanner.set_all!
 

data/spec/unit/search/query_spec.rb

@@ -21,8 +21,8 @@ require 'chef/search/query'
 
 describe Chef::Search::Query do
   before(:each) do
-    @rest = mock("Chef::REST")
-    Chef::REST.stub!(:new).and_return(@rest)
+    @rest = double("Chef::REST")
+    Chef::REST.stub(:new).and_return(@rest)
     @query = Chef::Search::Query.new
   end
 
@@ -38,12 +38,12 @@ describe Chef::Search::Query do
         "start" => 0,
         "total" => 4
       }
-      @rest.stub!(:get_rest).and_return(@response)
+      @rest.stub(:get_rest).and_return(@response)
     end
 
     it "should accept a type as the first argument" do
-      lambda { @query.search("foo") }.should_not raise_error(ArgumentError)
-      lambda { @query.search(:foo) }.should_not raise_error(ArgumentError)
+      lambda { @query.search("foo") }.should_not raise_error
+      lambda { @query.search(:foo) }.should_not raise_error
       lambda { @query.search(Hash.new) }.should raise_error(ArgumentError)
     end
 
@@ -85,13 +85,13 @@ describe Chef::Search::Query do
     end
 
     it "should call a block for each object in the response" do
-      @call_me = mock("blocky")
+      @call_me = double("blocky")
       @response["rows"].each { |r| @call_me.should_receive(:do).with(r) }
       @query.search(:foo) { |r| @call_me.do(r) }
     end
 
     it "should page through the responses" do
-      @call_me = mock("blocky")
+      @call_me = double("blocky")
       @response["rows"].each { |r| @call_me.should_receive(:do).with(r) }
       @query.search(:foo, "*:*", nil, 0, 1) { |r| @call_me.do(r) }
     end

data/spec/unit/shell/model_wrapper_spec.rb

@@ -71,8 +71,8 @@ describe Shell::ModelWrapper do
       @wrapper = Shell::ModelWrapper.new(Chef::Node)
 
       # Creating a Chef::Search::Query object tries to read the private key...
-      @searcher = mock("Chef::Search::Query #{__FILE__}:#{__LINE__}")
-      Chef::Search::Query.stub!(:new).and_return(@searcher)
+      @searcher = double("Chef::Search::Query #{__FILE__}:#{__LINE__}")
+      Chef::Search::Query.stub(:new).and_return(@searcher)
     end
 
     it "falls back to listing the objects when the 'query' is :all" do

data/spec/unit/shell/shell_ext_spec.rb

@@ -23,21 +23,21 @@ describe Shell::Extensions do
 
     before do
       @shell_client = TestableShellSession.instance
-      Shell.stub!(:session).and_return(@shell_client)
+      Shell.stub(:session).and_return(@shell_client)
       @job_manager = TestJobManager.new
       @root_context = Object.new
       @root_context.instance_eval(&ObjectTestHarness)
       Shell::Extensions.extend_context_object(@root_context)
-      @root_context.conf = mock("irbconf")
+      @root_context.conf = double("irbconf")
     end
 
     it "finds a subsession in irb for an object" do
       target_context_obj = Chef::Node.new
 
-      irb_context = mock("context", :main => target_context_obj)
-      irb_session = mock("irb session", :context => irb_context)
+      irb_context = double("context", :main => target_context_obj)
+      irb_session = double("irb session", :context => irb_context)
       @job_manager.jobs = [[:thread, irb_session]]
-      @root_context.stub!(:jobs).and_return(@job_manager)
+      @root_context.stub(:jobs).and_return(@job_manager)
       @root_context.ensure_session_select_defined
       @root_context.jobs.select_shell_session(target_context_obj).should == irb_session
       @root_context.jobs.select_shell_session(:idontexist).should be_nil
@@ -45,8 +45,8 @@ describe Shell::Extensions do
 
     it "finds, then switches to a session" do
       @job_manager.jobs = []
-      @root_context.stub!(:ensure_session_select_defined)
-      @root_context.stub!(:jobs).and_return(@job_manager)
+      @root_context.stub(:ensure_session_select_defined)
+      @root_context.stub(:jobs).and_return(@job_manager)
       @job_manager.should_receive(:select_shell_session).and_return(:the_shell_session)
       @job_manager.should_receive(:switch).with(:the_shell_session)
       @root_context.find_or_create_session_for(:foo)
@@ -54,8 +54,8 @@ describe Shell::Extensions do
 
     it "creates a new session if an existing one isn't found" do
       @job_manager.jobs = []
-      @root_context.stub!(:jobs).and_return(@job_manager)
-      @job_manager.stub!(:select_shell_session).and_return(nil)
+      @root_context.stub(:jobs).and_return(@job_manager)
+      @job_manager.stub(:select_shell_session).and_return(nil)
       @root_context.should_receive(:irb).with(:foo)
       @root_context.find_or_create_session_for(:foo)
     end
@@ -81,18 +81,18 @@ describe Shell::Extensions do
     it "turns irb tracing on and off" do
       @root_context.should respond_to(:trace)
       @root_context.conf.should_receive(:use_tracer=).with(true)
-      @root_context.stub!(:tracing?)
+      @root_context.stub(:tracing?)
       @root_context.tracing :on
     end
 
     it "says if tracing is on or off" do
-      @root_context.conf.stub!(:use_tracer).and_return(true)
+      @root_context.conf.stub(:use_tracer).and_return(true)
       @root_context.should_receive(:puts).with("tracing is on")
       @root_context.tracing?
     end
 
     it "prints node attributes" do
-      node = mock("node", :attribute => {:foo => :bar})
+      node = double("node", :attribute => {:foo => :bar})
       @shell_client.node = node
       @root_context.should_receive(:pp).with({:foo => :bar})
       @root_context.ohai
@@ -111,14 +111,14 @@ describe Shell::Extensions do
     end
 
     it "says if echo is on or off" do
-      @root_context.conf.stub!(:echo).and_return(true)
+      @root_context.conf.stub(:echo).and_return(true)
       @root_context.should_receive(:puts).with("echo is on")
       @root_context.echo?
     end
 
     it "gives access to the stepable iterator" do
-      Shell::StandAloneSession.instance.stub!(:reset!)
-      Shell.session.stub!(:rebuild_context)
+      Shell::StandAloneSession.instance.stub(:reset!)
+      Shell.session.stub(:rebuild_context)
       events = Chef::EventDispatch::Dispatcher.new
       run_context = Chef::RunContext.new(Chef::Node.new, {}, events)
       run_context.resource_collection.instance_variable_set(:@iterator, :the_iterator)

data/spec/unit/shell/shell_session_spec.rb

@@ -52,7 +52,7 @@ describe Shell::ClientSession do
     @session = Shell::ClientSession.instance
     @node = Chef::Node.build("foo")
     @session.node = @node
-    @session.instance_variable_set(:@client, stub(:sync_cookbooks => {}))
+    @session.instance_variable_set(:@client, double(:sync_cookbooks => {}))
     @expansion = Chef::RunList::RunListExpansion.new(@node.chef_environment, [])
 
     @node.run_list.should_receive(:expand).with(@node.chef_environment).and_return(@expansion)
@@ -87,9 +87,9 @@ describe Shell::StandAloneSession do
   end
 
   it "runs chef with the standalone recipe" do
-    @session.stub!(:node_built?).and_return(true)
-    Chef::Log.stub!(:level)
-    chef_runner = mock("Chef::Runner.new", :converge => :converged)
+    @session.stub(:node_built?).and_return(true)
+    Chef::Log.stub(:level)
+    chef_runner = double("Chef::Runner.new", :converge => :converged)
     # pre-heat resource collection cache
     @session.resource_collection
 
@@ -116,7 +116,7 @@ describe Shell::SoloSession do
   end
 
   it "returns a collection based on it's compilation object and the extra recipe provided by chef-shell" do
-    @session.stub!(:node_built?).and_return(true)
+    @session.stub(:node_built?).and_return(true)
     kitteh = Chef::Resource::Cat.new("keyboard")
     @recipe.run_context.resource_collection << kitteh
     @session.resource_collection.should include(kitteh)
@@ -133,7 +133,7 @@ describe Shell::SoloSession do
   end
 
   it "generates its resource collection from the compiled cookbooks and the ad hoc recipe" do
-    @session.stub!(:node_built?).and_return(true)
+    @session.stub(:node_built?).and_return(true)
     kitteh_cat = Chef::Resource::Cat.new("kitteh")
     @run_context.resource_collection << kitteh_cat
     keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
@@ -143,9 +143,9 @@ describe Shell::SoloSession do
   end
 
   it "runs chef with a resource collection from the compiled cookbooks" do
-    @session.stub!(:node_built?).and_return(true)
-    Chef::Log.stub!(:level)
-    chef_runner = mock("Chef::Runner.new", :converge => :converged)
+    @session.stub(:node_built?).and_return(true)
+    Chef::Log.stub(:level)
+    chef_runner = double("Chef::Runner.new", :converge => :converged)
     Chef::Runner.should_receive(:new).with(an_instance_of(Chef::RunContext)).and_return(chef_runner)
 
     @recipe.run_chef.should == :converged

data/spec/unit/shell_spec.rb

@@ -42,8 +42,7 @@ describe Shell do
 
   before do
     Shell.irb_conf = {}
-    Shell::ShellSession.instance.rspec_reset
-    Shell::ShellSession.instance.stub!(:reset!)
+    Shell::ShellSession.instance.stub(:reset!)
   end
 
   describe "reporting its status" do

data/spec/unit/user_spec.rb

@@ -196,8 +196,8 @@ describe Chef::User do
     before (:each) do
       @user = Chef::User.new
       @user.name "foobar"
-      @http_client = mock("Chef::REST mock")
-      Chef::REST.stub!(:new).and_return(@http_client)
+      @http_client = double("Chef::REST mock")
+      Chef::REST.stub(:new).and_return(@http_client)
     end
 
     describe "list" do
@@ -208,12 +208,12 @@ describe Chef::User do
       end
 
       it "lists all clients on an OSC server" do
-        @http_client.stub!(:get_rest).with("users").and_return(@osc_response)
+        @http_client.stub(:get_rest).with("users").and_return(@osc_response)
         Chef::User.list.should == @osc_response
       end
 
       it "lists all clients on an OHC/OPC server" do
-        @http_client.stub!(:get_rest).with("users").and_return(@ohc_response)
+        @http_client.stub(:get_rest).with("users").and_return(@ohc_response)
         # We expect that Chef::User.list will give a consistent response
         # so OHC API responses should be transformed to OSC-style output.
         Chef::User.list.should == @osc_response

data/spec/unit/util/backup_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Util::Backup do
   end
 
   before(:each) do
-    @new_resource = mock("new_resource")
+    @new_resource = double("new_resource")
     @new_resource.should_receive(:path).at_least(:once).and_return(tempfile.path)
     @backup = Chef::Util::Backup.new(@new_resource)
   end

data/spec/unit/util/selinux_spec.rb

@@ -53,7 +53,7 @@ describe Chef::Util::Selinux do
   describe "when selinuxenabled binary exists" do
     before do
       @selinux_enabled_path = File.join("/sbin", "selinuxenabled")
-      File.stub!(:executable?) do |file_path|
+      File.stub(:executable?) do |file_path|
         file_path.end_with?("selinuxenabled").should be_true
         file_path == @selinux_enabled_path
       end
@@ -61,7 +61,7 @@ describe Chef::Util::Selinux do
 
     describe "when selinux is enabled" do
       before do
-        cmd_result = mock("Cmd Result", :exitstatus => 0)
+        cmd_result = double("Cmd Result", :exitstatus => 0)
         @test_instance.should_receive(:shell_out!).once.with(@selinux_enabled_path, {:returns=>[0, 1]}).and_return(cmd_result)
       end
 
@@ -74,7 +74,7 @@ describe Chef::Util::Selinux do
 
     describe "when selinux is disabled" do
       before do
-        cmd_result = mock("Cmd Result", :exitstatus => 1)
+        cmd_result = double("Cmd Result", :exitstatus => 1)
         @test_instance.should_receive(:shell_out!).once.with(@selinux_enabled_path, {:returns=>[0, 1]}).and_return(cmd_result)
       end
 
@@ -87,7 +87,7 @@ describe Chef::Util::Selinux do
 
     describe "when selinux gives an unexpected status" do
       before do
-        cmd_result = mock("Cmd Result", :exitstatus => 101)
+        cmd_result = double("Cmd Result", :exitstatus => 101)
         @test_instance.should_receive(:shell_out!).once.with(@selinux_enabled_path, {:returns=>[0, 1]}).and_return(cmd_result)
       end
 
@@ -99,7 +99,7 @@ describe Chef::Util::Selinux do
 
   describe "when selinuxenabled binary doesn't exist" do
     before do
-      File.stub!(:executable?) do |file_path|
+      File.stub(:executable?) do |file_path|
         file_path.end_with?("selinuxenabled").should be_true
         false
       end
@@ -118,7 +118,7 @@ describe Chef::Util::Selinux do
 
     before do
       @restorecon_enabled_path = File.join("/sbin", "restorecon")
-      File.stub!(:executable?) do |file_path|
+      File.stub(:executable?) do |file_path|
         file_path.end_with?("restorecon").should be_true
         file_path == @restorecon_enabled_path
       end
@@ -150,7 +150,7 @@ describe Chef::Util::Selinux do
 
     describe "when restorecon doesn't exist on the system" do
       before do
-        File.stub!(:executable?) do |file_path|
+        File.stub(:executable?) do |file_path|
           file_path.end_with?("restorecon").should be_true
           false
         end