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

data/spec/unit/api_client_spec.rb

@@ -189,8 +189,8 @@ describe Chef::ApiClient do
 
   describe "when requesting a new key" do
     before do
-      @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
 
     context "and the client does not exist on the server" do

data/spec/unit/application/apply.rb

@@ -21,7 +21,7 @@ describe Chef::Application::Apply do
 
   before do
     @app = Chef::Application::Recipe.new
-    @app.stub!(:configure_logging).and_return(true)
+    @app.stub(:configure_logging).and_return(true)
     @recipe_text = "package 'nyancat'"
     Chef::Config[:solo] = true
   end
@@ -36,10 +36,10 @@ describe Chef::Application::Apply do
     before do
       @recipe_file_name = "foo.rb"
       @recipe_path = File.expand_path("foo.rb")
-      @recipe_file = mock("Tempfile (mock)", :read => @recipe_text)
-      @app.stub!(:open).with(@recipe_path).and_return(@recipe_file)
-      File.stub!(:exist?).with("foo.rb").and_return(true)
-      Chef::Application.stub!(:fatal!).and_return(true)
+      @recipe_file = double("Tempfile (mock)", :read => @recipe_text)
+      @app.stub(:open).with(@recipe_path).and_return(@recipe_file)
+      File.stub(:exist?).with("foo.rb").and_return(true)
+      Chef::Application.stub(:fatal!).and_return(true)
     end
     it "should read text properly" do
       @app.read_recipe_file(@recipe_file_name)[0].should == @recipe_text
@@ -49,7 +49,7 @@ describe Chef::Application::Apply do
     end
     describe "when recipe doesn't exist" do
       before do
-        File.stub!(:exist?).with(@recipe_file_name).and_return(false)
+        File.stub(:exist?).with(@recipe_file_name).and_return(false)
       end
       it "should raise a fatal" do
         Chef::Application.should_receive(:fatal!)

data/spec/unit/application/client_spec.rb

@@ -23,9 +23,9 @@ describe Chef::Application::Client, "reconfigure" do
     ARGV.clear
 
     @app = Chef::Application::Client.new
-    @app.stub!(:configure_opt_parser).and_return(true)
-    @app.stub!(:configure_chef).and_return(true)
-    @app.stub!(:configure_logging).and_return(true)
+    @app.stub(:configure_opt_parser).and_return(true)
+    @app.stub(:configure_chef).and_return(true)
+    @app.stub(:configure_logging).and_return(true)
     @app.cli_arguments = []
     Chef::Config[:interval] = 10
 
@@ -91,9 +91,9 @@ describe Chef::Application::Client, "setup_application" do
   before do
     @app = Chef::Application::Client.new
     # this is all stuff the reconfigure method needs
-    @app.stub!(:configure_opt_parser).and_return(true)
-    @app.stub!(:configure_chef).and_return(true)
-    @app.stub!(:configure_logging).and_return(true)
+    @app.stub(:configure_opt_parser).and_return(true)
+    @app.stub(:configure_chef).and_return(true)
+    @app.stub(:configure_logging).and_return(true)
   end
 
   it "should change privileges" do

data/spec/unit/application/knife_spec.rb

@@ -35,8 +35,8 @@ describe Chef::Application::Knife do
 
   before(:each) do
     @knife = Chef::Application::Knife.new
-    @knife.stub!(:puts)
-    Chef::Knife.stub!(:list_commands)
+    @knife.stub(:puts)
+    Chef::Knife.stub(:list_commands)
   end
 
   it "should exit 1 and print the options if no arguments are given at all" do
@@ -54,7 +54,7 @@ describe Chef::Application::Knife do
 
   it "should run a sub command with the applications command line option prototype" do
     with_argv(*%w{noop knife command with some args}) do
-      knife = mock(Chef::Knife)
+      knife = double(Chef::Knife)
       Chef::Knife.should_receive(:run).with(ARGV, @knife.options).and_return(knife)
       @knife.should_receive(:exit).with(0)
       @knife.run
@@ -76,7 +76,7 @@ describe Chef::Application::Knife do
   describe "when given a path to the client key" do
     it "expands a relative path relative to the CWD" do
       relative_path = '.chef/client.pem'
-      Dir.stub!(:pwd).and_return(CHEF_SPEC_DATA)
+      Dir.stub(:pwd).and_return(CHEF_SPEC_DATA)
       with_argv(*%W{noop knife command -k #{relative_path}}) do
         @knife.should_receive(:exit).with(0)
         @knife.run
@@ -158,7 +158,7 @@ describe Chef::Application::Knife do
 
     it "should run a sub command with the applications command line option prototype" do
       with_argv(*%w{noop knife command with some args}) do
-        knife = mock(Chef::Knife)
+        knife = double(Chef::Knife)
         Chef::Knife.should_receive(:run).with(ARGV, @knife.options).and_return(knife)
         @knife.should_receive(:exit).with(0)
         @knife.run

data/spec/unit/application/solo_spec.rb

@@ -20,9 +20,9 @@ require 'spec_helper'
 describe Chef::Application::Solo do
   before do
     @app = Chef::Application::Solo.new
-    @app.stub!(:configure_opt_parser).and_return(true)
-    @app.stub!(:configure_chef).and_return(true)
-    @app.stub!(:configure_logging).and_return(true)
+    @app.stub(:configure_opt_parser).and_return(true)
+    @app.stub(:configure_chef).and_return(true)
+    @app.stub(:configure_logging).and_return(true)
     Chef::Config[:recipe_url] = false
     Chef::Config[:json_attribs] = false
     Chef::Config[:solo] = true
@@ -70,14 +70,14 @@ describe Chef::Application::Solo do
       before do
         Chef::Config[:cookbook_path] = "#{Dir.tmpdir}/chef-solo/cookbooks"
         Chef::Config[:recipe_url] = "http://junglist.gen.nz/recipes.tgz"
-        FileUtils.stub!(:mkdir_p).and_return(true)
+        FileUtils.stub(:mkdir_p).and_return(true)
         @tarfile = StringIO.new("remote_tarball_content")
-        @app.stub!(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(@tarfile)
+        @app.stub(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(@tarfile)
 
         @target_file = StringIO.new
-        File.stub!(:open).with("#{Dir.tmpdir}/chef-solo/recipes.tgz", "wb").and_yield(@target_file)
+        File.stub(:open).with("#{Dir.tmpdir}/chef-solo/recipes.tgz", "wb").and_yield(@target_file)
 
-        Chef::Mixin::Command.stub!(:run_command).and_return(true)
+        Chef::Mixin::Command.stub(:run_command).and_return(true)
       end
 
       it "should create the recipes path based on the parent of the cookbook path" do
@@ -107,14 +107,14 @@ describe Chef::Application::Solo do
     before do
       Chef::Config[:solo] = true
 
-      Chef::Daemon.stub!(:change_privilege)
-      @chef_client = mock("Chef::Client")
-      Chef::Client.stub!(:new).and_return(@chef_client)
+      Chef::Daemon.stub(:change_privilege)
+      @chef_client = double("Chef::Client")
+      Chef::Client.stub(:new).and_return(@chef_client)
       @app = Chef::Application::Solo.new
       # this is all stuff the reconfigure method needs
-      @app.stub!(:configure_opt_parser).and_return(true)
-      @app.stub!(:configure_chef).and_return(true)
-      @app.stub!(:configure_logging).and_return(true)
+      @app.stub(:configure_opt_parser).and_return(true)
+      @app.stub(:configure_chef).and_return(true)
+      @app.stub(:configure_logging).and_return(true)
     end
 
     it "should change privileges" do

data/spec/unit/application_spec.rb

@@ -24,8 +24,8 @@ describe Chef::Application do
     ARGV.clear
     Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
-    Dir.stub!(:chdir).and_return(0)
-    @app.stub!(:reconfigure)
+    Dir.stub(:chdir).and_return(0)
+    @app.stub(:reconfigure)
     Chef::Log.init(STDERR)
   end
 
@@ -36,8 +36,8 @@ describe Chef::Application do
   describe "reconfigure" do
     before do
       @app = Chef::Application.new
-      @app.stub!(:configure_chef).and_return(true)
-      @app.stub!(:configure_logging).and_return(true)
+      @app.stub(:configure_chef).and_return(true)
+      @app.stub(:configure_logging).and_return(true)
     end
 
     it "should configure chef" do
@@ -59,10 +59,10 @@ describe Chef::Application do
 
     describe "run" do
       before do
-        @app.stub!(:setup_application).and_return(true)
-        @app.stub!(:run_application).and_return(true)
-        @app.stub!(:configure_chef).and_return(true)
-        @app.stub!(:configure_logging).and_return(true)
+        @app.stub(:setup_application).and_return(true)
+        @app.stub(:run_application).and_return(true)
+        @app.stub(:configure_chef).and_return(true)
+        @app.stub(:configure_logging).and_return(true)
       end
 
       it "should reconfigure the application before running" do
@@ -85,8 +85,8 @@ describe Chef::Application do
   describe "configure_chef" do
     before do
       @app = Chef::Application.new
-      #Chef::Config.stub!(:merge!).and_return(true)
-      @app.stub!(:parse_options).and_return(true)
+      #Chef::Config.stub(:merge!).and_return(true)
+      @app.stub(:parse_options).and_return(true)
     end
 
     it "should parse the commandline options" do
@@ -152,12 +152,12 @@ describe Chef::Application do
   describe "when configuring the logger" do
     before do
       @app = Chef::Application.new
-      Chef::Log.stub!(:init)
+      Chef::Log.stub(:init)
     end
 
     it "should initialise the chef logger" do
-      Chef::Log.stub!(:level=)
-      @monologger = mock("Monologger")
+      Chef::Log.stub(:level=)
+      @monologger = double("Monologger")
       MonoLogger.should_receive(:new).with(Chef::Config[:log_location]).and_return(@monologger)
       Chef::Log.should_receive(:init).with(@monologger)
       @app.configure_logging
@@ -173,7 +173,7 @@ describe Chef::Application do
     shared_examples_for "log_level_is_auto" do
       context "when STDOUT is to a tty" do
         before do
-          STDOUT.stub!(:tty?).and_return(true)
+          STDOUT.stub(:tty?).and_return(true)
         end
 
         it "configures the log level to :warn" do
@@ -195,7 +195,7 @@ describe Chef::Application do
 
       context "when STDOUT is not to a tty" do
         before do
-          STDOUT.stub!(:tty?).and_return(false)
+          STDOUT.stub(:tty?).and_return(false)
         end
 
         it "configures the log level to :info" do
@@ -230,9 +230,9 @@ describe Chef::Application do
 
   describe "class method: fatal!" do
     before do
-      STDERR.stub!(:puts).with("FATAL: blah").and_return(true)
-      Chef::Log.stub!(:fatal).with("blah").and_return(true)
-      Process.stub!(:exit).and_return(true)
+      STDERR.stub(:puts).with("FATAL: blah").and_return(true)
+      Chef::Log.stub(:fatal).and_return(true)
+      Process.stub(:exit).and_return(true)
     end
 
     it "should log an error message to the logger" do
@@ -281,7 +281,7 @@ describe Chef::Application do
       @app.config[:config_file] = "/tmp/non-existing-dir/file"
       config_file_regexp = Regexp.new @app.config[:config_file]
       Chef::Log.should_receive(:warn).at_least(:once).with(config_file_regexp).and_return(true)
-      Chef::Log.should_receive(:warn).any_number_of_times.and_return(true)
+      Chef::Log.stub(:warn).and_return(true)
       @app.configure_chef
     end
   end

data/spec/unit/checksum/storage/filesystem_spec.rb

@@ -26,8 +26,8 @@ describe Chef::Checksum::Storage::Filesystem do
 
     @now = Time.now
 
-    Time.stub!(:now).and_return(@now)
-    Chef::Config.stub!(:checksum_path).and_return("/var/chef/checksums")
+    Time.stub(:now).and_return(@now)
+    Chef::Config.stub(:checksum_path).and_return("/var/chef/checksums")
 
     @checksum_of_the_file = "3fafecfb15585ede6b840158cbc2f399"
     @storage = Chef::Checksum::Storage::Filesystem.new("/not/used/path", @checksum_of_the_file)

data/spec/unit/client_spec.rb

@@ -37,9 +37,9 @@ shared_examples_for Chef::Client do
                   :platform         => 'example-platform',
                   :platform_version => 'example-platform-1.0',
                   :data             => {} }
-    ohai_data.stub!(:all_plugins).and_return(true)
-    ohai_data.stub!(:data).and_return(ohai_data)
-    Ohai::System.stub!(:new).and_return(ohai_data)
+    ohai_data.stub(:all_plugins).and_return(true)
+    ohai_data.stub(:data).and_return(ohai_data)
+    Ohai::System.stub(:new).and_return(ohai_data)
 
     @node = Chef::Node.new
     @node.name(@fqdn)
@@ -81,7 +81,7 @@ shared_examples_for Chef::Client do
 
       context "and STDOUT is a TTY" do
         before do
-          STDOUT.stub!(:tty?).and_return(true)
+          STDOUT.stub(:tty?).and_return(true)
         end
 
         it "configures the :doc formatter" do
@@ -104,7 +104,7 @@ shared_examples_for Chef::Client do
 
       context "and STDOUT is not a TTY" do
         before do
-          STDOUT.stub!(:tty?).and_return(false)
+          STDOUT.stub(:tty?).and_return(false)
         end
 
         it "configures the :null formatter" do
@@ -168,10 +168,10 @@ shared_examples_for Chef::Client do
   describe "run" do
 
     it "should identify the node and run ohai, then register the client" do
-      mock_chef_rest_for_node = mock("Chef::REST (node)")
-      mock_chef_rest_for_cookbook_sync = mock("Chef::REST (cookbook sync)")
-      mock_chef_rest_for_node_save = mock("Chef::REST (node save)")
-      mock_chef_runner = mock("Chef::Runner")
+      mock_chef_rest_for_node = double("Chef::REST (node)")
+      mock_chef_rest_for_cookbook_sync = double("Chef::REST (cookbook sync)")
+      mock_chef_rest_for_node_save = double("Chef::REST (node save)")
+      mock_chef_runner = double("Chef::Runner")
 
       # --Client.register
       #   Make sure Client#register thinks the client key doesn't
@@ -253,15 +253,15 @@ shared_examples_for Chef::Client do
     end
 
     it "should remove the run_lock on failure of #load_node" do
-      @run_lock = mock("Chef::RunLock", :acquire => true)
-      Chef::RunLock.stub!(:new).and_return(@run_lock)
+      @run_lock = double("Chef::RunLock", :acquire => true)
+      Chef::RunLock.stub(:new).and_return(@run_lock)
 
-      @events = mock("Chef::EventDispatch::Dispatcher").as_null_object
-      Chef::EventDispatch::Dispatcher.stub!(:new).and_return(@events)
+      @events = double("Chef::EventDispatch::Dispatcher").as_null_object
+      Chef::EventDispatch::Dispatcher.stub(:new).and_return(@events)
 
       # @events is created on Chef::Client.new, so we need to recreate it after mocking
       @client = Chef::Client.new
-      @client.stub!(:load_node).and_raise(Exception)
+      @client.stub(:load_node).and_raise(Exception)
       @run_lock.should_receive(:release)
       if(Chef::Config[:client_fork] && !windows?)
         @client.should_receive(:fork) do |&block|
@@ -274,8 +274,8 @@ shared_examples_for Chef::Client do
     describe "when notifying other objects of the status of the chef run" do
       before do
         Chef::Client.clear_notifications
-        Chef::Node.stub!(:find_or_create).and_return(@node)
-        @node.stub!(:save)
+        Chef::Node.stub(:find_or_create).and_return(@node)
+        @node.stub(:save)
         @client.load_node
         @client.build_node
       end
@@ -324,7 +324,7 @@ shared_examples_for Chef::Client do
 
       # build_node will call Node#expand! with server, which will
       # eventually hit the server to expand the included role.
-      mock_chef_rest = mock("Chef::REST")
+      mock_chef_rest = double("Chef::REST")
       mock_chef_rest.should_receive(:get_rest).with("roles/role_containing_cookbook1").and_return(role_containing_cookbook1)
       Chef::REST.should_receive(:new).and_return(mock_chef_rest)
 
@@ -332,7 +332,7 @@ shared_examples_for Chef::Client do
       @node[:roles].should be_nil
       @node[:recipes].should be_nil
 
-      @client.policy_builder.stub!(:node).and_return(@node)
+      @client.policy_builder.stub(:node).and_return(@node)
 
       # chefspec and possibly others use the return value of this method
       @client.build_node.should == @node
@@ -385,7 +385,7 @@ shared_examples_for Chef::Client do
 
         context "fatal admin check is configured" do
           it "should not raise an exception" do
-            @client.do_windows_admin_check.should_not raise_error(Chef::Exceptions::WindowsNotAdmin)
+            @client.do_windows_admin_check.should_not raise_error
           end
         end
       end
@@ -402,7 +402,7 @@ shared_examples_for Chef::Client do
 
         context "fatal admin check is configured" do
           it "should raise an exception" do
-            @client.do_windows_admin_check.should_not raise_error(Chef::Exceptions::WindowsNotAdmin)
+            @client.do_windows_admin_check.should_not raise_error
           end
         end
       end
@@ -422,7 +422,7 @@ shared_examples_for Chef::Client do
       @client = Chef::Client.new(nil, :override_runlist => 'role[a], role[b]')
     end
 
-    it "should override the run list and save original runlist" do
+    it "should override the run list and skip the final node save" do
       @client = Chef::Client.new(nil, :override_runlist => 'role[test_role]')
       @client.node = @node
 
@@ -434,11 +434,11 @@ shared_examples_for Chef::Client do
 
       original_runlist = @node.run_list.dup
 
-      mock_chef_rest = mock("Chef::REST")
+      mock_chef_rest = double("Chef::REST")
       mock_chef_rest.should_receive(:get_rest).with("roles/test_role").and_return(override_role)
       Chef::REST.should_receive(:new).and_return(mock_chef_rest)
 
-      @node.should_receive(:save).and_return(nil)
+      @node.should_not_receive(:save)
 
       @client.policy_builder.stub(:node).and_return(@node)
       @client.policy_builder.build_node

data/spec/unit/config_spec.rb

@@ -99,8 +99,8 @@ describe Chef::Config do
 
   describe "class method: manage_secret_key" do
     before do
-      Chef::FileCache.stub!(:load).and_return(true)
-      Chef::FileCache.stub!(:has_key?).with("chef_server_cookie_id").and_return(false)
+      Chef::FileCache.stub(:load).and_return(true)
+      Chef::FileCache.stub(:has_key?).with("chef_server_cookie_id").and_return(false)
     end
 
     it "should generate and store a chef server cookie id" do
@@ -110,7 +110,7 @@ describe Chef::Config do
 
     describe "when the filecache has a chef server cookie id key" do
       before do
-        Chef::FileCache.stub!(:has_key?).with("chef_server_cookie_id").and_return(true)
+        Chef::FileCache.stub(:has_key?).with("chef_server_cookie_id").and_return(true)
       end
 
       it "should not generate and store a chef server cookie id" do
@@ -132,7 +132,7 @@ describe Chef::Config do
     it "should return a windows path on windows systems" do
       platform_mock :windows do
         path = "/etc/chef/cookbooks"
-        ENV.stub!(:[]).with('SYSTEMDRIVE').and_return('C:')
+        ENV.stub(:[]).with('SYSTEMDRIVE').and_return('C:')
         # match on a regex that looks for the base path with an optional
         # system drive at the beginning (c:)
         # system drive is not hardcoded b/c it can change and b/c it is not present on linux systems

data/spec/unit/cookbook/metadata_spec.rb

@@ -247,7 +247,7 @@ describe Chef::Cookbook::Metadata do
     it "should not accept anything but a string for display_name" do
       lambda {
         @meta.grouping("db/mysql/databases", :title => "foo")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.grouping("db/mysql/databases", :title => Hash.new)
       }.should raise_error(ArgumentError)
@@ -256,7 +256,7 @@ describe Chef::Cookbook::Metadata do
     it "should not accept anything but a string for the description" do
       lambda {
         @meta.grouping("db/mysql/databases", :description => "foo")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.grouping("db/mysql/databases", :description => Hash.new)
       }.should raise_error(ArgumentError)
@@ -281,7 +281,7 @@ describe Chef::Cookbook::Metadata do
     it "should not accept anything but a string for display_name" do
       lambda {
         @meta.attribute("db/mysql/databases", :display_name => "foo")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :display_name => Hash.new)
       }.should raise_error(ArgumentError)
@@ -290,7 +290,7 @@ describe Chef::Cookbook::Metadata do
     it "should not accept anything but a string for the description" do
       lambda {
         @meta.attribute("db/mysql/databases", :description => "foo")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :description => Hash.new)
       }.should raise_error(ArgumentError)
@@ -299,7 +299,7 @@ describe Chef::Cookbook::Metadata do
     it "should not accept anything but an array of strings for choice" do
       lambda {
         @meta.attribute("db/mysql/databases", :choice => ['dedicated', 'shared'])
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :choice => [10, 'shared'])
       }.should raise_error(ArgumentError)
@@ -316,10 +316,10 @@ describe Chef::Cookbook::Metadata do
      it "should let calculated be true or false" do
        lambda {
          @meta.attribute("db/mysql/databases", :calculated => true)
-       }.should_not raise_error(ArgumentError)
+       }.should_not raise_error
        lambda {
          @meta.attribute("db/mysql/databases", :calculated => false)
-       }.should_not raise_error(ArgumentError)
+       }.should_not raise_error
        lambda {
          @meta.attribute("db/mysql/databases", :calculated => Hash.new)
        }.should raise_error(ArgumentError)
@@ -333,13 +333,13 @@ describe Chef::Cookbook::Metadata do
     it "accepts String for the attribute type" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "string")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
     end
 
     it "accepts Array for the attribute type" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "array")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :type => Array.new)
       }.should raise_error(ArgumentError)
@@ -348,38 +348,38 @@ describe Chef::Cookbook::Metadata do
     it "accepts symbol for the attribute type" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "symbol")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
     end
 
      it "should let type be hash (backwards compatability only)" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "hash")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
     end
 
     it "should let required be required, recommended or optional" do
       lambda {
         @meta.attribute("db/mysql/databases", :required => 'required')
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :required => 'recommended')
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :required => 'optional')
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
     end
 
     it "should convert required true to required" do
       lambda {
         @meta.attribute("db/mysql/databases", :required => true)
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       #attrib = @meta.attributes["db/mysql/databases"][:required].should == "required"
     end
 
     it "should convert required false to optional" do
       lambda {
         @meta.attribute("db/mysql/databases", :required => false)
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       #attrib = @meta.attributes["db/mysql/databases"][:required].should == "optional"
     end
 
@@ -391,7 +391,7 @@ describe Chef::Cookbook::Metadata do
     it "should make sure recipes is an array" do
       lambda {
         @meta.attribute("db/mysql/databases", :recipes => [])
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :required => Hash.new)
       }.should raise_error(ArgumentError)
@@ -405,13 +405,13 @@ describe Chef::Cookbook::Metadata do
     it "should allow the default value to be a string, array, or hash" do
       lambda {
         @meta.attribute("db/mysql/databases", :default => [])
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :default => {})
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :default => "alice in chains")
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         @meta.attribute("db/mysql/databases", :required => :not_gonna_do_it)
       }.should raise_error(ArgumentError)
@@ -441,14 +441,14 @@ describe Chef::Cookbook::Metadata do
           :default => "b"
         }
         @meta.attribute("db/mysql/databases", attrs)
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
       lambda {
         attrs = {
           :choice => [ "a", "b", "c", "d", "e"],
           :default => ["b", "d"]
         }
         @meta.attribute("db/mysql/databases", attrs)
-      }.should_not raise_error(ArgumentError)
+      }.should_not raise_error
      end
 
     it "should error if default is not a choice" do