chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/spec/unit/rest/auth_credentials_spec.rb

@@ -62,18 +62,18 @@ describe Chef::REST::AuthCredentials do
   end
 
   it "has a client name" do
-    @auth_credentials.client_name.should == "client-name"
+    expect(@auth_credentials.client_name).to eq("client-name")
   end
 
   it "loads the private key when initialized with the path to the key" do
-    @auth_credentials.key.should respond_to(:private_encrypt)
-    @auth_credentials.key.to_s.should == KEY_DOT_PEM
+    expect(@auth_credentials.key).to respond_to(:private_encrypt)
+    expect(@auth_credentials.key.to_s).to eq(KEY_DOT_PEM)
   end
 
   describe "when loading the private key" do
     it "strips extra whitespace before checking the key" do
       key_file_fixture = CHEF_SPEC_DATA + '/ssl/private_key_with_whitespace.pem'
-      lambda {Chef::REST::AuthCredentials.new("client-name", @key_file_fixture)}.should_not raise_error
+      expect {Chef::REST::AuthCredentials.new("client-name", @key_file_fixture)}.not_to raise_error
     end
   end
 
@@ -84,19 +84,19 @@ describe Chef::REST::AuthCredentials do
     end
 
     it "generates signature headers for the request" do
-      Time.stub(:now).and_return(@request_time)
+      allow(Time).to receive(:now).and_return(@request_time)
       actual = @auth_credentials.signature_headers(@request_params)
-      actual["HOST"].should                    == "localhost"
-      actual["X-OPS-AUTHORIZATION-1"].should == "kBssX1ENEwKtNYFrHElN9vYGWS7OeowepN9EsYc9csWfh8oUovryPKDxytQ/"
-      actual["X-OPS-AUTHORIZATION-2"].should == "Wc2/nSSyxdWJjjfHzrE+YrqNQTaArOA7JkAf5p75eTUonCWcvNPjFrZVgKGS"
-      actual["X-OPS-AUTHORIZATION-3"].should == "yhzHJQh+lcVA9wwARg5Hu9q+ddS8xBOdm3Vp5atl5NGHiP0loiigMYvAvzPO"
-      actual["X-OPS-AUTHORIZATION-4"].should == "r9853eIxwYMhn5hLGhAGFQznJbE8+7F/lLU5Zmk2t2MlPY8q3o1Q61YD8QiJ"
-      actual["X-OPS-AUTHORIZATION-5"].should ==  "M8lIt53ckMyUmSU0DDURoiXLVkE9mag/6Yq2tPNzWq2AdFvBqku9h2w+DY5k"
-      actual["X-OPS-AUTHORIZATION-6"].should == "qA5Rnzw5rPpp3nrWA9jKkPw4Wq3+4ufO2Xs6w7GCjA=="
-      actual["X-OPS-CONTENT-HASH"].should == "1tuzs5XKztM1ANrkGNPah6rW9GY="
-      actual["X-OPS-SIGN"].should         =~ %r{(version=1\.0)|(algorithm=sha1;version=1.0;)}
-      actual["X-OPS-TIMESTAMP"].should    == "2010-04-10T17:34:20Z"
-      actual["X-OPS-USERID"].should       == "client-name"
+      expect(actual["HOST"]).to                    eq("localhost")
+      expect(actual["X-OPS-AUTHORIZATION-1"]).to eq("kBssX1ENEwKtNYFrHElN9vYGWS7OeowepN9EsYc9csWfh8oUovryPKDxytQ/")
+      expect(actual["X-OPS-AUTHORIZATION-2"]).to eq("Wc2/nSSyxdWJjjfHzrE+YrqNQTaArOA7JkAf5p75eTUonCWcvNPjFrZVgKGS")
+      expect(actual["X-OPS-AUTHORIZATION-3"]).to eq("yhzHJQh+lcVA9wwARg5Hu9q+ddS8xBOdm3Vp5atl5NGHiP0loiigMYvAvzPO")
+      expect(actual["X-OPS-AUTHORIZATION-4"]).to eq("r9853eIxwYMhn5hLGhAGFQznJbE8+7F/lLU5Zmk2t2MlPY8q3o1Q61YD8QiJ")
+      expect(actual["X-OPS-AUTHORIZATION-5"]).to eq("M8lIt53ckMyUmSU0DDURoiXLVkE9mag/6Yq2tPNzWq2AdFvBqku9h2w+DY5k")
+      expect(actual["X-OPS-AUTHORIZATION-6"]).to eq("qA5Rnzw5rPpp3nrWA9jKkPw4Wq3+4ufO2Xs6w7GCjA==")
+      expect(actual["X-OPS-CONTENT-HASH"]).to eq("1tuzs5XKztM1ANrkGNPah6rW9GY=")
+      expect(actual["X-OPS-SIGN"]).to         match(%r{(version=1\.0)|(algorithm=sha1;version=1.0;)})
+      expect(actual["X-OPS-TIMESTAMP"]).to    eq("2010-04-10T17:34:20Z")
+      expect(actual["X-OPS-USERID"]).to       eq("client-name")
 
     end
 
@@ -110,13 +110,13 @@ describe Chef::REST::AuthCredentials do
       end
 
       it "generates the correct signature for version 1.1" do
-        Time.stub(:now).and_return(@request_time)
+        allow(Time).to receive(:now).and_return(@request_time)
         actual = @auth_credentials.signature_headers(@request_params)
-        actual["HOST"].should                    == "localhost"
-        actual["X-OPS-CONTENT-HASH"].should == "1tuzs5XKztM1ANrkGNPah6rW9GY="
-        actual["X-OPS-SIGN"].should         == "algorithm=sha1;version=1.1;"
-        actual["X-OPS-TIMESTAMP"].should    == "2010-04-10T17:34:20Z"
-        actual["X-OPS-USERID"].should       == "client-name"
+        expect(actual["HOST"]).to                    eq("localhost")
+        expect(actual["X-OPS-CONTENT-HASH"]).to eq("1tuzs5XKztM1ANrkGNPah6rW9GY=")
+        expect(actual["X-OPS-SIGN"]).to         eq("algorithm=sha1;version=1.1;")
+        expect(actual["X-OPS-TIMESTAMP"]).to    eq("2010-04-10T17:34:20Z")
+        expect(actual["X-OPS-USERID"]).to       eq("client-name")
 
         # mixlib-authN will test the actual signature stuff for each version of
         # the protocol so we won't test it again here.
@@ -143,63 +143,63 @@ describe Chef::REST::RESTRequest do
   end
 
   it "stores the url it was created with" do
-    @request.url.should == @url
+    expect(@request.url).to eq(@url)
   end
 
   it "stores the HTTP method" do
-    @request.method.should == :POST
+    expect(@request.method).to eq(:POST)
   end
 
   it "adds the chef version header" do
-    @request.headers.should == @headers.merge("X-Chef-Version" => ::Chef::VERSION)
+    expect(@request.headers).to eq(@headers.merge("X-Chef-Version" => ::Chef::VERSION))
   end
 
   describe "configuring the HTTP request" do
     it "configures GET requests" do
       @req_body = nil
       rest_req = new_request(:GET)
-      rest_req.http_request.should be_a_kind_of(Net::HTTP::Get)
-      rest_req.http_request.path.should == "/?q=chef_is_awesome"
-      rest_req.http_request.body.should be_nil
+      expect(rest_req.http_request).to be_a_kind_of(Net::HTTP::Get)
+      expect(rest_req.http_request.path).to eq("/?q=chef_is_awesome")
+      expect(rest_req.http_request.body).to be_nil
     end
 
     it "configures POST requests, including the body" do
-      @request.http_request.should be_a_kind_of(Net::HTTP::Post)
-      @request.http_request.path.should == "/?q=chef_is_awesome"
-      @request.http_request.body.should == @req_body
+      expect(@request.http_request).to be_a_kind_of(Net::HTTP::Post)
+      expect(@request.http_request.path).to eq("/?q=chef_is_awesome")
+      expect(@request.http_request.body).to eq(@req_body)
     end
 
     it "configures PUT requests, including the body" do
       rest_req = new_request(:PUT)
-      rest_req.http_request.should be_a_kind_of(Net::HTTP::Put)
-      rest_req.http_request.path.should == "/?q=chef_is_awesome"
-      rest_req.http_request.body.should == @req_body
+      expect(rest_req.http_request).to be_a_kind_of(Net::HTTP::Put)
+      expect(rest_req.http_request.path).to eq("/?q=chef_is_awesome")
+      expect(rest_req.http_request.body).to eq(@req_body)
     end
 
     it "configures DELETE requests" do
       rest_req = new_request(:DELETE)
-      rest_req.http_request.should be_a_kind_of(Net::HTTP::Delete)
-      rest_req.http_request.path.should == "/?q=chef_is_awesome"
-      rest_req.http_request.body.should be_nil
+      expect(rest_req.http_request).to be_a_kind_of(Net::HTTP::Delete)
+      expect(rest_req.http_request.path).to eq("/?q=chef_is_awesome")
+      expect(rest_req.http_request.body).to be_nil
     end
 
     it "configures HTTP basic auth" do
       @url = URI.parse("http://homie:theclown@chef.example.com:4000/?q=chef_is_awesome")
       rest_req = new_request(:GET)
-      rest_req.http_request.to_hash["authorization"].should == ["Basic aG9taWU6dGhlY2xvd24="]
+      expect(rest_req.http_request.to_hash["authorization"]).to eq(["Basic aG9taWU6dGhlY2xvd24="])
     end
   end
 
   describe "configuring the HTTP client" do
     it "configures the HTTP client for the host and port" do
       http_client = new_request.http_client
-      http_client.address.should == "chef.example.com"
-      http_client.port.should == 4000
+      expect(http_client.address).to eq("chef.example.com")
+      expect(http_client.port).to eq(4000)
     end
 
     it "configures the HTTP client with the read timeout set in the config file" do
       Chef::Config[:rest_timeout] = 9001
-      new_request.http_client.read_timeout.should == 9001
+      expect(new_request.http_client.read_timeout).to eq(9001)
     end
 
     describe "for proxy" do
@@ -226,21 +226,21 @@ describe Chef::REST::RESTRequest do
       describe "with :no_proxy nil" do
         it "configures the proxy address and port when using http scheme" do
           http_client = new_request.http_client
-          http_client.proxy?.should == true
-          http_client.proxy_address.should == "proxy.example.com"
-          http_client.proxy_port.should == 3128
-          http_client.proxy_user.should be_nil
-          http_client.proxy_pass.should be_nil
+          expect(http_client.proxy?).to eq(true)
+          expect(http_client.proxy_address).to eq("proxy.example.com")
+          expect(http_client.proxy_port).to eq(3128)
+          expect(http_client.proxy_user).to be_nil
+          expect(http_client.proxy_pass).to be_nil
         end
 
         it "configures the proxy address and port when using https scheme" do
           @url.scheme = "https"
           http_client = new_request.http_client
-          http_client.proxy?.should == true
-          http_client.proxy_address.should == "sproxy.example.com"
-          http_client.proxy_port.should == 3129
-          http_client.proxy_user.should be_nil
-          http_client.proxy_pass.should be_nil
+          expect(http_client.proxy?).to eq(true)
+          expect(http_client.proxy_address).to eq("sproxy.example.com")
+          expect(http_client.proxy_port).to eq(3129)
+          expect(http_client.proxy_user).to be_nil
+          expect(http_client.proxy_pass).to be_nil
         end
       end
 
@@ -251,21 +251,21 @@ describe Chef::REST::RESTRequest do
 
         it "does not configure the proxy address and port when using http scheme" do
           http_client = new_request.http_client
-          http_client.proxy?.should == false
-          http_client.proxy_address.should be_nil
-          http_client.proxy_port.should be_nil
-          http_client.proxy_user.should be_nil
-          http_client.proxy_pass.should be_nil
+          expect(http_client.proxy?).to eq(false)
+          expect(http_client.proxy_address).to be_nil
+          expect(http_client.proxy_port).to be_nil
+          expect(http_client.proxy_user).to be_nil
+          expect(http_client.proxy_pass).to be_nil
         end
 
         it "does not configure the proxy address and port when using https scheme" do
           @url.scheme = "https"
           http_client = new_request.http_client
-          http_client.proxy?.should == false
-          http_client.proxy_address.should be_nil
-          http_client.proxy_port.should be_nil
-          http_client.proxy_user.should be_nil
-          http_client.proxy_pass.should be_nil
+          expect(http_client.proxy?).to eq(false)
+          expect(http_client.proxy_address).to be_nil
+          expect(http_client.proxy_port).to be_nil
+          expect(http_client.proxy_user).to be_nil
+          expect(http_client.proxy_pass).to be_nil
         end
       end
 
@@ -282,17 +282,17 @@ describe Chef::REST::RESTRequest do
 
         it "configures the proxy user and pass when using http scheme" do
           http_client = new_request.http_client
-          http_client.proxy?.should == true
-          http_client.proxy_user.should == "homie"
-          http_client.proxy_pass.should == "theclown"
+          expect(http_client.proxy?).to eq(true)
+          expect(http_client.proxy_user).to eq("homie")
+          expect(http_client.proxy_pass).to eq("theclown")
         end
 
         it "does not configure the proxy user and pass when using https scheme" do
           @url.scheme = "https"
           http_client = new_request.http_client
-          http_client.proxy?.should == true
-          http_client.proxy_user.should be_nil
-          http_client.proxy_pass.should be_nil
+          expect(http_client.proxy?).to eq(true)
+          expect(http_client.proxy_user).to be_nil
+          expect(http_client.proxy_pass).to be_nil
         end
       end
 
@@ -309,17 +309,17 @@ describe Chef::REST::RESTRequest do
 
         it "does not configure the proxy user and pass when using http scheme" do
           http_client = new_request.http_client
-          http_client.proxy?.should == true
-          http_client.proxy_user.should be_nil
-          http_client.proxy_pass.should be_nil
+          expect(http_client.proxy?).to eq(true)
+          expect(http_client.proxy_user).to be_nil
+          expect(http_client.proxy_pass).to be_nil
         end
 
         it "configures the proxy user and pass when using https scheme" do
           @url.scheme = "https"
           http_client = new_request.http_client
-          http_client.proxy?.should == true
-          http_client.proxy_user.should == "homie"
-          http_client.proxy_pass.should == "theclown"
+          expect(http_client.proxy?).to eq(true)
+          expect(http_client.proxy_user).to eq("homie")
+          expect(http_client.proxy_pass).to eq("theclown")
         end
       end
     end

data/spec/unit/rest_spec.rb

@@ -83,7 +83,7 @@ describe Chef::REST do
 
     expect(content_length).not_to be_nil
     expect(decompressor).not_to be_nil
-    expect(decompressor < content_length).to be_true
+    expect(decompressor < content_length).to be_truthy
   end
 
   it "should allow the options hash to be frozen" do
@@ -214,7 +214,7 @@ describe Chef::REST do
 
     it "indicates that requests should not be signed when it has no credentials" do
       rest = Chef::REST.new(base_url, nil, nil)
-      expect(rest.sign_requests?).to be_false
+      expect(rest.sign_requests?).to be_falsey
     end
 
     it "raises PrivateKeyMissing when the key file doesn't exist" do
@@ -462,7 +462,7 @@ describe Chef::REST do
         end
 
         it "should return `false`" do
-          expect(rest.request(:GET, url)).to be_false
+          expect(rest.request(:GET, url)).to be_falsey
         end
       end
 
@@ -616,10 +616,10 @@ describe Chef::REST do
         tempfile_path = nil
         rest.streaming_request(url, {}) do |tempfile|
           tempfile_path = tempfile.path
-          expect(File.exist?(tempfile.path)).to be_true
+          expect(File.exist?(tempfile.path)).to be_truthy
           expect(IO.read(tempfile.path).chomp).to eq("realultimatepower")
         end
-        expect(File.exist?(tempfile_path)).to be_false
+        expect(File.exist?(tempfile_path)).to be_falsey
       end
 
       it "does not raise a divide by zero exception if the content's actual size is 0" do
@@ -648,7 +648,7 @@ describe Chef::REST do
           tempfile_path = tempfile.path
           expect(IO.read(tempfile.path).chomp).to eq("realultimatepower")
         end
-        expect(File.exist?(tempfile_path)).to be_false
+        expect(File.exist?(tempfile_path)).to be_falsey
       end
 
       it "closes and unlinks the tempfile if there is an error while streaming the content to the tempfile" do
@@ -656,7 +656,7 @@ describe Chef::REST do
         expect(path).not_to be_nil
         allow(tempfile).to receive(:write).and_raise(IOError)
         rest.fetch("cookbooks/a_cookbook") {|tmpfile| "shouldn't get here"}
-        expect(File.exists?(path)).to be_false
+        expect(File.exists?(path)).to be_falsey
       end
 
       it "closes and unlinks the tempfile when the response is a redirect" do
@@ -683,7 +683,7 @@ describe Chef::REST do
         rest.fetch("cookbooks/a_cookbook") do |tmpfile|
           block_called = true
         end
-        expect(block_called).to be_true
+        expect(block_called).to be_truthy
       end
     end
   end
@@ -718,15 +718,15 @@ describe Chef::REST do
 
     it "does not sign the redirected request when sign_on_redirect is false" do
       rest.sign_on_redirect = false
-      rest.follow_redirect { expect(rest.sign_requests?).to be_false }
+      rest.follow_redirect { expect(rest.sign_requests?).to be_falsey }
     end
 
     it "resets sign_requests to the original value after following an unsigned redirect" do
       rest.sign_on_redirect = false
-      expect(rest.sign_requests?).to be_true
+      expect(rest.sign_requests?).to be_truthy
 
-      rest.follow_redirect { expect(rest.sign_requests?).to be_false }
-      expect(rest.sign_requests?).to be_true
+      rest.follow_redirect { expect(rest.sign_requests?).to be_falsey }
+      expect(rest.sign_requests?).to be_truthy
     end
 
     it "configures the redirect limit" do

data/spec/unit/role_spec.rb

@@ -21,21 +21,21 @@ require 'chef/role'
 
 describe Chef::Role do
   before(:each) do
-    Chef::Platform.stub(:windows?) { false }
+    allow(Chef::Platform).to receive(:windows?) { false }
     @role = Chef::Role.new
     @role.name("ops_master")
   end
 
   it "has a name" do
-    @role.name("ops_master").should == "ops_master"
+    expect(@role.name("ops_master")).to eq("ops_master")
   end
 
   it "does not accept a name with spaces" do
-    lambda { @role.name "ops master" }.should raise_error(ArgumentError)
+    expect { @role.name "ops master" }.to raise_error(ArgumentError)
   end
 
   it "does not accept non-String objects for the name" do
-    lambda { @role.name({}) }.should raise_error(ArgumentError)
+    expect { @role.name({}) }.to raise_error(ArgumentError)
   end
 
   describe "when a run list is set" do
@@ -46,7 +46,7 @@ describe Chef::Role do
 
 
     it "returns the run list" do
-      @role.run_list.should == %w{ nginx recipe[ree] role[base]}
+      expect(@role.run_list).to eq(%w{ nginx recipe[ree] role[base]})
     end
 
     describe "and per-environment run lists are set" do
@@ -58,28 +58,28 @@ describe Chef::Role do
       end
 
       it "uses the default run list as *the* run_list" do
-        @role.run_list.should == Chef::RunList.new("recipe[nagios::client]", "recipe[tims-acl::bork]")
+        expect(@role.run_list).to eq(Chef::RunList.new("recipe[nagios::client]", "recipe[tims-acl::bork]"))
       end
 
       it "gives the default run list as the when getting the _default run list" do
-        @role.run_list_for("_default").should == @role.run_list
+        expect(@role.run_list_for("_default")).to eq(@role.run_list)
       end
 
       it "gives an environment specific run list" do
-        @role.run_list_for("prod").should == Chef::RunList.new("recipe[nagios::client]", "recipe[tims-acl::bork]", "recipe[prod-base]")
+        expect(@role.run_list_for("prod")).to eq(Chef::RunList.new("recipe[nagios::client]", "recipe[tims-acl::bork]", "recipe[prod-base]"))
       end
 
       it "gives the default run list when no run list exists for the given environment" do
-        @role.run_list_for("qa").should == @role.run_list
+        expect(@role.run_list_for("qa")).to eq(@role.run_list)
       end
 
       it "gives the environment specific run list even if it is empty" do
-        @role.run_list_for("dev").should == Chef::RunList.new
+        expect(@role.run_list_for("dev")).to eq(Chef::RunList.new)
       end
 
       it "env_run_lists can only be set with _default run list in it" do
         long_exception_name = Chef::Exceptions::InvalidEnvironmentRunListSpecification
-        lambda {@role.env_run_lists({})}.should raise_error(long_exception_name)
+        expect {@role.env_run_lists({})}.to raise_error(long_exception_name)
       end
 
     end
@@ -87,17 +87,17 @@ describe Chef::Role do
 
     describe "using the old #recipes API" do
       it "should let you set the recipe array" do
-        @role.recipes([ "one", "two" ]).should == [ "one", "two" ]
+        expect(@role.recipes([ "one", "two" ])).to eq([ "one", "two" ])
       end
 
       it "should let you return the recipe array" do
         @role.recipes([ "one", "two" ])
-        @role.recipes.should == [ "one", "two" ]
+        expect(@role.recipes).to eq([ "one", "two" ])
       end
 
       it "should not list roles in the recipe array" do
         @role.run_list([ "one", "role[two]"])
-        @role.recipes.should == [ "recipe[one]", "role[two]" ]
+        expect(@role.recipes).to eq([ "recipe[one]", "role[two]" ])
       end
 
     end
@@ -108,31 +108,31 @@ describe Chef::Role do
 
   describe "default_attributes" do
     it "should let you set the default attributes hash explicitly" do
-      @role.default_attributes({ :one => 'two' }).should == { :one => 'two' }
+      expect(@role.default_attributes({ :one => 'two' })).to eq({ :one => 'two' })
     end
 
     it "should let you return the default attributes hash" do
       @role.default_attributes({ :one => 'two' })
-      @role.default_attributes.should == { :one => 'two' }
+      expect(@role.default_attributes).to eq({ :one => 'two' })
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      lambda { @role.default_attributes(Array.new) }.should raise_error(ArgumentError)
+      expect { @role.default_attributes(Array.new) }.to raise_error(ArgumentError)
     end
   end
 
   describe "override_attributes" do
     it "should let you set the override attributes hash explicitly" do
-      @role.override_attributes({ :one => 'two' }).should == { :one => 'two' }
+      expect(@role.override_attributes({ :one => 'two' })).to eq({ :one => 'two' })
     end
 
     it "should let you return the override attributes hash" do
       @role.override_attributes({ :one => 'two' })
-      @role.override_attributes.should == { :one => 'two' }
+      expect(@role.override_attributes).to eq({ :one => 'two' })
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      lambda { @role.override_attributes(Array.new) }.should raise_error(ArgumentError)
+      expect { @role.override_attributes(Array.new) }.to raise_error(ArgumentError)
     end
   end
 
@@ -154,11 +154,11 @@ describe Chef::Role do
 
     it "should update all fields except for name" do
       @role.update_from!(@example)
-      @role.name.should == "mars_volta"
-      @role.description.should == @example.description
-      @role.run_list.should == @example.run_list
-      @role.default_attributes.should == @example.default_attributes
-      @role.override_attributes.should == @example.override_attributes
+      expect(@role.name).to eq("mars_volta")
+      expect(@role.description).to eq(@example.description)
+      expect(@role.run_list).to eq(@example.run_list)
+      expect(@role.default_attributes).to eq(@example.default_attributes)
+      expect(@role.override_attributes).to eq(@example.override_attributes)
     end
   end
 
@@ -173,29 +173,29 @@ describe Chef::Role do
     end
 
     it "should serialize to a json hash" do
-      Chef::JSONCompat.to_json(@role).should match(/^\{.+\}$/)
+      expect(Chef::JSONCompat.to_json(@role)).to match(/^\{.+\}$/)
     end
 
     it "includes the name in the JSON output" do
-      @serialized_role.should =~ /"name":"mars_volta"/
+      expect(@serialized_role).to match(/"name":"mars_volta"/)
     end
 
     it "includes its description in the JSON" do
-      @serialized_role.should match(/"description":"Great band!"/)
+      expect(@serialized_role).to match(/"description":"Great band!"/)
     end
 
     it "should include 'default_attributes'" do
-      @serialized_role.should =~ /"default_attributes":\{"el_groupo":"nuevo"\}/
+      expect(@serialized_role).to match(/"default_attributes":\{"el_groupo":"nuevo"\}/)
     end
 
     it "should include 'override_attributes'" do
-      @serialized_role.should =~ /"override_attributes":\{"deloused":"in the comatorium"\}/
+      expect(@serialized_role).to match(/"override_attributes":\{"deloused":"in the comatorium"\}/)
     end
 
     it "should include 'run_list'" do
       #Activesupport messes with Chef json formatting
       #This test should pass with and without activesupport
-      @serialized_role.should =~ /"run_list":\["recipe\[one\]","recipe\[two\]","role\[a\]"\]/
+      expect(@serialized_role).to match(/"run_list":\["recipe\[one\]","recipe\[two\]","role\[a\]"\]/)
     end
 
     describe "and it has per-environment run lists" do
@@ -207,12 +207,12 @@ describe Chef::Role do
       it "includes the per-environment run lists" do
         #Activesupport messes with Chef json formatting
         #This test should pass with and without activesupport
-        @serialized_role["env_run_lists"]["production"].should == ['role[monitoring]', 'role[auditing]', 'role[apache]']
-        @serialized_role["env_run_lists"]["dev"].should == ["role[nginx]"]
+        expect(@serialized_role["env_run_lists"]["production"]).to eq(['role[monitoring]', 'role[auditing]', 'role[apache]'])
+        expect(@serialized_role["env_run_lists"]["dev"]).to eq(["role[nginx]"])
       end
 
       it "does not include the default environment in the per-environment run lists" do
-        @serialized_role["env_run_lists"].should_not have_key("_default")
+        expect(@serialized_role["env_run_lists"]).not_to have_key("_default")
       end
 
     end
@@ -233,7 +233,7 @@ describe Chef::Role do
     end
 
     it "should deserialize to a Chef::Role object" do
-      @deserial.should be_a_kind_of(Chef::Role)
+      expect(@deserial).to be_a_kind_of(Chef::Role)
     end
 
     %w{
@@ -244,7 +244,7 @@ describe Chef::Role do
       run_list
     }.each do |t|
       it "should preserves the '#{t}' attribute from the JSON object" do
-        @deserial.send(t.to_sym).should == @role.send(t.to_sym)
+        expect(@deserial.send(t.to_sym)).to eq(@role.send(t.to_sym))
       end
     end
   end
@@ -257,56 +257,57 @@ EOR
   describe "when loading from disk" do
     before do
       default_cache_path = windows? ? 'C:\chef' : '/var/chef'
-      Chef::Config.stub(:cache_path).and_return(default_cache_path)
+      allow(Chef::Config).to receive(:cache_path).and_return(default_cache_path)
     end
 
     it "should return a Chef::Role object from JSON" do
-      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json"])
+      expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json"])
       file_path = File.join(Chef::Config[:role_path], 'memes/lolcat.json')
-      File.should_receive(:exists?).with(file_path).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(file_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
-      @role.should be_a_kind_of(Chef::Role)
+      expect(File).to receive(:exists?).with(file_path).exactly(1).times.and_return(true)
+      expect(IO).to receive(:read).with(file_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from a Ruby DSL" do
-      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
+      expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
       rb_path = File.join(Chef::Config[:role_path], 'memes/lolcat.rb')
-      File.should_receive(:exists?).with(rb_path).exactly(2).times.and_return(true)
-      File.should_receive(:readable?).with(rb_path).exactly(1).times.and_return(true)
-      IO.should_receive(:read).with(rb_path).and_return(ROLE_DSL)
-      @role.should be_a_kind_of(Chef::Role)
+      expect(File).to receive(:exists?).with(rb_path).exactly(2).times.and_return(true)
+      expect(File).to receive(:readable?).with(rb_path).exactly(1).times.and_return(true)
+      expect(IO).to receive(:read).with(rb_path).and_return(ROLE_DSL)
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should prefer a Chef::Role Object from JSON over one from a Ruby DSL" do
-      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
+      expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
       js_path = File.join(Chef::Config[:role_path], 'memes/lolcat.json')
       rb_path = File.join(Chef::Config[:role_path], 'memes/lolcat.rb')
-      File.should_receive(:exists?).with(js_path).exactly(1).times.and_return(true)
-      File.should_not_receive(:exists?).with(rb_path)
-      IO.should_receive(:read).with(js_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
-      @role.should be_a_kind_of(Chef::Role)
+      expect(File).to receive(:exists?).with(js_path).exactly(1).times.and_return(true)
+      expect(File).not_to receive(:exists?).with(rb_path)
+      expect(IO).to receive(:read).with(js_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should raise an exception if the file does not exist" do
-      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/meme.rb"])
-      File.should_not_receive(:exists?)
-      lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::RoleNotFound)
+      expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/meme.rb"])
+      expect(File).not_to receive(:exists?)
+      expect {@role.class.from_disk("lolcat")}.to raise_error(Chef::Exceptions::RoleNotFound)
     end
 
     it "should raise an exception if two files exist with the same name" do
-      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/lolcat.rb"])
-      File.should_not_receive(:exists?)
-      lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::DuplicateRole)
+      expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/lolcat.rb"])
+      expect(File).not_to receive(:exists?)
+      expect {@role.class.from_disk("lolcat")}.to raise_error(Chef::Exceptions::DuplicateRole)
     end
 
     it "should not raise an exception if two files exist with a similar name" do
-      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/super_lolcat.rb"])
-      File.should_not_receive(:exists?)
-      lambda {@role.class.from_disk("lolcat")}.should_not raise_error(Chef::Exceptions::DuplicateRole)
-    end    
+      expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/super_lolcat.rb"])
+      expect(File).to receive(:exists?).with("#{Chef::Config[:role_path]}/memes/lolcat.rb").and_return(true)
+      allow_any_instance_of(Chef::Role).to receive(:from_file).with("#{Chef::Config[:role_path]}/memes/lolcat.rb")
+      expect{ @role.class.from_disk("lolcat") }.not_to raise_error
+    end
   end
 
   describe "when loading from disk and role_path is an array" do
@@ -316,45 +317,45 @@ EOR
     end
 
     it "should return a Chef::Role object from JSON" do
-      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return(['/path1/lolcat.json'])
-      File.should_receive(:exists?).with('/path1/lolcat.json').exactly(1).times.and_return(true)
-      IO.should_receive(:read).with('/path1/lolcat.json').and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
-      @role.should be_a_kind_of(Chef::Role)
+      expect(Dir).to receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return(['/path1/lolcat.json'])
+      expect(File).to receive(:exists?).with('/path1/lolcat.json').exactly(1).times.and_return(true)
+      expect(IO).to receive(:read).with('/path1/lolcat.json').and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from JSON when role is in the second path" do
-      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
-      Dir.should_receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return(['/path/path2/lolcat.json'])
-      File.should_receive(:exists?).with('/path/path2/lolcat.json').exactly(1).times.and_return(true)
-      IO.should_receive(:read).with('/path/path2/lolcat.json').and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
-      @role.should be_a_kind_of(Chef::Role)
+      expect(Dir).to receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
+      expect(Dir).to receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return(['/path/path2/lolcat.json'])
+      expect(File).to receive(:exists?).with('/path/path2/lolcat.json').exactly(1).times.and_return(true)
+      expect(IO).to receive(:read).with('/path/path2/lolcat.json').and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from a Ruby DSL" do
-      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return(['/path1/lolcat.rb'])
-      File.should_receive(:exists?).with('/path1/lolcat.rb').exactly(2).times.and_return(true)
-      File.should_receive(:readable?).with('/path1/lolcat.rb').and_return(true)
-      IO.should_receive(:read).with('/path1/lolcat.rb').exactly(1).times.and_return(ROLE_DSL)
-      @role.should be_a_kind_of(Chef::Role)
+      expect(Dir).to receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return(['/path1/lolcat.rb'])
+      expect(File).to receive(:exists?).with('/path1/lolcat.rb').exactly(2).times.and_return(true)
+      expect(File).to receive(:readable?).with('/path1/lolcat.rb').and_return(true)
+      expect(IO).to receive(:read).with('/path1/lolcat.rb').exactly(1).times.and_return(ROLE_DSL)
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should return a Chef::Role object from a Ruby DSL when role is in the second path" do
-      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
-      Dir.should_receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return(['/path/path2/lolcat.rb'])
-      File.should_receive(:exists?).with('/path/path2/lolcat.rb').exactly(2).times.and_return(true)
-      File.should_receive(:readable?).with('/path/path2/lolcat.rb').and_return(true)
-      IO.should_receive(:read).with('/path/path2/lolcat.rb').exactly(1).times.and_return(ROLE_DSL)
-      @role.should be_a_kind_of(Chef::Role)
+      expect(Dir).to receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
+      expect(Dir).to receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return(['/path/path2/lolcat.rb'])
+      expect(File).to receive(:exists?).with('/path/path2/lolcat.rb').exactly(2).times.and_return(true)
+      expect(File).to receive(:readable?).with('/path/path2/lolcat.rb').and_return(true)
+      expect(IO).to receive(:read).with('/path/path2/lolcat.rb').exactly(1).times.and_return(ROLE_DSL)
+      expect(@role).to be_a_kind_of(Chef::Role)
       @role.class.from_disk("lolcat")
     end
 
     it "should raise an exception if the file does not exist" do
-      Dir.should_receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
-      Dir.should_receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return([])
-      lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::RoleNotFound)
+      expect(Dir).to receive(:glob).with(File.join('/path1', '**', '**')).exactly(1).times.and_return([])
+      expect(Dir).to receive(:glob).with(File.join('/path/path2', '**', '**')).exactly(1).times.and_return([])
+      expect {@role.class.from_disk("lolcat")}.to raise_error(Chef::Exceptions::RoleNotFound)
     end
 
   end