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

data/spec/unit/resource/cron_spec.rb

@@ -39,8 +39,8 @@ describe Chef::Resource::Cron do
   end
 
   it "should accept create or delete for action" do
-    lambda { @resource.action :create }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :create }.should_not raise_error
+    lambda { @resource.action :delete }.should_not raise_error
     lambda { @resource.action :lolcat }.should raise_error(ArgumentError)
   end
 

data/spec/unit/resource/directory_spec.rb

@@ -39,8 +39,8 @@ describe Chef::Resource::Directory do
   end
 
   it "should accept create or delete for action" do
-    lambda { @resource.action :create }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :create }.should_not raise_error
+    lambda { @resource.action :delete }.should_not raise_error
     lambda { @resource.action :blues }.should raise_error(ArgumentError)
   end
 
@@ -49,14 +49,14 @@ describe Chef::Resource::Directory do
   end
 
   it "should accept a string as the path" do
-    lambda { @resource.path "/tmp" }.should_not raise_error(ArgumentError)
+    lambda { @resource.path "/tmp" }.should_not raise_error
     @resource.path.should eql("/tmp")
     lambda { @resource.path Hash.new }.should raise_error(ArgumentError)
   end
 
   it "should allow you to have specify whether the action is recursive with true/false" do
-    lambda { @resource.recursive true }.should_not raise_error(ArgumentError)
-    lambda { @resource.recursive false }.should_not raise_error(ArgumentError)
+    lambda { @resource.recursive true }.should_not raise_error
+    lambda { @resource.recursive false }.should_not raise_error
     lambda { @resource.recursive "monkey" }.should raise_error(ArgumentError)
   end
 

data/spec/unit/resource/env_spec.rb

@@ -43,7 +43,7 @@ describe Chef::Resource::Env do
       if bad_value
         lambda { @resource.action action }.should raise_error(ArgumentError)
       else
-        lambda { @resource.action action }.should_not raise_error(ArgumentError)
+        lambda { @resource.action action }.should_not raise_error
       end
     end
   end
@@ -53,7 +53,7 @@ describe Chef::Resource::Env do
   end
 
   it "should accept a string as the env value via 'value'" do
-    lambda { @resource.value "bar" }.should_not raise_error(ArgumentError)
+    lambda { @resource.value "bar" }.should_not raise_error
   end
 
   it "should not accept a Hash for the env value via 'to'" do

data/spec/unit/resource/erl_call_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Resource::ErlCall do
   end
 
   it "should accept run as an action" do
-    lambda { @resource.action :run }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :run }.should_not raise_error
   end
 
   it "should allow you to set the code attribute" do

data/spec/unit/resource/file_spec.rb

@@ -44,25 +44,25 @@ describe Chef::Resource::File do
     lambda { @resource.content 5 }.should raise_error(ArgumentError)
     lambda { @resource.content :foo }.should raise_error(ArgumentError)
     lambda { @resource.content "hello" => "there" }.should raise_error(ArgumentError)
-    lambda { @resource.content "hi" }.should_not raise_error(ArgumentError)
+    lambda { @resource.content "hi" }.should_not raise_error
   end
 
   it "should only accept false or a number for backup" do
     lambda { @resource.backup true }.should raise_error(ArgumentError)
-    lambda { @resource.backup false }.should_not raise_error(ArgumentError)
-    lambda { @resource.backup 10 }.should_not raise_error(ArgumentError)
+    lambda { @resource.backup false }.should_not raise_error
+    lambda { @resource.backup 10 }.should_not raise_error
     lambda { @resource.backup "blues" }.should raise_error(ArgumentError)
   end
 
   it "should accept a sha256 for checksum" do
-    lambda { @resource.checksum "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa" }.should_not raise_error(ArgumentError)
+    lambda { @resource.checksum "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa" }.should_not raise_error
     lambda { @resource.checksum "monkey!" }.should raise_error(ArgumentError)
   end
 
   it "should accept create, delete or touch for action" do
-    lambda { @resource.action :create }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :touch }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :create }.should_not raise_error
+    lambda { @resource.action :delete }.should_not raise_error
+    lambda { @resource.action :touch }.should_not raise_error
     lambda { @resource.action :blues }.should raise_error(ArgumentError)
   end
 
@@ -71,7 +71,7 @@ describe Chef::Resource::File do
   end
 
   it "should accept a string as the path" do
-    lambda { @resource.path "/tmp" }.should_not raise_error(ArgumentError)
+    lambda { @resource.path "/tmp" }.should_not raise_error
     @resource.path.should eql("/tmp")
     lambda { @resource.path Hash.new }.should raise_error(ArgumentError)
   end

data/spec/unit/resource/group_spec.rb

@@ -60,11 +60,11 @@ describe Chef::Resource::Group, "initialize" do
   end
 
   it "should accept domain groups (@ or \ separator) on non-windows" do
-    lambda { @resource.group_name "domain\@group" }.should_not raise_error(ArgumentError)
+    lambda { @resource.group_name "domain\@group" }.should_not raise_error
     @resource.group_name.should == "domain\@group"
-    lambda { @resource.group_name "domain\\group" }.should_not raise_error(ArgumentError)
+    lambda { @resource.group_name "domain\\group" }.should_not raise_error
     @resource.group_name.should == "domain\\group"
-    lambda { @resource.group_name "domain\\group^name" }.should_not raise_error(ArgumentError)
+    lambda { @resource.group_name "domain\\group^name" }.should_not raise_error
     @resource.group_name.should == "domain\\group^name"
   end
 end

data/spec/unit/resource/link_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Resource::Link do
       if bad_value
         lambda { @resource.action action }.should raise_error(ArgumentError)
       else
-        lambda { @resource.action action }.should_not raise_error(ArgumentError)
+        lambda { @resource.action action }.should_not raise_error
       end
     end
   end
@@ -54,7 +54,7 @@ describe Chef::Resource::Link do
   end
 
   it "should accept a string as the link source via 'to'" do
-    lambda { @resource.to "/tmp" }.should_not raise_error(ArgumentError)
+    lambda { @resource.to "/tmp" }.should_not raise_error
   end
 
   it "should not accept a Hash for the link source via 'to'" do
@@ -85,15 +85,15 @@ describe Chef::Resource::Link do
   end
 
   it "should accept a group name or id for group" do
-    lambda { @resource.group "root" }.should_not raise_error(ArgumentError)
-    lambda { @resource.group 123 }.should_not raise_error(ArgumentError)
-    lambda { @resource.group "root*goo" }.should raise_error(ArgumentError)
+    lambda { @resource.group "root" }.should_not raise_error
+    lambda { @resource.group 123 }.should_not raise_error
+    lambda { @resource.group "root:goo" }.should raise_error(ArgumentError)
   end
 
   it "should accept a user name or id for owner" do
-    lambda { @resource.owner "root" }.should_not raise_error(ArgumentError)
-    lambda { @resource.owner 123 }.should_not raise_error(ArgumentError)
-    lambda { @resource.owner "root*goo" }.should raise_error(ArgumentError)
+    lambda { @resource.owner "root" }.should_not raise_error
+    lambda { @resource.owner 123 }.should_not raise_error
+    lambda { @resource.owner "root:goo" }.should raise_error(ArgumentError)
   end
 
   describe "when it has to, link_type, owner, and group" do

data/spec/unit/resource/mdadm_spec.rb

@@ -39,9 +39,9 @@ describe Chef::Resource::Mdadm do
   end
 
   it "should accept create, assemble, stop as actions" do
-    lambda { @resource.action :create }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :assemble }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :stop }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :create }.should_not raise_error
+    lambda { @resource.action :assemble }.should_not raise_error
+    lambda { @resource.action :stop }.should_not raise_error
   end
 
   it "should allow you to set the raid_device attribute" do

data/spec/unit/resource/mount_spec.rb

@@ -42,9 +42,9 @@ describe Chef::Resource::Mount do
   end
 
   it "should accept mount, umount and remount as actions" do
-    lambda { @resource.action :mount }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :umount }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :remount }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :mount }.should_not raise_error
+    lambda { @resource.action :umount }.should_not raise_error
+    lambda { @resource.action :remount }.should_not raise_error
     lambda { @resource.action :brooklyn }.should raise_error(ArgumentError)
   end
 

data/spec/unit/resource/route_spec.rb

@@ -39,8 +39,8 @@ describe Chef::Resource::Route do
   end
 
   it "should accept add or delete for action" do
-    lambda { @resource.action :add }.should_not raise_error(ArgumentError)
-    lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
+    lambda { @resource.action :add }.should_not raise_error
+    lambda { @resource.action :delete }.should_not raise_error
     lambda { @resource.action :lolcat }.should raise_error(ArgumentError)
   end
 

data/spec/unit/resource/user_spec.rb

@@ -61,9 +61,9 @@ describe Chef::Resource::User, "initialize" do
   end
 
   it "should accept domain users (@ or \ separator) on non-windows" do
-    lambda { @resource.username "domain\@user" }.should_not raise_error(ArgumentError)
+    lambda { @resource.username "domain\@user" }.should_not raise_error
     @resource.username.should == "domain\@user"
-    lambda { @resource.username "domain\\user" }.should_not raise_error(ArgumentError)
+    lambda { @resource.username "domain\\user" }.should_not raise_error
     @resource.username.should  == "domain\\user"
   end
 end

data/spec/unit/resource/yum_package_spec.rb

@@ -78,8 +78,8 @@ describe Chef::Resource::YumPackage, "allow_downgrade" do
   end
 
   it "should allow you to specify whether allow_downgrade is true or false" do
-    lambda { @resource.allow_downgrade true }.should_not raise_error(ArgumentError)
-    lambda { @resource.allow_downgrade false }.should_not raise_error(ArgumentError)
+    lambda { @resource.allow_downgrade true }.should_not raise_error
+    lambda { @resource.allow_downgrade false }.should_not raise_error
     lambda { @resource.allow_downgrade "monkey" }.should raise_error(ArgumentError)
   end
 end

data/spec/unit/resource_collection_spec.rb

@@ -118,7 +118,7 @@ describe Chef::ResourceCollection do
         @rc.each_index do |i|
           results << @rc[i].name
         end
-      }.should_not raise_error()
+      }.should_not raise_error
       results.each_index do |i|
         case i
         when 0

data/spec/unit/resource_definition_spec.rb

@@ -58,7 +58,7 @@ describe Chef::ResourceDefinition do
     lambda {
       @def.define :smoke do
       end
-    }.should_not raise_error(ArgumentError)
+    }.should_not raise_error
     lambda {
       @def.define "george washington" do
       end
@@ -70,7 +70,7 @@ describe Chef::ResourceDefinition do
     lambda {
       @def.define :smoke, :cigar => "cuban", :cigarette => "marlboro" do
       end
-    }.should_not raise_error(ArgumentError)
+    }.should_not raise_error
   end
 
   it "should expose the prototype hash params in the params hash" do

data/spec/unit/resource_reporter_spec.rb

@@ -35,21 +35,21 @@ describe Chef::ResourceReporter do
   before do
     @node = Chef::Node.new
     @node.name("spitfire")
-    @rest_client = mock("Chef::REST (mock)")
-    @rest_client.stub!(:post_rest).and_return(true)
+    @rest_client = double("Chef::REST (mock)")
+    @rest_client.stub(:post_rest).and_return(true)
     @resource_reporter = Chef::ResourceReporter.new(@rest_client)
     @run_id = @resource_reporter.run_id
     @new_resource      = Chef::Resource::File.new("/tmp/a-file.txt")
     @new_resource.cookbook_name = "monkey"
-    @cookbook_version = mock("Cookbook::Version", :version => "1.2.3")
-    @new_resource.stub!(:cookbook_version).and_return(@cookbook_version)
+    @cookbook_version = double("Cookbook::Version", :version => "1.2.3")
+    @new_resource.stub(:cookbook_version).and_return(@cookbook_version)
     @current_resource  = Chef::Resource::File.new("/tmp/a-file.txt")
     @start_time = Time.new
     @end_time = Time.new + 20
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @run_status = Chef::RunStatus.new(@node, @events)
-    Time.stub!(:now).and_return(@start_time, @end_time)
+    Time.stub(:now).and_return(@start_time, @end_time)
   end
 
   context "when first created" do
@@ -87,9 +87,9 @@ describe Chef::ResourceReporter do
 
   context "when chef fails" do
     before do
-      @rest_client.stub!(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
-      @rest_client.stub!(:raw_http_request).and_return({"result"=>"ok"});
-      @rest_client.stub!(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
+      @rest_client.stub(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
+      @rest_client.stub(:raw_http_request).and_return({"result"=>"ok"});
+      @rest_client.stub(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
 
     end
 
@@ -255,13 +255,68 @@ describe Chef::ResourceReporter do
   describe "when generating a report for the server" do
 
     before do
-      @rest_client.stub!(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
-      @rest_client.stub!(:raw_http_request).and_return({"result"=>"ok"});
-      @rest_client.stub!(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
+      @rest_client.stub(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
+      @rest_client.stub(:raw_http_request).and_return({"result"=>"ok"});
+      @rest_client.stub(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
 
       @resource_reporter.run_started(@run_status)
     end
 
+    context "when the new_resource does not have a string for name and identity" do
+      context "the new_resource name and id are nil" do
+        before do
+          @bad_resource = Chef::Resource::File.new("/tmp/nameless_file.txt")
+          @bad_resource.stub(:name).and_return(nil)
+          @bad_resource.stub(:identity).and_return(nil)
+          @resource_reporter.resource_action_start(@bad_resource, :create)
+          @resource_reporter.resource_current_state_loaded(@bad_resource, :create, @current_resource)
+          @resource_reporter.resource_updated(@bad_resource, :create)
+          @resource_reporter.resource_completed(@bad_resource)
+          @run_status.stop_clock
+          @report = @resource_reporter.prepare_run_data
+          @first_update_report = @report["resources"].first
+        end
+
+        it "resource_name in prepared_run_data is a string" do
+          @first_update_report["name"].class.should == String
+        end
+
+        it "resource_id in prepared_run_data is a string" do
+          @first_update_report["id"].class.should == String
+        end
+      end
+
+      context "the new_resource name and id are hashes" do
+        before do
+          @bad_resource = Chef::Resource::File.new("/tmp/filename_as_hash.txt")
+          @bad_resource.stub(:name).and_return({:foo=>:bar})
+          @bad_resource.stub(:identity).and_return({:foo=>:bar})
+          @resource_reporter.resource_action_start(@bad_resource, :create)
+          @resource_reporter.resource_current_state_loaded(@bad_resource, :create, @current_resource)
+          @resource_reporter.resource_updated(@bad_resource, :create)
+          @resource_reporter.resource_completed(@bad_resource)
+          @run_status.stop_clock
+          @report = @resource_reporter.prepare_run_data
+          @first_update_report = @report["resources"].first
+        end
+        # Ruby 1.8.7 flattens out hash to string using join instead of inspect, resulting in
+        # irb(main):001:0> {:foo => :bar}.to_s
+        # => "foobar"
+        # instead of the expected
+        # irb(main):001:0> {:foo => :bar}.to_s
+        # => "{:foo=>:bar}"
+        # Hence checking for the class instead of the actual value.
+        it "resource_name in prepared_run_data is a string" do
+          @first_update_report["name"].class.should == String
+        end
+
+        it "resource_id in prepared_run_data is a string" do
+          @first_update_report["id"].class.should == String
+        end
+      end
+    end
+
+
     context "for a successful client run" do
       before do
         # TODO: add inputs to generate expected output.
@@ -381,10 +436,10 @@ describe Chef::ResourceReporter do
         @backtrace = ["foo.rb:1 in `foo!'","bar.rb:2 in `bar!","'baz.rb:3 in `baz!'"]
         @node = Chef::Node.new
         @node.name("spitfire")
-        @exception = mock("ArgumentError")
-        @exception.stub!(:inspect).and_return("Net::HTTPServerException")
-        @exception.stub!(:message).and_return("Object not found")
-        @exception.stub!(:backtrace).and_return(@backtrace)
+        @exception = double("ArgumentError")
+        @exception.stub(:inspect).and_return("Net::HTTPServerException")
+        @exception.stub(:message).and_return("Object not found")
+        @exception.stub(:backtrace).and_return(@backtrace)
         @resource_reporter.run_list_expand_failed(@node, @exception)
         @resource_reporter.run_failed(@exception)
         @report = @resource_reporter.prepare_run_data
@@ -602,7 +657,7 @@ describe Chef::ResourceReporter do
         @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
         @resource_reporter.resource_updated(@new_resource, :create)
 
-        @resource_reporter.stub!(:end_time).and_return(@end_time)
+        @resource_reporter.stub(:end_time).and_return(@end_time)
         @expected_data = @resource_reporter.prepare_run_data
 
         post_url = "https://chef_server/example_url"

data/spec/unit/resource_spec.rb

@@ -205,8 +205,8 @@ describe Chef::Resource do
 
   describe "noop" do
     it "should accept true or false for noop" do
-      lambda { @resource.noop true }.should_not raise_error(ArgumentError)
-      lambda { @resource.noop false }.should_not raise_error(ArgumentError)
+      lambda { @resource.noop true }.should_not raise_error
+      lambda { @resource.noop false }.should_not raise_error
       lambda { @resource.noop "eat it" }.should raise_error(ArgumentError)
     end
   end
@@ -589,7 +589,7 @@ describe Chef::Resource do
 
     it "should print \"skipped due to action :nothing\" message for doc formatter when action is :nothing" do
       fdoc = Chef::Formatters.new(:doc, STDOUT, STDERR)
-      @run_context.stub!(:events).and_return(fdoc)
+      @run_context.stub(:events).and_return(fdoc)
       fdoc.should_receive(:puts).with(" (skipped due to action :nothing)")
       @resource.should_skip?(:nothing)
     end

data/spec/unit/rest/auth_credentials_spec.rb

@@ -84,7 +84,7 @@ describe Chef::REST::AuthCredentials do
     end
 
     it "generates signature headers for the request" do
-      Time.stub!(:now).and_return(@request_time)
+      Time.stub(:now).and_return(@request_time)
       actual = @auth_credentials.signature_headers(@request_params)
       actual["HOST"].should                    == "localhost"
       actual["X-OPS-AUTHORIZATION-1"].should == "kBssX1ENEwKtNYFrHElN9vYGWS7OeowepN9EsYc9csWfh8oUovryPKDxytQ/"
@@ -110,7 +110,7 @@ describe Chef::REST::AuthCredentials do
       end
 
       it "generates the correct signature for version 1.1" do
-        Time.stub!(:now).and_return(@request_time)
+        Time.stub(:now).and_return(@request_time)
         actual = @auth_credentials.signature_headers(@request_params)
         actual["HOST"].should                    == "localhost"
         actual["X-OPS-CONTENT-HASH"].should == "1tuzs5XKztM1ANrkGNPah6rW9GY="

data/spec/unit/rest_spec.rb

@@ -70,6 +70,7 @@ describe Chef::REST do
     Chef::Log.init(log_stringio)
   end
 
+
   describe "calling an HTTP verb on a path or absolute URL" do
     it "adds a relative URL to the base url it was initialized with" do
       expect(rest.create_url("foo/bar/baz")).to eq(URI.parse(base_url + "/foo/bar/baz"))
@@ -165,44 +166,6 @@ describe Chef::REST do
     end
   end
 
-  describe "legacy API" do
-    before(:each) do
-      Chef::Config[:node_name]  = "webmonkey.example.com"
-      Chef::Config[:client_key] = CHEF_SPEC_DATA + "/ssl/private_key.pem"
-      @rest = Chef::REST.new(@base_url)
-    end
-
-    it 'responds to raw_http_request as a public method' do
-      @rest.public_methods.map(&:to_s).should include("raw_http_request")
-    end
-
-    it 'calls the authn middleware' do
-      data = "\"secure data\""
-
-      auth_headers = STANDARD_WRITE_HEADERS.merge({"auth_done"=>"yep"})
-
-      @rest.authenticator.should_receive(:handle_request).
-        with(:POST, monkey_uri, STANDARD_WRITE_HEADERS, data).
-        and_return([:POST, monkey_uri, auth_headers, data])
-      @rest.should_receive(:send_http_request).
-        with(:POST, monkey_uri, auth_headers, data).
-        and_return([1,2,3])
-      @rest.should_receive('success_response?'.to_sym).with(1).and_return(true)
-      @rest.raw_http_request(:POST, monkey_uri, STANDARD_WRITE_HEADERS, data)
-    end
-
-    it 'sets correct authn headers' do
-      data = "\"secure data\""
-      method, uri, auth_headers, d = @rest.authenticator.handle_request(:POST, monkey_uri, STANDARD_WRITE_HEADERS, data)
-
-      @rest.should_receive(:send_http_request).
-        with(:POST, monkey_uri, auth_headers, data).
-        and_return([1,2,3])
-      @rest.should_receive('success_response?'.to_sym).with(1).and_return(true)
-      @rest.raw_http_request(:POST, monkey_uri, STANDARD_WRITE_HEADERS, data)
-    end
-  end
-
 
   describe "when configured to authenticate to the Chef server" do
     let(:base_url) { URI.parse("http://chef.example.com:4000") }
@@ -615,13 +578,13 @@ describe Chef::REST do
       it "does not raise a divide by zero exception if the content's actual size is 0" do
         http_response['Content-Length'] = "5"
         http_response.stub(:read_body).and_yield('')
-        expect { rest.streaming_request(url, {}) }.to_not raise_error(ZeroDivisionError)
+        expect { rest.streaming_request(url, {}) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
       end
 
       it "does not raise a divide by zero exception when the Content-Length is 0" do
         http_response['Content-Length'] = "0"
         http_response.stub(:read_body).and_yield("ninja")
-        expect { rest.streaming_request(url, {}) }.to_not raise_error(ZeroDivisionError)
+        expect { rest.streaming_request(url, {}) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
       end
 
       it "it raises an exception when the download is truncated" do