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

data/spec/unit/knife/cookbook_list_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Knife::CookbookList do
   before do
     @knife = Chef::Knife::CookbookList.new
     @rest_mock = double('rest')
-    @knife.stub(:rest).and_return(@rest_mock)
+    allow(@knife).to receive(:rest).and_return(@rest_mock)
     @cookbook_names = ['apache2', 'mysql']
     @base_url = 'https://server.example.com/cookbooks'
     @cookbook_data = {}
@@ -32,22 +32,22 @@ describe Chef::Knife::CookbookList do
                                               'url' => "#{@base_url}/#{item}/1.0.1"}]}
     end
     @stdout = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
   end
 
   describe 'run' do
     it 'should display the latest version of the cookbooks' do
-      @rest_mock.should_receive(:get_rest).with('/cookbooks?num_versions=1').
+      expect(@rest_mock).to receive(:get_rest).with('/cookbooks?num_versions=1').
                                            and_return(@cookbook_data)
       @knife.run
       @cookbook_names.each do |item|
-        @stdout.string.should match /#{item}\s+1\.0\.1/
+        expect(@stdout.string).to match /#{item}\s+1\.0\.1/
       end
     end
 
     it 'should query cookbooks for the configured environment' do
       @knife.config[:environment] = 'production'
-      @rest_mock.should_receive(:get_rest).
+      expect(@rest_mock).to receive(:get_rest).
                  with('/environments/production/cookbooks?num_versions=1').
                  and_return(@cookbook_data)
       @knife.run
@@ -56,11 +56,11 @@ describe Chef::Knife::CookbookList do
     describe 'with -w or --with-uri' do
       it 'should display the cookbook uris' do
         @knife.config[:with_uri] = true
-        @rest_mock.stub(:get_rest).and_return(@cookbook_data)
+        allow(@rest_mock).to receive(:get_rest).and_return(@cookbook_data)
         @knife.run
         @cookbook_names.each do |item|
           pattern = /#{Regexp.escape(@cookbook_data[item]['versions'].first['url'])}/
-          @stdout.string.should match pattern
+          expect(@stdout.string).to match pattern
         end
       end
     end
@@ -75,11 +75,11 @@ describe Chef::Knife::CookbookList do
 
       it 'should display all versions of the cookbooks' do
         @knife.config[:all_versions] = true
-        @rest_mock.should_receive(:get_rest).with('/cookbooks?num_versions=all').
+        expect(@rest_mock).to receive(:get_rest).with('/cookbooks?num_versions=all').
                                              and_return(@cookbook_data)
         @knife.run
         @cookbook_names.each do |item|
-          @stdout.string.should match /#{item}\s+1\.0\.1\s+1\.0\.0/
+          expect(@stdout.string).to match /#{item}\s+1\.0\.1\s+1\.0\.0/
         end
       end
     end

data/spec/unit/knife/cookbook_metadata_from_file_spec.rb

@@ -27,10 +27,10 @@ describe Chef::Knife::CookbookMetadataFromFile do
     @tgt = File.expand_path(File.join(CHEF_SPEC_DATA, "metadata", "quick_start", "metadata.json"))
     @knife = Chef::Knife::CookbookMetadataFromFile.new
     @knife.name_args = [ @src ]
-    @knife.stub(:to_json_pretty).and_return(true)
+    allow(@knife).to receive(:to_json_pretty).and_return(true)
     @md = Chef::Cookbook::Metadata.new
-    Chef::Cookbook::Metadata.stub(:new).and_return(@md)
-    $stdout.stub(:write)
+    allow(Chef::Cookbook::Metadata).to receive(:new).and_return(@md)
+    allow($stdout).to receive(:write)
   end
 
   after do
@@ -41,23 +41,23 @@ describe Chef::Knife::CookbookMetadataFromFile do
 
   describe "run" do
     it "should determine cookbook name from path" do
-      @md.should_receive(:name).with()
-      @md.should_receive(:name).with("quick_start")
+      expect(@md).to receive(:name).with(no_args)
+      expect(@md).to receive(:name).with("quick_start")
       @knife.run
     end
 
     it "should load the metadata source" do
-      @md.should_receive(:from_file).with(@src)
+      expect(@md).to receive(:from_file).with(@src)
       @knife.run
     end
 
     it "should write out the metadata to the correct location" do
-      File.should_receive(:open).with(@tgt, "w")
+      expect(File).to receive(:open).with(@tgt, "w")
       @knife.run
     end
 
     it "should generate json from the metadata" do
-      Chef::JSONCompat.should_receive(:to_json_pretty).with(@md)
+      expect(Chef::JSONCompat).to receive(:to_json_pretty).with(@md)
       @knife.run
     end
 

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -26,25 +26,25 @@ describe Chef::Knife::CookbookMetadata do
     @json_data = '{ "version": "1.0.0" }'
     @stdout = StringIO.new
     @stderr = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@stdout)
-    @knife.ui.stub(:stderr).and_return(@stderr)
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
   end
 
   describe 'run' do
     it 'should print an error and exit if a cookbook name was not provided' do
       @knife.name_args = []
-      @knife.ui.should_receive(:error).with(/you must specify the cookbook.+use the --all/i)
-      lambda { @knife.run }.should raise_error(SystemExit)
+      expect(@knife.ui).to receive(:error).with(/you must specify the cookbook.+use the --all/i)
+      expect { @knife.run }.to raise_error(SystemExit)
     end
 
     it 'should print an error and exit if an empty cookbook name was provided' do
       @knife.name_args = ['']
-      @knife.ui.should_receive(:error).with(/you must specify the cookbook.+use the --all/i)
-      lambda { @knife.run }.should raise_error(SystemExit)
+      expect(@knife.ui).to receive(:error).with(/you must specify the cookbook.+use the --all/i)
+      expect { @knife.run }.to raise_error(SystemExit)
     end
 
     it 'should generate the metadata for the cookbook' do
-      @knife.should_receive(:generate_metadata).with('foobar')
+      expect(@knife).to receive(:generate_metadata).with('foobar')
       @knife.run
     end
 
@@ -59,21 +59,21 @@ describe Chef::Knife::CookbookMetadata do
           "foo" => @foo,
           "bar" => @bar
         }
-        @cookbook_loader.should_receive(:load_cookbooks).and_return(@cookbook_loader)
-        @knife.should_receive(:generate_metadata).with('foo')
-        @knife.should_receive(:generate_metadata).with('bar')
+        expect(@cookbook_loader).to receive(:load_cookbooks).and_return(@cookbook_loader)
+        expect(@knife).to receive(:generate_metadata).with('foo')
+        expect(@knife).to receive(:generate_metadata).with('bar')
       end
 
       it 'should generate the metadata for each cookbook' do
         Chef::Config[:cookbook_path] = @cookbook_dir
-        Chef::CookbookLoader.should_receive(:new).with(@cookbook_dir).and_return(@cookbook_loader)
+        expect(Chef::CookbookLoader).to receive(:new).with(@cookbook_dir).and_return(@cookbook_loader)
         @knife.run
       end
 
       describe 'and with -o or --cookbook-path' do
         it 'should look in the provided path and generate cookbook metadata' do
           @knife.config[:cookbook_path] = '/opt/chef/cookbooks'
-          Chef::CookbookLoader.should_receive(:new).with('/opt/chef/cookbooks').and_return(@cookbook_loader)
+          expect(Chef::CookbookLoader).to receive(:new).with('/opt/chef/cookbooks').and_return(@cookbook_loader)
           @knife.run
         end
       end
@@ -84,21 +84,21 @@ describe Chef::Knife::CookbookMetadata do
   describe 'generate_metadata' do
     before(:each) do
       @knife.config[:cookbook_path] = @cookbook_dir
-      File.stub(:expand_path).with("#{@cookbook_dir}/foobar/metadata.rb").
+      allow(File).to receive(:expand_path).with("#{@cookbook_dir}/foobar/metadata.rb").
                                     and_return("#{@cookbook_dir}/foobar/metadata.rb")
     end
 
     it 'should generate the metadata from metadata.rb if it exists' do
-      File.should_receive(:exists?).with("#{@cookbook_dir}/foobar/metadata.rb").
+      expect(File).to receive(:exists?).with("#{@cookbook_dir}/foobar/metadata.rb").
                                     and_return(true)
-      @knife.should_receive(:generate_metadata_from_file).with('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
+      expect(@knife).to receive(:generate_metadata_from_file).with('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
       @knife.run
     end
 
     it 'should validate the metadata json if metadata.rb does not exist' do
-      File.should_receive(:exists?).with("#{@cookbook_dir}/foobar/metadata.rb").
+      expect(File).to receive(:exists?).with("#{@cookbook_dir}/foobar/metadata.rb").
                                     and_return(false)
-      @knife.should_receive(:validate_metadata_json).with(@cookbook_dir, 'foobar')
+      expect(@knife).to receive(:validate_metadata_json).with(@cookbook_dir, 'foobar')
       @knife.run
     end
   end
@@ -110,16 +110,16 @@ describe Chef::Knife::CookbookMetadata do
     end
 
     it 'should generate the metatdata json from metatdata.rb' do
-      Chef::Cookbook::Metadata.stub(:new).and_return(@metadata_mock)
-      @metadata_mock.should_receive(:name).with('foobar')
-      @metadata_mock.should_receive(:from_file).with("#{@cookbook_dir}/foobar/metadata.rb")
-      File.should_receive(:open).with("#{@cookbook_dir}/foobar/metadata.json", 'w').
+      allow(Chef::Cookbook::Metadata).to receive(:new).and_return(@metadata_mock)
+      expect(@metadata_mock).to receive(:name).with('foobar')
+      expect(@metadata_mock).to receive(:from_file).with("#{@cookbook_dir}/foobar/metadata.rb")
+      expect(File).to receive(:open).with("#{@cookbook_dir}/foobar/metadata.json", 'w').
                                  and_yield(@json_file_mock)
-      @json_file_mock.should_receive(:write).with(@json_data)
-      Chef::JSONCompat.should_receive(:to_json_pretty).with(@metadata_mock).
+      expect(@json_file_mock).to receive(:write).with(@json_data)
+      expect(Chef::JSONCompat).to receive(:to_json_pretty).with(@metadata_mock).
                                                        and_return(@json_data)
       @knife.generate_metadata_from_file('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
-      @stderr.string.should match /generating metadata for foobar from #{@cookbook_dir}\/foobar\/metadata\.rb/im
+      expect(@stderr.string).to match /generating metadata for foobar from #{@cookbook_dir}\/foobar\/metadata\.rb/im
     end
 
     { Chef::Exceptions::ObsoleteDependencySyntax => 'obsolote dependency',
@@ -127,32 +127,32 @@ describe Chef::Knife::CookbookMetadata do
     }.each_pair do |klass, description|
       it "should print an error and exit when an #{description} syntax exception is encountered" do
         exception = klass.new("#{description} blah")
-        Chef::Cookbook::Metadata.stub(:new).and_raise(exception)
-        lambda {
+        allow(Chef::Cookbook::Metadata).to receive(:new).and_raise(exception)
+        expect {
           @knife.generate_metadata_from_file('foobar', "#{@cookbook_dir}/foobar/metadata.rb")
-        }.should raise_error(SystemExit)
-        @stderr.string.should match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
-        @stderr.string.should match /in #{@cookbook_dir}\/foobar\/metadata\.rb/im
-        @stderr.string.should match /#{description} blah/im
+        }.to raise_error(SystemExit)
+        expect(@stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
+        expect(@stderr.string).to match /in #{@cookbook_dir}\/foobar\/metadata\.rb/im
+        expect(@stderr.string).to match /#{description} blah/im
       end
     end
   end
 
   describe 'validate_metadata_json' do
     it 'should validate the metadata json' do
-      File.should_receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
+      expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
                                    and_return(true)
-      IO.should_receive(:read).with("#{@cookbook_dir}/foobar/metadata.json").
+      expect(IO).to receive(:read).with("#{@cookbook_dir}/foobar/metadata.json").
                                and_return(@json_data)
-      Chef::Cookbook::Metadata.should_receive(:validate_json).with(@json_data)
+      expect(Chef::Cookbook::Metadata).to receive(:validate_json).with(@json_data)
       @knife.validate_metadata_json(@cookbook_dir, 'foobar')
     end
 
     it 'should not try to validate the metadata json if the file does not exist' do
-      File.should_receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
+      expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
                                    and_return(false)
-      IO.should_not_receive(:read)
-      Chef::Cookbook::Metadata.should_not_receive(:validate_json)
+      expect(IO).not_to receive(:read)
+      expect(Chef::Cookbook::Metadata).not_to receive(:validate_json)
       @knife.validate_metadata_json(@cookbook_dir, 'foobar')
     end
 
@@ -160,18 +160,18 @@ describe Chef::Knife::CookbookMetadata do
       Chef::Exceptions::InvalidVersionConstraint => 'invalid version constraint'
     }.each_pair do |klass, description|
       it "should print an error and exit when an #{description} syntax exception is encountered" do
-        File.should_receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
+        expect(File).to receive(:exist?).with("#{@cookbook_dir}/foobar/metadata.json").
                                      and_return(true)
-        IO.should_receive(:read).with("#{@cookbook_dir}/foobar/metadata.json").
+        expect(IO).to receive(:read).with("#{@cookbook_dir}/foobar/metadata.json").
                                  and_return(@json_data)
         exception = klass.new("#{description} blah")
-        Chef::Cookbook::Metadata.stub(:validate_json).and_raise(exception)
-        lambda {
+        allow(Chef::Cookbook::Metadata).to receive(:validate_json).and_raise(exception)
+        expect {
           @knife.validate_metadata_json(@cookbook_dir, 'foobar')
-        }.should raise_error(SystemExit)
-        @stderr.string.should match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
-        @stderr.string.should match /in #{@cookbook_dir}\/foobar\/metadata\.json/im
-        @stderr.string.should match /#{description} blah/im
+        }.to raise_error(SystemExit)
+        expect(@stderr.string).to match /error: the cookbook 'foobar' contains invalid or obsolete metadata syntax/im
+        expect(@stderr.string).to match /in #{@cookbook_dir}\/foobar\/metadata\.json/im
+        expect(@stderr.string).to match /#{description} blah/im
       end
     end
   end

data/spec/unit/knife/cookbook_show_spec.rb

@@ -26,18 +26,18 @@ describe Chef::Knife::CookbookShow do
     @knife.config = { }
     @knife.name_args = [ "cookbook_name" ]
     @rest = double(Chef::REST)
-    @knife.stub(:rest).and_return(@rest)
-    @knife.stub(:pretty_print).and_return(true)
-    @knife.stub(:output).and_return(true)
+    allow(@knife).to receive(:rest).and_return(@rest)
+    allow(@knife).to receive(:pretty_print).and_return(true)
+    allow(@knife).to receive(:output).and_return(true)
   end
 
   describe "run" do
     describe "with 0 arguments: help" do
       it 'should should print usage and exit when given no arguments' do
         @knife.name_args = []
-        @knife.should_receive(:show_usage)
-        @knife.ui.should_receive(:fatal)
-        lambda { @knife.run }.should raise_error(SystemExit)
+        expect(@knife).to receive(:show_usage)
+        expect(@knife.ui).to receive(:fatal)
+        expect { @knife.run }.to raise_error(SystemExit)
       end
     end
 
@@ -56,15 +56,15 @@ describe Chef::Knife::CookbookShow do
       end
 
       it "should show the raw cookbook data" do
-        @rest.should_receive(:get_rest).with("cookbooks/cookbook_name").and_return(@response)
-        @knife.should_receive(:format_cookbook_list_for_display).with(@response)
+        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name").and_return(@response)
+        expect(@knife).to receive(:format_cookbook_list_for_display).with(@response)
         @knife.run
       end
 
       it "should respect the user-supplied environment" do
         @knife.config[:environment] = "foo"
-        @rest.should_receive(:get_rest).with("environments/foo/cookbooks/cookbook_name").and_return(@response)
-        @knife.should_receive(:format_cookbook_list_for_display).with(@response)
+        expect(@rest).to receive(:get_rest).with("environments/foo/cookbooks/cookbook_name").and_return(@response)
+        expect(@knife).to receive(:format_cookbook_list_for_display).with(@response)
         @knife.run
       end
     end
@@ -76,8 +76,8 @@ describe Chef::Knife::CookbookShow do
       end
 
       it "should show the specific part of a cookbook" do
-        @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@response)
-        @knife.should_receive(:output).with(@response)
+        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@response)
+        expect(@knife).to receive(:output).with(@response)
         @knife.run
       end
     end
@@ -101,8 +101,8 @@ describe Chef::Knife::CookbookShow do
       end
 
       it "should print the json of the part" do
-        @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-        @knife.should_receive(:output).with(@cookbook_response.manifest["recipes"])
+        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+        expect(@knife).to receive(:output).with(@cookbook_response.manifest["recipes"])
         @knife.run
       end
     end
@@ -125,9 +125,9 @@ describe Chef::Knife::CookbookShow do
       end
 
       it "should print the raw result of the request (likely a file!)" do
-        @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-        @rest.should_receive(:get_rest).with("http://example.org/files/default.rb", true).and_return(StringIO.new(@response))
-        @knife.should_receive(:pretty_print).with(@response)
+        expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+        expect(@rest).to receive(:get_rest).with("http://example.org/files/default.rb", true).and_return(StringIO.new(@response))
+        expect(@knife).to receive(:pretty_print).with(@response)
         @knife.run
       end
     end
@@ -177,9 +177,9 @@ describe Chef::Knife::CookbookShow do
           @knife.config[:platform] = "example_platform"
           @knife.config[:platform_version] = "1.0"
           @knife.config[:fqdn] = "examplehost.example.org"
-          @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          @rest.should_receive(:get_rest).with("http://example.org/files/1111", true).and_return(StringIO.new(@response))
-          @knife.should_receive(:pretty_print).with(@response)
+          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:get_rest).with("http://example.org/files/1111", true).and_return(StringIO.new(@response))
+          expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
       end
@@ -189,9 +189,9 @@ describe Chef::Knife::CookbookShow do
           @knife.config[:platform] = "ubuntu"
           @knife.config[:platform_version] = "1.0"
           @knife.config[:fqdn] = "differenthost.example.org"
-          @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          @rest.should_receive(:get_rest).with("http://example.org/files/3333", true).and_return(StringIO.new(@response))
-          @knife.should_receive(:pretty_print).with(@response)
+          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:get_rest).with("http://example.org/files/3333", true).and_return(StringIO.new(@response))
+          expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
       end
@@ -201,18 +201,18 @@ describe Chef::Knife::CookbookShow do
           @knife.config[:platform] = "ubuntu"
           @knife.config[:platform_version] = "9.10"
           @knife.config[:fqdn] = "differenthost.example.org"
-          @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          @rest.should_receive(:get_rest).with("http://example.org/files/2222", true).and_return(StringIO.new(@response))
-          @knife.should_receive(:pretty_print).with(@response)
+          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:get_rest).with("http://example.org/files/2222", true).and_return(StringIO.new(@response))
+          expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
       end
 
       describe "with none of the arguments, it should use the default" do
         it "should pass them all" do
-          @rest.should_receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
-          @rest.should_receive(:get_rest).with("http://example.org/files/4444", true).and_return(StringIO.new(@response))
-          @knife.should_receive(:pretty_print).with(@response)
+          expect(@rest).to receive(:get_rest).with("cookbooks/cookbook_name/0.1.0").and_return(@cookbook_response)
+          expect(@rest).to receive(:get_rest).with("http://example.org/files/4444", true).and_return(StringIO.new(@response))
+          expect(@knife).to receive(:pretty_print).with(@response)
           @knife.run
         end
       end

data/spec/unit/knife/cookbook_site_download_spec.rb

@@ -26,16 +26,16 @@ describe Chef::Knife::CookbookSiteDownload do
       @knife.name_args  = ['apache2']
       @noauth_rest      = double('no auth rest')
       @stderr           = StringIO.new
-      @cookbook_api_url = 'https://supermarket.getchef.com/api/v1/cookbooks'
+      @cookbook_api_url = 'https://supermarket.chef.io/api/v1/cookbooks'
       @version          = '1.0.2'
       @version_us       = @version.gsub '.', '_'
       @current_data     = { 'deprecated'       => false,
                             'latest_version'   => "#{@cookbook_api_url}/apache2/versions/#{@version_us}",
                             'replacement' => 'other_apache2' }
 
-      @knife.ui.stub(:stderr).and_return(@stderr)
-      @knife.stub(:noauth_rest).and_return(@noauth_rest)
-      @noauth_rest.should_receive(:get_rest).
+      allow(@knife.ui).to receive(:stderr).and_return(@stderr)
+      allow(@knife).to receive(:noauth_rest).and_return(@noauth_rest)
+      expect(@noauth_rest).to receive(:get_rest).
                    with("#{@cookbook_api_url}/apache2").
                    and_return(@current_data)
     end
@@ -46,9 +46,9 @@ describe Chef::Knife::CookbookSiteDownload do
       end
 
       it 'should warn with info about the replacement' do
-        @knife.ui.should_receive(:warn).
+        expect(@knife.ui).to receive(:warn).
                   with(/.+deprecated.+replaced by other_apache2.+/i)
-        @knife.ui.should_receive(:warn).
+        expect(@knife.ui).to receive(:warn).
                   with(/use --force.+download.+/i)
         @knife.run
       end
@@ -61,15 +61,15 @@ describe Chef::Knife::CookbookSiteDownload do
         @temp_file     =  double( :path => "/tmp/apache2_#{@version_us}.tgz" )
         @file          = File.join(Dir.pwd, "apache2-#{@version}.tar.gz")
 
-        @noauth_rest.should_receive(:sign_on_redirect=).with(false)
+        expect(@noauth_rest).to receive(:sign_on_redirect=).with(false)
       end
 
       context 'downloading the latest version' do
         before do
-          @noauth_rest.should_receive(:get_rest).
+          expect(@noauth_rest).to receive(:get_rest).
                        with(@current_data['latest_version']).
                        and_return(@cookbook_data)
-          @noauth_rest.should_receive(:get_rest).
+          expect(@noauth_rest).to receive(:get_rest).
                        with(@cookbook_data['file'], true).
                        and_return(@temp_file)
         end
@@ -81,40 +81,40 @@ describe Chef::Knife::CookbookSiteDownload do
           end
 
           it 'should download the latest version' do
-            @knife.ui.should_receive(:warn).
+            expect(@knife.ui).to receive(:warn).
                       with(/.+deprecated.+replaced by other_apache2.+/i)
-            FileUtils.should_receive(:cp).with(@temp_file.path, @file)
+            expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
             @knife.run
-            @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+            expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+            expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
           end
 
         end
 
         it 'should download the latest version' do
-          FileUtils.should_receive(:cp).with(@temp_file.path, @file)
+          expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+          expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+          expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
         end
 
         context 'with -f or --file' do
           before do
             @file = '/opt/chef/cookbooks/apache2.tar.gz'
             @knife.config[:file] = @file
-            FileUtils.should_receive(:cp).with(@temp_file.path, @file)
+            expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           end
 
           it 'should download the cookbook to the desired file' do
             @knife.run
-            @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+            expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+            expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
           end
         end
 
         it 'should provide an accessor to the version' do
-          FileUtils.stub(:cp).and_return(true)
-          @knife.version.should == @version
+          allow(FileUtils).to receive(:cp).and_return(true)
+          expect(@knife.version).to eq(@version)
           @knife.run
         end
       end
@@ -131,16 +131,16 @@ describe Chef::Knife::CookbookSiteDownload do
         end
 
         it 'should download the desired version' do
-          @noauth_rest.should_receive(:get_rest).
+          expect(@noauth_rest).to receive(:get_rest).
                        with("#{@cookbook_api_url}/apache2/versions/#{@version_us}").
                        and_return(@cookbook_data)
-          @noauth_rest.should_receive(:get_rest).
+          expect(@noauth_rest).to receive(:get_rest).
                        with(@cookbook_data['file'], true).
                        and_return(@temp_file)
-          FileUtils.should_receive(:cp).with(@temp_file.path, @file)
+          expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          @stderr.string.should match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          @stderr.string.should match /cookbook save.+#{Regexp.escape(@file)}/i
+          expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
+          expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
         end
       end