chef 12.0.0.alpha.2 → 12.0.0.rc.0

data/spec/unit/provider/remote_file/http_spec.rb

@@ -48,11 +48,11 @@ describe Chef::Provider::RemoteFile::HTTP do
     context "and there is no valid cache control data for this URI on disk" do
 
       before do
-        Chef::Provider::RemoteFile::CacheControlData.should_receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
+        expect(Chef::Provider::RemoteFile::CacheControlData).to receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
       end
 
       it "does not add conditional GET headers" do
-        fetcher.conditional_get_headers.should == {}
+        expect(fetcher.conditional_get_headers).to eq({})
       end
 
       context "and the resource specifies custom headers" do
@@ -61,7 +61,7 @@ describe Chef::Provider::RemoteFile::HTTP do
         end
 
         it "has the user-specified custom headers" do
-          fetcher.headers.should == {"x-myapp-header" => "custom-header-value"}
+          expect(fetcher.headers).to eq({"x-myapp-header" => "custom-header-value"})
         end
       end
 
@@ -79,7 +79,7 @@ describe Chef::Provider::RemoteFile::HTTP do
         cache_control_data.etag = etag
         cache_control_data.mtime = mtime
 
-        Chef::Provider::RemoteFile::CacheControlData.should_receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
+        expect(Chef::Provider::RemoteFile::CacheControlData).to receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
       end
 
       context "and no conditional get features are enabled" do
@@ -88,7 +88,7 @@ describe Chef::Provider::RemoteFile::HTTP do
         end
 
         it "does not add headers to the request" do
-          fetcher.headers.should == {}
+          expect(fetcher.headers).to eq({})
         end
       end
 
@@ -99,8 +99,8 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         it "adds If-None-Match and If-Modified-Since headers to the request" do
           headers = fetcher.headers
-          headers["if-none-match"].should == etag
-          headers["if-modified-since"].should == mtime
+          expect(headers["if-none-match"]).to eq(etag)
+          expect(headers["if-modified-since"]).to eq(mtime)
         end
 
         context "and custom headers are provided" do
@@ -111,13 +111,13 @@ describe Chef::Provider::RemoteFile::HTTP do
           end
 
           it "preserves non-conflicting headers" do
-            fetcher.headers["x-myapp-header"].should == "app-specific-header"
+            expect(fetcher.headers["x-myapp-header"]).to eq("app-specific-header")
           end
 
           it "prefers user-supplied cache control headers" do
             headers = fetcher.headers
-            headers["if-none-match"].should == "custom-etag"
-            headers["if-modified-since"].should == "custom-last-modified"
+            expect(headers["if-none-match"]).to eq("custom-etag")
+            expect(headers["if-modified-since"]).to eq("custom-last-modified")
           end
         end
 
@@ -131,8 +131,8 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         it "only adds If-None-Match headers to the request" do
           headers = fetcher.headers
-          headers["if-none-match"].should == etag
-          headers.should_not have_key("if-modified-since")
+          expect(headers["if-none-match"]).to eq(etag)
+          expect(headers).not_to have_key("if-modified-since")
         end
       end
 
@@ -144,8 +144,8 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         it "only adds If-Modified-Since headers to the request" do
           headers = fetcher.headers
-          headers["if-modified-since"].should == mtime
-          headers.should_not have_key("if-none-match")
+          expect(headers["if-modified-since"]).to eq(mtime)
+          expect(headers).not_to have_key("if-none-match")
         end
       end
     end
@@ -165,17 +165,17 @@ describe Chef::Provider::RemoteFile::HTTP do
 
     let(:rest) do
       rest = double(Chef::HTTP::Simple)
-      rest.stub(:streaming_request).and_return(tempfile)
-      rest.stub(:last_response).and_return(last_response)
+      allow(rest).to receive(:streaming_request).and_return(tempfile)
+      allow(rest).to receive(:last_response).and_return(last_response)
       rest
     end
 
     before do
       new_resource.headers({})
       new_resource.use_last_modified(false)
-      Chef::Provider::RemoteFile::CacheControlData.should_receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
+      expect(Chef::Provider::RemoteFile::CacheControlData).to receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
 
-      Chef::HTTP::Simple.should_receive(:new).with(*expected_http_args).and_return(rest)
+      expect(Chef::HTTP::Simple).to receive(:new).with(*expected_http_args).and_return(rest)
     end
 
 
@@ -183,8 +183,8 @@ describe Chef::Provider::RemoteFile::HTTP do
 
       it "should return a nil tempfile for a 304 HTTPNotModifed" do
         # Streaming request returns nil for 304 errors
-        rest.stub(:streaming_request).and_return(nil)
-        fetcher.fetch.should be_nil
+        allow(rest).to receive(:streaming_request).and_return(nil)
+        expect(fetcher.fetch).to be_nil
       end
 
     end
@@ -194,25 +194,25 @@ describe Chef::Provider::RemoteFile::HTTP do
       let(:fetched_content_checksum) { "e2a8938cc31754f6c067b35aab1d0d4864272e9bf8504536ef3e79ebf8432305" }
 
       before do
-        cache_control_data.should_receive(:save)
-        Chef::Digester.should_receive(:checksum_for_file).with(tempfile_path).and_return(fetched_content_checksum)
+        expect(cache_control_data).to receive(:save)
+        expect(Chef::Digester).to receive(:checksum_for_file).with(tempfile_path).and_return(fetched_content_checksum)
       end
 
       it "should return a tempfile" do
         result = fetcher.fetch
-        result.should == tempfile
-        cache_control_data.etag.should be_nil
-        cache_control_data.mtime.should be_nil
-        cache_control_data.checksum.should == fetched_content_checksum
+        expect(result).to eq(tempfile)
+        expect(cache_control_data.etag).to be_nil
+        expect(cache_control_data.mtime).to be_nil
+        expect(cache_control_data.checksum).to eq(fetched_content_checksum)
       end
 
       context "and the response does not contain an etag" do
         let(:last_response) { {"etag" => nil} }
         it "does not include an etag in the result" do
           fetcher.fetch
-          cache_control_data.etag.should be_nil
-          cache_control_data.mtime.should be_nil
-          cache_control_data.checksum.should == fetched_content_checksum
+          expect(cache_control_data.etag).to be_nil
+          expect(cache_control_data.mtime).to be_nil
+          expect(cache_control_data.checksum).to eq(fetched_content_checksum)
         end
       end
 
@@ -221,9 +221,9 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         it "includes the etag value in the response" do
           fetcher.fetch
-          cache_control_data.etag.should == "abc123"
-          cache_control_data.mtime.should be_nil
-          cache_control_data.checksum.should == fetched_content_checksum
+          expect(cache_control_data.etag).to eq("abc123")
+          expect(cache_control_data.mtime).to be_nil
+          expect(cache_control_data.checksum).to eq(fetched_content_checksum)
         end
 
       end
@@ -234,9 +234,9 @@ describe Chef::Provider::RemoteFile::HTTP do
           # RFC 2616 suggests that servers that do not set a Date header do not
           # have a reliable clock, so no use in making them deal with dates.
           fetcher.fetch
-          cache_control_data.etag.should be_nil
-          cache_control_data.mtime.should be_nil
-          cache_control_data.checksum.should == fetched_content_checksum
+          expect(cache_control_data.etag).to be_nil
+          expect(cache_control_data.mtime).to be_nil
+          expect(cache_control_data.checksum).to eq(fetched_content_checksum)
         end
       end
 
@@ -248,8 +248,8 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         it "sets the mtime to the Last-Modified time in the response" do
           fetcher.fetch
-          cache_control_data.etag.should be_nil
-          cache_control_data.mtime.should == last_response["last_modified"]
+          expect(cache_control_data.etag).to be_nil
+          expect(cache_control_data.mtime).to eq(last_response["last_modified"])
         end
       end
 
@@ -260,9 +260,9 @@ describe Chef::Provider::RemoteFile::HTTP do
 
         it "sets the mtime to the Date in the response" do
           fetcher.fetch
-          cache_control_data.etag.should be_nil
-          cache_control_data.mtime.should == last_response["date"]
-          cache_control_data.checksum.should == fetched_content_checksum
+          expect(cache_control_data.etag).to be_nil
+          expect(cache_control_data.mtime).to eq(last_response["date"])
+          expect(cache_control_data.checksum).to eq(fetched_content_checksum)
         end
 
       end
@@ -288,11 +288,11 @@ describe Chef::Provider::RemoteFile::HTTP do
           # This is intended to provide insurance that refactoring of the parent
           # context does not negate the value of this particular example.
           Chef::HTTP::Simple.new(*expected_http_args)
-          Chef::HTTP::Simple.should_receive(:new).once.with(*expected_http_args).and_return(rest)
+          expect(Chef::HTTP::Simple).to receive(:new).once.with(*expected_http_args).and_return(rest)
           fetcher.fetch
-          cache_control_data.etag.should be_nil
-          cache_control_data.mtime.should be_nil
-          cache_control_data.checksum.should == fetched_content_checksum
+          expect(cache_control_data.etag).to be_nil
+          expect(cache_control_data.mtime).to be_nil
+          expect(cache_control_data.checksum).to eq(fetched_content_checksum)
         end
       end
     end

data/spec/unit/provider/remote_file/local_file_spec.rb

@@ -30,21 +30,21 @@ describe Chef::Provider::RemoteFile::LocalFile do
     describe "when given local unix path" do
       let(:uri) { URI.parse("file:///nyan_cat.png") }
       it "returns a correct unix path" do
-        fetcher.fix_windows_path(uri.path).should == "/nyan_cat.png"
+        expect(fetcher.fix_windows_path(uri.path)).to eq("/nyan_cat.png")
       end
     end
 
     describe "when given local windows path" do
       let(:uri) { URI.parse("file:///z:/windows/path/file.txt") }
       it "returns a valid windows local path" do
-        fetcher.fix_windows_path(uri.path).should == "z:/windows/path/file.txt"
+        expect(fetcher.fix_windows_path(uri.path)).to eq("z:/windows/path/file.txt")
       end
     end
 
     describe "when given unc windows path" do
       let(:uri) { URI.parse("file:////server/share/windows/path/file.txt") }
       it "returns a valid windows unc path" do
-        fetcher.fix_windows_path(uri.path).should == "//server/share/windows/path/file.txt"
+        expect(fetcher.fix_windows_path(uri.path)).to eq("//server/share/windows/path/file.txt")
       end
     end
   end
@@ -52,11 +52,11 @@ describe Chef::Provider::RemoteFile::LocalFile do
   context "when first created" do
 
     it "stores the uri it is passed" do
-      fetcher.uri.should == uri
+      expect(fetcher.uri).to eq(uri)
     end
 
     it "stores the new_resource" do
-      fetcher.new_resource.should == new_resource
+      expect(fetcher.new_resource).to eq(new_resource)
     end
 
   end
@@ -71,12 +71,12 @@ describe Chef::Provider::RemoteFile::LocalFile do
     end
 
     it "stages the local file to a temporary file" do
-      Chef::FileContentManagement::Tempfile.should_receive(:new).with(new_resource).and_return(chef_tempfile)
-      ::FileUtils.should_receive(:cp).with(uri.path, tempfile.path)
-      tempfile.should_receive(:close)            
+      expect(Chef::FileContentManagement::Tempfile).to receive(:new).with(new_resource).and_return(chef_tempfile)
+      expect(::FileUtils).to receive(:cp).with(uri.path, tempfile.path)
+      expect(tempfile).to receive(:close)            
 
       result = fetcher.fetch
-      result.should == tempfile
+      expect(result).to eq(tempfile)
     end
 
   end

data/spec/unit/provider/remote_file_spec.rb

@@ -47,13 +47,13 @@ describe Chef::Provider::RemoteFile do
 
   subject(:provider) do
     provider = described_class.new(resource, run_context)
-    provider.stub(:content).and_return(content)
-    provider.stub(:update_new_resource_checksum).and_return(nil) # Otherwise it doesn't behave like a File provider
+    allow(provider).to receive(:content).and_return(content)
+    allow(provider).to receive(:update_new_resource_checksum).and_return(nil) # Otherwise it doesn't behave like a File provider
     provider
   end
 
   before do
-    Chef::FileCache.stub(:load).with("remote_file/#{resource.name}").and_raise(Chef::Exceptions::FileNotFound)
+    allow(Chef::FileCache).to receive(:load).with("remote_file/#{resource.name}").and_raise(Chef::Exceptions::FileNotFound)
   end
 
   it_behaves_like Chef::Provider::File

data/spec/unit/provider/route_spec.rb

@@ -36,14 +36,14 @@ describe Chef::Provider::Route do
 
   describe Chef::Provider::Route, "hex2ip" do
     it "should return nil if ip address is invalid" do
-      @provider.hex2ip('foo').should be_nil # does not even look like an ip
-      @provider.hex2ip('ABCDEFGH').should be_nil # 8 chars, but invalid
+      expect(@provider.hex2ip('foo')).to be_nil # does not even look like an ip
+      expect(@provider.hex2ip('ABCDEFGH')).to be_nil # 8 chars, but invalid
     end
 
     it "should return quad-dotted notation for a valid IP" do
-      @provider.hex2ip('01234567').should == '103.69.35.1'
-      @provider.hex2ip('0064a8c0').should == '192.168.100.0'
-      @provider.hex2ip('00FFFFFF').should == '255.255.255.0'
+      expect(@provider.hex2ip('01234567')).to eq('103.69.35.1')
+      expect(@provider.hex2ip('0064a8c0')).to eq('192.168.100.0')
+      expect(@provider.hex2ip('00FFFFFF')).to eq('255.255.255.0')
     end
   end
 
@@ -55,158 +55,158 @@ describe Chef::Provider::Route do
         routing_table = "Iface	Destination	Gateway 	Flags	RefCnt	Use	Metric	Mask		MTU	Window	IRTT\n" +
                         "eth0	0064A8C0	0984A8C0	0003	0	0	0	00FFFFFF	0	0	0\n"
         route_file = StringIO.new(routing_table)
-        File.stub(:open).with("/proc/net/route", "r").and_return(route_file)
+        allow(File).to receive(:open).with("/proc/net/route", "r").and_return(route_file)
       end
 
       it "should set is_running to false when a route is not detected" do
         resource = Chef::Resource::Route.new('10.10.10.0/24')
-        resource.stub(:gateway).and_return("10.0.0.1")
-        resource.stub(:device).and_return("eth0")
+        allow(resource).to receive(:gateway).and_return("10.0.0.1")
+        allow(resource).to receive(:device).and_return("eth0")
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
-        provider.is_running.should be_false
+        expect(provider.is_running).to be_false
       end
 
       it "should detect existing routes and set is_running attribute correctly" do
         resource = Chef::Resource::Route.new('192.168.100.0/24')
-        resource.stub(:gateway).and_return("192.168.132.9")
-        resource.stub(:device).and_return("eth0")
+        allow(resource).to receive(:gateway).and_return("192.168.132.9")
+        allow(resource).to receive(:device).and_return("eth0")
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
-        provider.is_running.should be_true
+        expect(provider.is_running).to be_true
       end
 
       it "should use gateway value when matching routes" do
         resource = Chef::Resource::Route.new('192.168.100.0/24')
-        resource.stub(:gateway).and_return("10.10.10.10")
-        resource.stub(:device).and_return("eth0")
+        allow(resource).to receive(:gateway).and_return("10.10.10.10")
+        allow(resource).to receive(:device).and_return("eth0")
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
-        provider.is_running.should be_false
+        expect(provider.is_running).to be_false
       end
     end
   end
 
   describe Chef::Provider::Route, "action_add" do
     it "should add the route if it does not exist" do
-      @provider.stub(:run_command).and_return(true)
-      @current_resource.stub(:gateway).and_return(nil)
-      @provider.should_receive(:generate_command).once.with(:add)
-      @provider.should_receive(:generate_config)
+      allow(@provider).to receive(:run_command).and_return(true)
+      allow(@current_resource).to receive(:gateway).and_return(nil)
+      expect(@provider).to receive(:generate_command).once.with(:add)
+      expect(@provider).to receive(:generate_config)
       @provider.run_action(:add)
-      @new_resource.should be_updated
+      expect(@new_resource).to be_updated
     end
 
     it "should not add the route if it exists" do
-      @provider.stub(:run_command).and_return(true)
-      @provider.stub(:is_running).and_return(true)
-      @provider.should_not_receive(:generate_command).with(:add)
-      @provider.should_receive(:generate_config)
+      allow(@provider).to receive(:run_command).and_return(true)
+      allow(@provider).to receive(:is_running).and_return(true)
+      expect(@provider).not_to receive(:generate_command).with(:add)
+      expect(@provider).to receive(:generate_config)
       @provider.run_action(:add)
-      @new_resource.should_not be_updated
+      expect(@new_resource).not_to be_updated
     end
 
     it "should not delete config file for :add action (CHEF-3332)" do
       @node.automatic_attrs[:platform] = 'centos'
 
       route_file = StringIO.new
-      File.should_receive(:new).and_return(route_file)
+      expect(File).to receive(:new).and_return(route_file)
       @resource_add = Chef::Resource::Route.new('192.168.1.0/24 via 192.168.0.1')
       @run_context.resource_collection << @resource_add
-      @provider.stub(:run_command).and_return(true)
+      allow(@provider).to receive(:run_command).and_return(true)
 
       @resource_add.action(:add)
       @provider.run_action(:add)
-      route_file.string.split("\n").should have(1).items
-      route_file.string.should match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
+      expect(route_file.string.split("\n").size).to eq(1)
+      expect(route_file.string).to match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
     end
   end
 
   describe Chef::Provider::Route, "action_delete" do
     it "should delete the route if it exists" do
-      @provider.stub(:run_command).and_return(true)
-      @provider.should_receive(:generate_command).once.with(:delete)
-      @provider.stub(:is_running).and_return(true)
+      allow(@provider).to receive(:run_command).and_return(true)
+      expect(@provider).to receive(:generate_command).once.with(:delete)
+      allow(@provider).to receive(:is_running).and_return(true)
       @provider.run_action(:delete)
-      @new_resource.should be_updated
+      expect(@new_resource).to be_updated
     end
 
     it "should not delete the route if it does not exist" do
-      @current_resource.stub(:gateway).and_return(nil)
-      @provider.stub(:run_command).and_return(true)
-      @provider.should_not_receive(:generate_command).with(:add)
+      allow(@current_resource).to receive(:gateway).and_return(nil)
+      allow(@provider).to receive(:run_command).and_return(true)
+      expect(@provider).not_to receive(:generate_command).with(:add)
       @provider.run_action(:delete)
-      @new_resource.should_not be_updated
+      expect(@new_resource).not_to be_updated
     end
   end
 
   describe Chef::Provider::Route, "generate_command for action_add" do
     it "should include a netmask when a one is specified" do
-      @new_resource.stub(:netmask).and_return('255.255.0.0')
-      @provider.generate_command(:add).should match(/\/\d{1,2}\s/)
+      allow(@new_resource).to receive(:netmask).and_return('255.255.0.0')
+      expect(@provider.generate_command(:add)).to match(/\/\d{1,2}\s/)
     end
 
     it "should not include a netmask when a one is specified" do
-      @new_resource.stub(:netmask).and_return(nil)
-      @provider.generate_command(:add).should_not match(/\/\d{1,2}\s/)
+      allow(@new_resource).to receive(:netmask).and_return(nil)
+      expect(@provider.generate_command(:add)).not_to match(/\/\d{1,2}\s/)
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
-      @provider.generate_command(:add).should match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
+      expect(@provider.generate_command(:add)).to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
-      @new_resource.stub(:gateway).and_return(nil)
-      @provider.generate_command(:add).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
+      allow(@new_resource).to receive(:gateway).and_return(nil)
+      expect(@provider.generate_command(:add)).not_to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
   end
 
   describe Chef::Provider::Route, "generate_command for action_delete" do
     it "should include a netmask when a one is specified" do
-      @new_resource.stub(:netmask).and_return('255.255.0.0')
-      @provider.generate_command(:delete).should match(/\/\d{1,2}\s/)
+      allow(@new_resource).to receive(:netmask).and_return('255.255.0.0')
+      expect(@provider.generate_command(:delete)).to match(/\/\d{1,2}\s/)
     end
 
     it "should not include a netmask when a one is specified" do
-      @new_resource.stub(:netmask).and_return(nil)
-      @provider.generate_command(:delete).should_not match(/\/\d{1,2}\s/)
+      allow(@new_resource).to receive(:netmask).and_return(nil)
+      expect(@provider.generate_command(:delete)).not_to match(/\/\d{1,2}\s/)
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
-      @provider.generate_command(:delete).should match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
+      expect(@provider.generate_command(:delete)).to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
-      @new_resource.stub(:gateway).and_return(nil)
-      @provider.generate_command(:delete).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
+      allow(@new_resource).to receive(:gateway).and_return(nil)
+      expect(@provider.generate_command(:delete)).not_to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
   end
 
   describe Chef::Provider::Route, "config_file_contents for action_add" do
     it "should include a netmask when a one is specified" do
-      @new_resource.stub(:netmask).and_return('255.255.0.0')
-      @provider.config_file_contents(:add, { :target => @new_resource.target, :netmask => @new_resource.netmask}).should match(/\/\d{1,2}.*\n$/)
+      allow(@new_resource).to receive(:netmask).and_return('255.255.0.0')
+      expect(@provider.config_file_contents(:add, { :target => @new_resource.target, :netmask => @new_resource.netmask})).to match(/\/\d{1,2}.*\n$/)
     end
 
     it "should not include a netmask when a one is specified" do
-      @provider.config_file_contents(:add, { :target => @new_resource.target}).should_not match(/\/\d{1,2}.*\n$/)
+      expect(@provider.config_file_contents(:add, { :target => @new_resource.target})).not_to match(/\/\d{1,2}.*\n$/)
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
-      @provider.config_file_contents(:add, { :target => @new_resource.target, :gateway => @new_resource.gateway}).should match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\n/)
+      expect(@provider.config_file_contents(:add, { :target => @new_resource.target, :gateway => @new_resource.gateway})).to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\n/)
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
-      @provider.generate_command(:add).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\n/)
+      expect(@provider.generate_command(:add)).not_to match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\n/)
     end
   end
 
   describe Chef::Provider::Route, "config_file_contents for action_delete" do
     it "should return an empty string" do
-      @provider.config_file_contents(:delete).should match(/^$/)
+      expect(@provider.config_file_contents(:delete)).to match(/^$/)
     end
   end
 
@@ -216,7 +216,7 @@ describe Chef::Provider::Route do
         @node.automatic_attrs[:platform] = platform
 
         route_file = StringIO.new
-        File.should_receive(:new).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
+        expect(File).to receive(:new).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
         #Chef::Log.should_receive(:debug).with("route[10.0.0.10] writing route.eth0\n10.0.0.10 via 10.0.0.9\n")
         @run_context.resource_collection << @new_resource
         @provider.generate_config
@@ -227,17 +227,17 @@ describe Chef::Provider::Route do
       @node.automatic_attrs[:platform] = 'centos'
 
       route_file = StringIO.new
-      File.should_receive(:new).and_return(route_file)
+      expect(File).to receive(:new).and_return(route_file)
       @run_context.resource_collection << Chef::Resource::Route.new('192.168.1.0/24 via 192.168.0.1')
       @run_context.resource_collection << Chef::Resource::Route.new('192.168.2.0/24 via 192.168.0.1')
       @run_context.resource_collection << Chef::Resource::Route.new('192.168.3.0/24 via 192.168.0.1')
 
       @provider.action = :add
       @provider.generate_config
-      route_file.string.split("\n").should have(3).items
-      route_file.string.should match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
-      route_file.string.should match(/^192\.168\.2\.0\/24 via 192\.168\.0\.1$/)
-      route_file.string.should match(/^192\.168\.3\.0\/24 via 192\.168\.0\.1$/)
+      expect(route_file.string.split("\n").size).to eq(3)
+      expect(route_file.string).to match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
+      expect(route_file.string).to match(/^192\.168\.2\.0\/24 via 192\.168\.0\.1$/)
+      expect(route_file.string).to match(/^192\.168\.3\.0\/24 via 192\.168\.0\.1$/)
     end
   end
 end