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

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -14,7 +14,7 @@ describe Chef::CookbookCacheCleaner do
     end
 
     it "removes all files not validated during the chef run" do
-      file_cache = mock("Chef::FileCache with files from unused cookbooks")
+      file_cache = double("Chef::FileCache with files from unused cookbooks")
       unused_template_files = %w{cookbooks/unused/templates/default/foo.conf.erb cookbooks/unused/tempaltes/default/bar.conf.erb}
       valid_cached_cb_files = %w{cookbooks/valid1/recipes/default.rb cookbooks/valid2/recipes/default.rb}
       @cleaner.mark_file_as_valid('cookbooks/valid1/recipes/default.rb')
@@ -23,7 +23,7 @@ describe Chef::CookbookCacheCleaner do
       file_cache.should_receive(:delete).with('cookbooks/unused/templates/default/foo.conf.erb')
       file_cache.should_receive(:delete).with('cookbooks/unused/tempaltes/default/bar.conf.erb')
       cookbook_hash = {"valid1"=> {}, "valid2" => {}}
-      @cleaner.stub!(:cache).and_return(file_cache)
+      @cleaner.stub(:cache).and_return(file_cache)
       @cleaner.cleanup_file_cache
     end
 
@@ -37,7 +37,7 @@ describe Chef::CookbookCacheCleaner do
       end
 
       it "does not remove anything" do
-        @cleaner.cache.stub!(:find).and_return(%w{cookbooks/valid1/recipes/default.rb cookbooks/valid2/recipes/default.rb})
+        @cleaner.cache.stub(:find).and_return(%w{cookbooks/valid1/recipes/default.rb cookbooks/valid2/recipes/default.rb})
         @cleaner.cache.should_not_receive(:delete)
         @cleaner.cleanup_file_cache
       end
@@ -81,7 +81,7 @@ describe Chef::CookbookSynchronizer do
 
   context "when the cache contains unneeded cookbooks" do
     before do
-      @file_cache = mock("Chef::FileCache with files from unused cookbooks")
+      @file_cache = double("Chef::FileCache with files from unused cookbooks")
       @valid_cached_cb_files = %w{cookbooks/valid1/recipes/default.rb cookbooks/valid2/recipes/default.rb}
       @obsolete_cb_files = %w{cookbooks/old1/recipes/default.rb cookbooks/old2/recipes/default.rb}
 
@@ -94,7 +94,7 @@ describe Chef::CookbookSynchronizer do
       @file_cache.should_receive(:find).with(File.join(%w{cookbooks ** *})).and_return(@valid_cached_cb_files + @obsolete_cb_files)
       @file_cache.should_receive(:delete).with('cookbooks/old1/recipes/default.rb')
       @file_cache.should_receive(:delete).with('cookbooks/old2/recipes/default.rb')
-      @synchronizer.stub!(:cache).and_return(@file_cache)
+      @synchronizer.stub(:cache).and_return(@file_cache)
       @synchronizer.clear_obsoleted_cookbooks
     end
   end
@@ -103,18 +103,18 @@ describe Chef::CookbookSynchronizer do
     before do
       # Would rather not stub out methods on the test subject, but setting up
       # the state is a PITA and tests for this behavior are above.
-      @synchronizer.stub!(:clear_obsoleted_cookbooks)
+      @synchronizer.stub(:clear_obsoleted_cookbooks)
 
-      @server_api = mock("Chef::REST (mock)")
-      @file_cache = mock("Chef::FileCache (mock)")
-      @synchronizer.stub!(:server_api).and_return(@server_api)
-      @synchronizer.stub!(:cache).and_return(@file_cache)
+      @server_api = double("Chef::REST (mock)")
+      @file_cache = double("Chef::FileCache (mock)")
+      @synchronizer.stub(:server_api).and_return(@server_api)
+      @synchronizer.stub(:cache).and_return(@file_cache)
 
 
-      @cookbook_a_default_recipe_tempfile = mock("Tempfile for cookbook_a default.rb recipe",
+      @cookbook_a_default_recipe_tempfile = double("Tempfile for cookbook_a default.rb recipe",
                                                  :path => "/tmp/cookbook_a_recipes_default_rb")
 
-      @cookbook_a_default_attribute_tempfile = mock("Tempfile for cookbook_a default.rb attr file",
+      @cookbook_a_default_attribute_tempfile = double("Tempfile for cookbook_a default.rb attr file",
                                                  :path => "/tmp/cookbook_a_attributes_default_rb")
 
     end
@@ -167,13 +167,13 @@ describe Chef::CookbookSynchronizer do
         before do
           Chef::Config[:no_lazy_load] = true
           @synchronizer = Chef::CookbookSynchronizer.new(@cookbook_manifest, @events)
-          @synchronizer.stub!(:server_api).and_return(@server_api)
-          @synchronizer.stub!(:cache).and_return(@file_cache)
-          @synchronizer.stub!(:clear_obsoleted_cookbooks)
+          @synchronizer.stub(:server_api).and_return(@server_api)
+          @synchronizer.stub(:cache).and_return(@file_cache)
+          @synchronizer.stub(:clear_obsoleted_cookbooks)
 
-          @cookbook_a_file_default_tempfile = mock("Tempfile for cookbook_a megaman.conf file",
+          @cookbook_a_file_default_tempfile = double("Tempfile for cookbook_a megaman.conf file",
                                                      :path => "/tmp/cookbook_a_file_default_tempfile")
-          @cookbook_a_template_default_tempfile = mock("Tempfile for cookbook_a apache.conf.erb template",
+          @cookbook_a_template_default_tempfile = double("Tempfile for cookbook_a apache.conf.erb template",
                                                      :path => "/tmp/cookbook_a_template_default_tempfile")
         end
 

data/spec/unit/daemon_spec.rb

@@ -23,12 +23,12 @@ describe Chef::Daemon do
     if windows?
       mock_struct = #Struct::Passwd.new(nil, nil, 111, 111)
       mock_struct = OpenStruct.new(:uid => 2342, :gid => 2342)
-      Etc.stub!(:getpwnam).and_return mock_struct
-      Etc.stub!(:getgrnam).and_return mock_struct
+      Etc.stub(:getpwnam).and_return mock_struct
+      Etc.stub(:getgrnam).and_return mock_struct
       # mock unimplemented methods
-      Process.stub!(:initgroups).and_return nil
-      Process::GID.stub!(:change_privilege).and_return 11
-      Process::UID.stub!(:change_privilege).and_return 11
+      Process.stub(:initgroups).and_return nil
+      Process::GID.stub(:change_privilege).and_return 11
+      Process::UID.stub(:change_privilege).and_return 11
     end
   end
 
@@ -73,13 +73,12 @@ describe Chef::Daemon do
   describe ".change_privilege" do
 
     before do
-      Chef::Application.stub!(:fatal!).and_return(true)
+      Chef::Application.stub(:fatal!).and_return(true)
       Chef::Config[:user] = 'aj'
-      Dir.stub!(:chdir)
+      Dir.stub(:chdir)
     end
 
     it "changes the working directory to root" do
-      Dir.rspec_reset
       Dir.should_receive(:chdir).with("/").and_return(0)
       Chef::Daemon.change_privilege
     end
@@ -117,25 +116,25 @@ describe Chef::Daemon do
   describe "._change_privilege" do
 
     before do
-      Process.stub!(:euid).and_return(0)
-      Process.stub!(:egid).and_return(0)
+      Process.stub(:euid).and_return(0)
+      Process.stub(:egid).and_return(0)
 
-      Process::UID.stub!(:change_privilege).and_return(nil)
-      Process::GID.stub!(:change_privilege).and_return(nil)
+      Process::UID.stub(:change_privilege).and_return(nil)
+      Process::GID.stub(:change_privilege).and_return(nil)
 
-      @pw_user = mock("Struct::Passwd", :uid => 501)
-      @pw_group = mock("Struct::Group", :gid => 20)
+      @pw_user = double("Struct::Passwd", :uid => 501)
+      @pw_group = double("Struct::Group", :gid => 20)
 
-      Process.stub!(:initgroups).and_return(true)
+      Process.stub(:initgroups).and_return(true)
 
-      Etc.stub!(:getpwnam).and_return(@pw_user)
-      Etc.stub!(:getgrnam).and_return(@pw_group)
+      Etc.stub(:getpwnam).and_return(@pw_user)
+      Etc.stub(:getgrnam).and_return(@pw_group)
     end
 
     describe "with sufficient privileges" do
       before do
-        Process.stub!(:euid).and_return(0)
-        Process.stub!(:egid).and_return(0)
+        Process.stub(:euid).and_return(0)
+        Process.stub(:egid).and_return(0)
       end
 
       it "should initialize the supplemental group list" do
@@ -156,12 +155,12 @@ describe Chef::Daemon do
 
     describe "with insufficient privileges" do
       before do
-        Process.stub!(:euid).and_return(999)
-        Process.stub!(:egid).and_return(999)
+        Process.stub(:euid).and_return(999)
+        Process.stub(:egid).and_return(999)
       end
 
       it "should log an appropriate error message and fail miserably" do
-        Process.stub!(:initgroups).and_raise(Errno::EPERM)
+        Process.stub(:initgroups).and_raise(Errno::EPERM)
         error = "Operation not permitted"
         if RUBY_PLATFORM.match("solaris2") || RUBY_PLATFORM.match("aix")
           error = "Not owner"

data/spec/unit/data_bag_item_spec.rb

@@ -67,15 +67,15 @@ describe Chef::DataBagItem do
     end
 
     it "should accept alphanum/-/_ for the id" do
-      lambda { @data_bag_item.raw_data = { "id" => "h1-_" } }.should_not raise_error(ArgumentError)
+      lambda { @data_bag_item.raw_data = { "id" => "h1-_" } }.should_not raise_error
     end
 
     it "should accept alphanum.alphanum for the id" do
-      lambda { @data_bag_item.raw_data = { "id" => "foo.bar" } }.should_not raise_error(ArgumentError)
+      lambda { @data_bag_item.raw_data = { "id" => "foo.bar" } }.should_not raise_error
     end
 
     it "should accept .alphanum for the id" do
-      lambda { @data_bag_item.raw_data = { "id" => ".bozo" } }.should_not raise_error(ArgumentError)
+      lambda { @data_bag_item.raw_data = { "id" => ".bozo" } }.should_not raise_error
     end
 
     it "should raise an exception if the id contains anything but alphanum/-/_" do
@@ -203,8 +203,8 @@ describe Chef::DataBagItem do
 
   describe "save" do
     before do
-      @rest = mock("Chef::REST")
-      Chef::REST.stub!(:new).and_return(@rest)
+      @rest = double("Chef::REST")
+      Chef::REST.stub(:new).and_return(@rest)
       @data_bag_item['id'] = "heart of darkness"
       raw_data = {"id" => "heart_of_darkness", "author" => "Conrad"}
       @data_bag_item.raw_data = raw_data
@@ -216,7 +216,7 @@ describe Chef::DataBagItem do
     end
 
     it "should create if the item is not found" do
-      exception = mock("404 error", :code => "404")
+      exception = double("404 error", :code => "404")
       @rest.should_receive(:put_rest).and_raise(Net::HTTPServerException.new("foo", exception))
       @rest.should_receive(:post_rest).with("data/books", @data_bag_item)
       @data_bag_item.save
@@ -247,8 +247,8 @@ describe Chef::DataBagItem do
 
     describe "from an API call" do
       before do
-        @http_client = mock("Chef::REST")
-        Chef::REST.stub!(:new).and_return(@http_client)
+        @http_client = double("Chef::REST")
+        Chef::REST.stub(:new).and_return(@http_client)
       end
 
       it "converts raw data to a data bag item" do

data/spec/unit/data_bag_spec.rb

@@ -78,12 +78,12 @@ describe Chef::DataBag do
   describe "when saving" do
     before do
       @data_bag.name('piggly_wiggly')
-      @rest = mock("Chef::REST")
-      Chef::REST.stub!(:new).and_return(@rest)
+      @rest = double("Chef::REST")
+      Chef::REST.stub(:new).and_return(@rest)
     end
 
     it "should silently proceed when the data bag already exists" do
-      exception = mock("409 error", :code => "409")
+      exception = double("409 error", :code => "409")
       @rest.should_receive(:post_rest).and_raise(Net::HTTPServerException.new("foo", exception))
       @data_bag.save
     end
@@ -111,7 +111,7 @@ describe Chef::DataBag do
     describe "from an API call" do
       before do
         Chef::Config[:chef_server_url] = 'https://myserver.example.com'
-        @http_client = mock('Chef::REST')
+        @http_client = double('Chef::REST')
       end
 
       it "should get the data bag from the server" do
@@ -121,7 +121,7 @@ describe Chef::DataBag do
       end
 
       it "should return the data bag" do
-        Chef::REST.stub!(:new).and_return(@http_client)
+        Chef::REST.stub(:new).and_return(@http_client)
         @http_client.should_receive(:get_rest).with('data/foo').and_return({'bar' => 'https://myserver.example.com/data/foo/bar'})
         data_bag = Chef::DataBag.load('foo')
         data_bag.should == {'bar' => 'https://myserver.example.com/data/foo/bar'}
@@ -152,7 +152,7 @@ describe Chef::DataBag do
 
       it "should return the data bag" do
         File.should_receive(:directory?).with('/var/chef/data_bags').and_return(true)
-        Dir.stub!(:glob).and_return(["/var/chef/data_bags/foo/bar.json", "/var/chef/data_bags/foo/baz.json"])
+        Dir.stub(:glob).and_return(["/var/chef/data_bags/foo/bar.json", "/var/chef/data_bags/foo/baz.json"])
         IO.should_receive(:read).with('/var/chef/data_bags/foo/bar.json').and_return('{"id": "bar", "name": "Bob Bar" }')
         IO.should_receive(:read).with('/var/chef/data_bags/foo/baz.json').and_return('{"id": "baz", "name": "John Baz" }')
         data_bag = Chef::DataBag.load('foo')

data/spec/unit/deprecation_spec.rb

@@ -62,7 +62,7 @@ describe Chef::Deprecation do
   context 'deprecation warning messages' do
     before(:each) do
       @warning_output = [ ]
-      Chef::Log.stub!(:warn) { |msg| @warning_output << msg }
+      Chef::Log.stub(:warn) { |msg| @warning_output << msg }
     end
 
     it 'should be enabled for deprecated methods' do

data/spec/unit/dsl/data_query_spec.rb

@@ -27,7 +27,7 @@ describe Chef::DSL::DataQuery do
   before(:each) do
     @language = DataQueryDSLTester.new
     @node = Hash.new
-    @language.stub!(:node).and_return(@node)
+    @language.stub(:node).and_return(@node)
   end
 
   describe "when loading data bags and items" do

data/spec/unit/environment_spec.rb

@@ -355,16 +355,16 @@ describe Chef::Environment do
 
   describe "api model" do
     before(:each) do
-      @rest = mock("Chef::REST")
-      Chef::REST.stub!(:new).and_return(@rest)
-      @query = mock("Chef::Search::Query")
-      Chef::Search::Query.stub!(:new).and_return(@query)
+      @rest = double("Chef::REST")
+      Chef::REST.stub(:new).and_return(@rest)
+      @query = double("Chef::Search::Query")
+      Chef::Search::Query.stub(:new).and_return(@query)
     end
 
     describe "list" do
       describe "inflated" do
         it "should return a hash of environment names and objects" do
-          e1 = mock("Chef::Environment", :name => "one")
+          e1 = double("Chef::Environment", :name => "one")
           @query.should_receive(:search).with(:environment).and_yield(e1)
           r = Chef::Environment.list(true)
           r["one"].should == e1

data/spec/unit/file_access_control_spec.rb

@@ -36,7 +36,7 @@ describe Chef::FileAccessControl do
         @run_context = Chef::RunContext.new(@node, {}, @events)
         @current_resource = Chef::Resource::File.new('/tmp/different_file.txt')
         @provider_requirements = Chef::Provider::ResourceRequirements.new(@resource, @run_context)
-        @provider = mock("File provider", :requirements => @provider_requirements, :manage_symlink_access? => false)
+        @provider = double("File provider", :requirements => @provider_requirements, :manage_symlink_access? => false)
 
         @fac = Chef::FileAccessControl.new(@current_resource, @resource, @provider)
       end
@@ -217,7 +217,7 @@ describe Chef::FileAccessControl do
       @resource.group(2342)
       @current_resource.group(2342)
 
-      # @fac.stub!(:stat).and_return(OpenStruct.new(:gid => 2342))
+      # @fac.stub(:stat).and_return(OpenStruct.new(:gid => 2342))
       File.should_not_receive(:chown)
       @fac.set_group
       @fac.should_not be_modified
@@ -267,7 +267,7 @@ describe Chef::FileAccessControl do
 
     it "sets the file's mode as specified in the resource when the current modes are incorrect" do
       # stat returns modes like 0100644 (octal) => 33188 (decimal)
-      #@fac.stub!(:stat).and_return(OpenStruct.new(:mode => 33188))
+      #@fac.stub(:stat).and_return(OpenStruct.new(:mode => 33188))
       @current_resource.mode("0644")
       File.should_receive(:chmod).with(256, '/tmp/different_file.txt')
       @fac.set_mode
@@ -280,7 +280,7 @@ describe Chef::FileAccessControl do
     end
 
     it "does not set the file's mode when the current modes are correct" do
-      #@fac.stub!(:stat).and_return(OpenStruct.new(:mode => 0100400))
+      #@fac.stub(:stat).and_return(OpenStruct.new(:mode => 0100400))
       @current_resource.mode("0400")
       File.should_not_receive(:chmod)
       @fac.set_mode
@@ -288,7 +288,7 @@ describe Chef::FileAccessControl do
     end
 
     it "sets all access controls on a file" do
-      @fac.stub!(:stat).and_return(OpenStruct.new(:owner => 99, :group => 99, :mode => 0100444))
+      @fac.stub(:stat).and_return(OpenStruct.new(:owner => 99, :group => 99, :mode => 0100444))
       @resource.mode(0400)
       @resource.owner(0)
       @resource.group(0)

data/spec/unit/file_cache_spec.rb

@@ -44,7 +44,7 @@ describe Chef::FileCache do
 
   describe "when storing a file" do
     before do
-      File.stub!(:open).and_yield(@io)
+      File.stub(:open).and_yield(@io)
     end
 
     it "should print the contents to the file" do

data/spec/unit/file_content_management/deploy/mv_unix_spec.rb

@@ -37,7 +37,7 @@ describe Chef::FileContentManagement::Deploy::MvUnix do
 
     let(:target_file_mode) { 0644 }
     let(:target_file_stat) do
-      mock "File::Stat struct for target file",
+      double "File::Stat struct for target file",
            :mode => target_file_mode,
            :uid => target_file_uid,
            :gid => target_file_gid

data/spec/unit/file_content_management/deploy/mv_windows_spec.rb

@@ -51,11 +51,11 @@ describe Chef::FileContentManagement::Deploy::MvWindows do
     let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
 
     let(:target_file_security_object) do
-      mock "Securable Object for target file"
+      double "Securable Object for target file"
     end
 
     let(:updated_target_security_object) do
-      mock "Securable Object for target file after staging file deploy"
+      double "Securable Object for target file after staging file deploy"
     end
 
     before do
@@ -79,17 +79,17 @@ describe Chef::FileContentManagement::Deploy::MvWindows do
 
     context "when run with administrator privileges" do
 
-      let(:original_target_file_owner) { mock("original target file owner") }
-      let(:original_target_file_group) { mock("original target file group") }
+      let(:original_target_file_owner) { double("original target file owner") }
+      let(:original_target_file_group) { double("original target file group") }
 
       let(:target_file_security_descriptor) do
-        mock "security descriptor for target file",
+        double "security descriptor for target file",
              :group => original_target_file_group,
              :owner => original_target_file_owner
       end
 
       let(:updated_target_security_descriptor) do
-        mock "security descriptor for target file"
+        double "security descriptor for target file"
       end
 
 
@@ -116,17 +116,17 @@ describe Chef::FileContentManagement::Deploy::MvWindows do
       end
 
       context "and the target has a dacl and sacl" do
-        let(:inherited_dacl_ace) { mock("Windows dacl ace (inherited)", :inherited? => true) }
-        let(:not_inherited_dacl_ace) { mock("Windows dacl ace (not inherited)", :inherited? => false) }
+        let(:inherited_dacl_ace) { double("Windows dacl ace (inherited)", :inherited? => true) }
+        let(:not_inherited_dacl_ace) { double("Windows dacl ace (not inherited)", :inherited? => false) }
 
         let(:original_target_file_dacl) { [inherited_dacl_ace, not_inherited_dacl_ace] }
 
-        let(:inherited_sacl_ace) { mock("Windows sacl ace (inherited)", :inherited? => true) }
-        let(:not_inherited_sacl_ace) { mock("Windows sacl ace (not inherited)", :inherited? => false) }
+        let(:inherited_sacl_ace) { double("Windows sacl ace (inherited)", :inherited? => true) }
+        let(:not_inherited_sacl_ace) { double("Windows sacl ace (not inherited)", :inherited? => false) }
         let(:original_target_file_sacl) { [inherited_sacl_ace, not_inherited_sacl_ace] }
 
-        let(:custom_dacl) { mock("Windows ACL for non-inherited dacl aces") }
-        let(:custom_sacl) { mock("Windows ACL for non-inherited sacl aces") }
+        let(:custom_dacl) { double("Windows ACL for non-inherited dacl aces") }
+        let(:custom_sacl) { double("Windows ACL for non-inherited sacl aces") }
 
         before do
           target_file_security_descriptor.stub(:dacl_present?).and_return(true)

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -51,7 +51,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
       # Error inspector originally used file_cache_path which is incorrect on
       # chef-solo. Using cookbook_path should do the right thing for client and
       # solo.
-      Chef::Config.stub!(:cookbook_path).and_return([ "/home/someuser/dev-laptop/cookbooks" ])
+      Chef::Config.stub(:cookbook_path).and_return([ "/home/someuser/dev-laptop/cookbooks" ])
       @trace = [
         "/home/someuser/dev-laptop/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
         "/home/someuser/dev-laptop/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
@@ -71,7 +71,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
 
   describe "when explaining an error in the compile phase" do
     before do
-      Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache/cookbooks" ])
+      Chef::Config.stub(:cookbook_path).and_return([ "/var/chef/cache/cookbooks" ])
       recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
       IO.should_receive(:readlines).with("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb").and_return(recipe_lines)
       @trace = [
@@ -96,7 +96,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
 
   describe "when explaining an error on windows" do
     before do
-      Chef::Config.stub!(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
+      Chef::Config.stub(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
       recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
       IO.should_receive(:readlines).at_least(1).times.with(/:\/opscode\/chef\/var\/cache\/cookbooks\/foo\/recipes\/default.rb/).and_return(recipe_lines)
       @trace = [
@@ -154,7 +154,7 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
 
   describe "when explaining an error on windows, and the backtrace lowercases the drive letter" do
     before do
-      Chef::Config.stub!(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
+      Chef::Config.stub(:cookbook_path).and_return([ "C:/opscode/chef/var/cache/cookbooks" ])
       recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
       IO.should_receive(:readlines).with("c:/opscode/chef/var/cache/cookbooks/foo/recipes/default.rb").and_return(recipe_lines)
       @trace = [