puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

data/spec/unit/forge/module_release_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::Forge::ModuleRelease do
 
   let(:mock_file) {
     mock_io = StringIO.new
-    mock_io.stubs(:path).returns('/dev/null')
+    allow(mock_io).to receive(:path).and_return('/dev/null')
     mock_io
   }
 
@@ -28,19 +28,19 @@ describe Puppet::Forge::ModuleRelease do
 
   shared_examples 'a module release' do
     def mock_digest_file_with_md5(md5)
-      Digest::MD5.stubs(:file).returns(stub(:hexdigest => md5))
+      allow(Digest::MD5).to receive(:file).and_return(double(:hexdigest => md5))
     end
 
     describe '#prepare' do
       before :each do
-        release.stubs(:tmpfile).returns(mock_file)
-        release.stubs(:tmpdir).returns(mock_dir)
+        allow(release).to receive(:tmpfile).and_return(mock_file)
+        allow(release).to receive(:tmpdir).and_return(mock_dir)
       end
 
       it 'should call sub methods with correct params' do
-        release.expects(:download).with("/#{api_version}/files/#{module_full_name_versioned}.tar.gz", mock_file)
-        release.expects(:validate_checksum).with(mock_file, module_md5)
-        release.expects(:unpack).with(mock_file, mock_dir)
+        expect(release).to receive(:download).with("/#{api_version}/files/#{module_full_name_versioned}.tar.gz", mock_file)
+        expect(release).to receive(:validate_checksum).with(mock_file, module_md5)
+        expect(release).to receive(:unpack).with(mock_file, mock_dir)
 
         release.prepare
       end
@@ -48,7 +48,7 @@ describe Puppet::Forge::ModuleRelease do
 
     describe '#tmpfile' do
       it 'should be opened in binary mode' do
-        Puppet::Forge::Cache.stubs(:base_path).returns(Dir.tmpdir)
+        allow(Puppet::Forge::Cache).to receive(:base_path).and_return(Dir.tmpdir)
         expect(release.send(:tmpfile).binmode?).to be_truthy
       end
     end
@@ -56,14 +56,14 @@ describe Puppet::Forge::ModuleRelease do
     describe '#download' do
       it 'should call make_http_request with correct params' do
         # valid URI comes from file_uri in JSON blob above
-        ssl_repository.expects(:make_http_request).with("/#{api_version}/files/#{module_full_name_versioned}.tar.gz", mock_file).returns(stub(:body => '{}', :code => '200'))
+        expect(ssl_repository).to receive(:make_http_request).with("/#{api_version}/files/#{module_full_name_versioned}.tar.gz", mock_file).and_return(double(:body => '{}', :code => '200'))
 
         release.send(:download, "/#{api_version}/files/#{module_full_name_versioned}.tar.gz", mock_file)
       end
 
       it 'should raise a response error when it receives an error from forge' do
-        ssl_repository.stubs(:make_http_request).returns(stub(:body => '{"errors": ["error"]}', :code => '500', :message => 'server error'))
-        expect { release.send(:download, "/some/path", mock_file)}. to raise_error Puppet::Forge::Errors::ResponseError
+        allow(ssl_repository).to receive(:make_http_request).and_return(double(:body => '{"errors": ["error"]}', :code => '500', :message => 'server error'))
+        expect { release.send(:download, "/some/path", mock_file)}.to raise_error Puppet::Forge::Errors::ResponseError
       end
     end
 
@@ -84,7 +84,7 @@ describe Puppet::Forge::ModuleRelease do
 
     describe '#unpack' do
       it 'should call unpacker with correct params' do
-        Puppet::ModuleTool::Applications::Unpacker.expects(:unpack).with(mock_file.path, mock_dir).returns(true)
+        expect(Puppet::ModuleTool::Applications::Unpacker).to receive(:unpack).with(mock_file.path, mock_dir).and_return(true)
 
         release.send(:unpack, mock_file, mock_dir)
       end
@@ -271,15 +271,15 @@ describe Puppet::Forge::ModuleRelease do
 
     describe '#prepare' do
       before :each do
-        release.stubs(:tmpfile).returns(mock_file)
-        release.stubs(:tmpdir).returns(mock_dir)
-        release.stubs(:download)
-        release.stubs(:validate_checksum)
-        release.stubs(:unpack)
+        allow(release).to receive(:tmpfile).and_return(mock_file)
+        allow(release).to receive(:tmpdir).and_return(mock_dir)
+        allow(release).to receive(:download)
+        allow(release).to receive(:validate_checksum)
+        allow(release).to receive(:unpack)
       end
 
       it 'should emit warning about module deprecation' do
-        Puppet.expects(:warning).with(regexp_matches(/#{Regexp.escape(module_full_name)}.*deprecated/i))
+        expect(Puppet).to receive(:warning).with(/#{Regexp.escape(module_full_name)}.*deprecated/i)
 
         release.prepare
       end

data/spec/unit/forge/repository_spec.rb

@@ -17,7 +17,7 @@ describe Puppet::Forge::Repository do
 
   it "retrieve accesses the cache" do
     path = '/module/foo.tar.gz'
-    repository.cache.expects(:retrieve)
+    expect(repository.cache).to receive(:retrieve)
 
     repository.retrieve(path)
   end
@@ -28,7 +28,7 @@ describe Puppet::Forge::Repository do
     uri  = [ host, path ].join('')
 
     repository = Puppet::Forge::Repository.new(host, agent)
-    repository.cache.expects(:retrieve).with(uri)
+    expect(repository.cache).to receive(:retrieve).with(uri)
 
     repository.retrieve(path)
   end
@@ -42,7 +42,7 @@ describe Puppet::Forge::Repository do
       result = "#{Object.new}"
 
       performs_an_http_request result do |http|
-        http.expects(:request).with(responds_with(:path, "the_path"))
+        expect(http).to receive(:request).with(have_attributes(path: "the_path"))
       end
 
       expect(repository.make_http_request("the_path")).to eq(result)
@@ -52,7 +52,7 @@ describe Puppet::Forge::Repository do
       result = "#{Object.new}"
 
       performs_an_http_request result do |http|
-        http.expects(:request).with(responds_with(:path, "/test/the_path/"))
+        expect(http).to receive(:request).with(have_attributes(path: "/test/the_path/"))
       end
 
       repository = Puppet::Forge::Repository.new('http://fake.com/test', agent)
@@ -63,7 +63,7 @@ describe Puppet::Forge::Repository do
       result = "#{Object.new}"
 
       performs_an_http_request result do |http|
-        http.expects(:request).with(responds_with(:path, "/test/the_path"))
+        expect(http).to receive(:request).with(have_attributes(path: "/test/the_path"))
       end
 
       repository = Puppet::Forge::Repository.new('http://fake.com/test/', agent)
@@ -73,7 +73,7 @@ describe Puppet::Forge::Repository do
     it 'returns the result object from a request with ssl' do
       result = "#{Object.new}"
       performs_an_https_request result do |http|
-        http.expects(:request).with(responds_with(:path, "the_path"))
+        expect(http).to receive(:request).with(have_attributes(path: "the_path"))
       end
 
       expect(ssl_repository.make_http_request("the_path")).to eq(result)
@@ -81,7 +81,7 @@ describe Puppet::Forge::Repository do
 
     it 'return a valid exception when there is an SSL verification problem' do
       performs_an_https_request "#{Object.new}" do |http|
-        http.expects(:request).with(responds_with(:path, "the_path")).raises OpenSSL::SSL::SSLError.new("certificate verify failed")
+        expect(http).to receive(:request).with(have_attributes(path: "the_path")).and_raise(OpenSSL::SSL::SSLError.new("certificate verify failed"))
       end
 
       expect { ssl_repository.make_http_request("the_path") }.to raise_error Puppet::Forge::Errors::SSLVerifyError, 'Unable to verify the SSL certificate at https://fake.com'
@@ -89,7 +89,7 @@ describe Puppet::Forge::Repository do
 
     it 'return a valid exception when there is a communication problem' do
       performs_an_http_request "#{Object.new}" do |http|
-        http.expects(:request).with(responds_with(:path, "the_path")).raises SocketError
+        expect(http).to receive(:request).with(have_attributes(path: "the_path")).and_raise(SocketError)
       end
 
       expect { repository.make_http_request("the_path") }.
@@ -108,7 +108,7 @@ describe Puppet::Forge::Repository do
     end
 
     it "Does not set Authorization header by default" do
-      Puppet.features.stubs(:pe_license?).returns(false)
+      allow(Puppet.features).to receive(:pe_license?).and_return(false)
       Puppet[:forge_authorization] = nil
       request = repository.get_request_object("the_path")
       expect(request['Authorization']).to eq(nil)
@@ -124,7 +124,7 @@ describe Puppet::Forge::Repository do
     it "encodes the received URI" do
       unescaped_uri = "héllo world !! ç à"
       performs_an_http_request do |http|
-        http.expects(:request).with(responds_with(:path, Puppet::Util.uri_encode(unescaped_uri)))
+        expect(http).to receive(:request).with(have_attributes(path: Puppet::Util.uri_encode(unescaped_uri)))
       end
 
       repository.make_http_request(unescaped_uri)
@@ -138,11 +138,10 @@ describe Puppet::Forge::Repository do
     def performs_an_https_request(result = nil, &block)
       proxy_args = ["proxy", 1234, nil, nil]
       proxy = mock_proxy(443, proxy_args, result, &block)
-      proxy.expects(:use_ssl=).with(true)
-      proxy.expects(:cert_store=)
-      proxy.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+      expect(proxy).to receive(:use_ssl=).with(true)
+      expect(proxy).to receive(:cert_store=)
+      expect(proxy).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
     end
-
   end
 
   describe "making a request against an authentiated proxy" do
@@ -154,7 +153,7 @@ describe Puppet::Forge::Repository do
       result = "#{Object.new}"
 
       performs_an_authenticated_http_request result do |http|
-        http.expects(:request).with(responds_with(:path, "the_path"))
+        expect(http).to receive(:request).with(have_attributes(path: "the_path"))
       end
 
       expect(repository.make_http_request("the_path")).to eq(result)
@@ -163,7 +162,7 @@ describe Puppet::Forge::Repository do
     it 'returns the result object from a request with ssl' do
       result = "#{Object.new}"
       performs_an_authenticated_https_request result do |http|
-        http.expects(:request).with(responds_with(:path, "the_path"))
+        expect(http).to receive(:request).with(have_attributes(path: "the_path"))
       end
 
       expect(ssl_repository.make_http_request("the_path")).to eq(result)
@@ -171,7 +170,7 @@ describe Puppet::Forge::Repository do
 
     it 'return a valid exception when there is an SSL verification problem' do
       performs_an_authenticated_https_request "#{Object.new}" do |http|
-        http.expects(:request).with(responds_with(:path, "the_path")).raises OpenSSL::SSL::SSLError.new("certificate verify failed")
+        expect(http).to receive(:request).with(have_attributes(path: "the_path")).and_raise(OpenSSL::SSL::SSLError.new("certificate verify failed"))
       end
 
       expect { ssl_repository.make_http_request("the_path") }.to raise_error Puppet::Forge::Errors::SSLVerifyError, 'Unable to verify the SSL certificate at https://fake.com'
@@ -179,7 +178,7 @@ describe Puppet::Forge::Repository do
 
     it 'return a valid exception when there is a communication problem' do
       performs_an_authenticated_http_request "#{Object.new}" do |http|
-        http.expects(:request).with(responds_with(:path, "the_path")).raises SocketError
+        expect(http).to receive(:request).with(have_attributes(path: "the_path")).and_raise(SocketError)
       end
 
       expect { repository.make_http_request("the_path") }.
@@ -200,7 +199,7 @@ describe Puppet::Forge::Repository do
     it "encodes the received URI" do
       unescaped_uri = "héllo world !! ç à"
       performs_an_authenticated_http_request do |http|
-        http.expects(:request).with(responds_with(:path, Puppet::Util.uri_encode(unescaped_uri)))
+        expect(http).to receive(:request).with(have_attributes(path: Puppet::Util.uri_encode(unescaped_uri)))
       end
 
       repository.make_http_request(unescaped_uri)
@@ -214,9 +213,9 @@ describe Puppet::Forge::Repository do
     def performs_an_authenticated_https_request(result = nil, &block)
       proxy_args = ["proxy", 1234, 'user1', 'password']
       proxy = mock_proxy(443, proxy_args, result, &block)
-      proxy.expects(:use_ssl=).with(true)
-      proxy.expects(:cert_store=)
-      proxy.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
+      expect(proxy).to receive(:use_ssl=).with(true)
+      expect(proxy).to receive(:cert_store=)
+      expect(proxy).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
     end
   end
 
@@ -233,17 +232,17 @@ describe Puppet::Forge::Repository do
   end
 
   def mock_proxy(port, proxy_args, result, &block)
-    http = mock("http client")
-    proxy = mock("http proxy")
-    proxy_class = mock("http proxy class")
+    http = double("http client")
+    proxy = double("http proxy")
+    proxy_class = double("http proxy class")
 
-    Net::HTTP.expects(:Proxy).with(*proxy_args).returns(proxy_class)
-    proxy_class.expects(:new).with("fake.com", port).returns(proxy)
+    expect(Net::HTTP).to receive(:Proxy).with(*proxy_args).and_return(proxy_class)
+    expect(proxy_class).to receive(:new).with("fake.com", port).and_return(proxy)
 
-    proxy.expects(:open_timeout=)
-    proxy.expects(:read_timeout=)
+    expect(proxy).to receive(:open_timeout=)
+    expect(proxy).to receive(:read_timeout=)
 
-    proxy.expects(:start).yields(http).returns(result)
+    expect(proxy).to receive(:start).and_yield(http).and_return(result)
     yield http
 
     proxy

data/spec/unit/forge_spec.rb

@@ -101,12 +101,16 @@ describe Puppet::Forge do
 
   let(:forge) { Puppet::Forge.new }
 
-  def repository_responds_with(response)
-    Puppet::Forge::Repository.any_instance.stubs(:make_http_request).returns(response)
+  def repository_responds_with(response, &block)
+    if block_given?
+      allow_any_instance_of(Puppet::Forge::Repository).to receive(:make_http_request, &block).and_return(response)
+    else
+      allow_any_instance_of(Puppet::Forge::Repository).to receive(:make_http_request).and_return(response)
+    end
   end
 
   it "returns a list of matches from the forge when there are matches for the search term" do
-    repository_responds_with(stub(:body => http_response, :code => '200'))
+    repository_responds_with(double(:body => http_response, :code => '200'))
     expect(forge.search('bacula')).to eq(search_results)
   end
 
@@ -118,7 +122,7 @@ describe Puppet::Forge do
     end
 
     before :each do
-      repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo/}
+      repository_responds_with(double(:body => release_response, :code => '200')) {|uri| uri =~ /module_groups=foo/}
       Puppet[:module_groups] = "foo"
     end
 
@@ -141,7 +145,7 @@ describe Puppet::Forge do
 
     context "with space seperator" do
       before :each do
-        repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo bar/}
+        repository_responds_with(double(:body => release_response, :code => '200')) {|uri| uri =~ /module_groups=foo bar/}
         Puppet[:module_groups] = "foo bar"
       end
 
@@ -156,7 +160,7 @@ describe Puppet::Forge do
 
     context "with plus seperator" do
       before :each do
-        repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo bar/}
+        repository_responds_with(double(:body => release_response, :code => '200')) {|uri| uri =~ /module_groups=foo bar/}
         Puppet[:module_groups] = "foo+bar"
       end
 
@@ -172,10 +176,10 @@ describe Puppet::Forge do
     # See PUP-8008
     context "when there are multiple pages of results" do
       before(:each) do
-        Puppet::Forge::Repository.any_instance.expects(:make_http_request).with {|uri| uri =~ /module_groups=foo bar/ && uri !=~ /offset/ }.returns(stub(:body => first_page, :code => '200'))
+        expect_any_instance_of(Puppet::Forge::Repository).to receive(:make_http_request) {|_, uri| uri =~ /module_groups=foo bar/ && uri !=~ /offset/ }.and_return(double(:body => first_page, :code => '200'))
 
         # Request for second page should not have module_groups already encoded
-        Puppet::Forge::Repository.any_instance.expects(:make_http_request).with {|uri| uri =~ /module_groups=foo bar/ && uri =~ /offset=1/ }.returns(stub(:body => last_page, :code => '200'))
+        expect_any_instance_of(Puppet::Forge::Repository).to receive(:make_http_request) {|_, uri| uri =~ /module_groups=foo bar/ && uri =~ /offset=1/ }.and_return(double(:body => last_page, :code => '200'))
       end
 
       context "with space seperator" do
@@ -238,7 +242,7 @@ describe Puppet::Forge do
 
   context "when the connection to the forge fails" do
     before :each do
-      repository_responds_with(stub(:body => '{}', :code => '404', :message => "not found"))
+      repository_responds_with(double(:body => '{}', :code => '404', :message => "not found"))
     end
 
     it "raises an error for search" do
@@ -252,7 +256,7 @@ describe Puppet::Forge do
 
   context "when the API responds with an error" do
     before :each do
-      repository_responds_with(stub(:body => '{"error":"invalid module"}', :code => '410', :message => "Gone"))
+      repository_responds_with(double(:body => '{"error":"invalid module"}', :code => '410', :message => "Gone"))
     end
 
     it "raises an error for fetch" do
@@ -266,7 +270,7 @@ describe Puppet::Forge do
       release = response['results'][0]['current_release']
       release['metadata']['dependencies'] = [{'name' => 'broken-garbage >= 1.0.0', 'version_requirement' => 'banana'}]
       response['results'] = [release]
-      repository_responds_with(stub(:body => JSON.dump(response), :code => '200'))
+      repository_responds_with(double(:body => JSON.dump(response), :code => '200'))
     end
 
     it "ignores modules with unparseable dependencies" do

data/spec/unit/functions/binary_file_spec.rb

@@ -33,12 +33,12 @@ describe 'the binary_file function' do
 
   it 'reads an existing file in a module' do
     with_file_content('binary_data') do |name|
-      mod = mock 'module'
-      mod.stubs(:file).with('myfile').returns(name)
+      mod = double('module')
+      allow(mod).to receive(:file).with('myfile').and_return(name)
       Puppet[:code] = "notify { String(binary_file('mymod/myfile')):}"
       node = Puppet::Node.new('localhost')
       compiler = Puppet::Parser::Compiler.new(node)
-      compiler.environment.stubs(:module).with('mymod').returns(mod)
+      allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
       # Note that the Binary to string produces Base64 encoded version of 'binary_data' which is 'YmluYXJ5X2RhdGE='
       expect(compiler.compile().filter { |r| r.virtual? }).to have_resource("Notify[YmluYXJ5X2RhdGE=]")
     end

data/spec/unit/functions/contain_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/parser/functions'
@@ -7,7 +6,6 @@ require 'matchers/resource'
 require 'matchers/include_in_order'
 require 'unit/functions/shared'
 
-
 describe 'The "contain" function' do
   include PuppetSpec::Compiler
   include ContainmentMatchers

data/spec/unit/functions/defined_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 require 'puppet/loaders'

data/spec/unit/functions/epp_spec.rb

@@ -153,7 +153,7 @@ describe "the epp function" do
     filename = File.join(file_path, "template.epp")
     File.open(filename, "wb+") { |f| f.write(content) }
 
-    Puppet::Parser::Files.stubs(:find_template).returns(filename)
+    allow(Puppet::Parser::Files).to receive(:find_template).and_return(filename)
     epp_function.call(scope, 'template', args_hash)
   end
 
@@ -162,7 +162,7 @@ describe "the epp function" do
     filename = File.join(file_path, "template.epp")
     File.open(filename, "wb+") { |f| f.write(content) }
 
-    Puppet::Parser::Files.stubs(:find_template).returns(filename)
+    allow(Puppet::Parser::Files).to receive(:find_template).and_return(filename)
     epp_function.call(scope, 'template')
   end
 

data/spec/unit/functions/find_file_spec.rb

@@ -42,27 +42,27 @@ describe 'the find_file function' do
 
   it 'finds an existing file in a module' do
     with_file_content('file content') do |name|
-      mod = mock 'module'
-      mod.stubs(:file).with('myfile').returns(name)
+      mod = double('module')
+      allow(mod).to receive(:file).with('myfile').and_return(name)
       Puppet[:code] = "notify { find_file('mymod/myfile'):}"
       node = Puppet::Node.new('localhost')
       compiler = Puppet::Parser::Compiler.new(node)
-      compiler.environment.stubs(:module).with('mymod').returns(mod)
+      allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
 
       expect(compiler.compile().filter { |r| r.virtual? }).to have_resource("Notify[#{name}]")
     end
   end
 
   it 'returns undef when none of the paths were found' do
-    mod = mock 'module'
-    mod.stubs(:file).with('myfile').returns(nil)
+    mod = double('module')
+    allow(mod).to receive(:file).with('myfile').and_return(nil)
     Puppet[:code] = "notify { String(type(find_file('mymod/myfile', 'nomod/nofile'))):}"
     node = Puppet::Node.new('localhost')
     compiler = Puppet::Parser::Compiler.new(node)
     # For a module that does not have the file
-    compiler.environment.stubs(:module).with('mymod').returns(mod)
+    allow(compiler.environment).to receive(:module).with('mymod').and_return(mod)
     # For a module that does not exist
-    compiler.environment.stubs(:module).with('nomod').returns(nil)
+    allow(compiler.environment).to receive(:module).with('nomod').and_return(nil)
 
     expect(compiler.compile().filter { |r| r.virtual? }).to have_resource("Notify[Undef]")
   end

data/spec/unit/functions/include_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/parser/functions'
@@ -7,7 +6,6 @@ require 'matchers/resource'
 require 'matchers/include_in_order'
 require 'unit/functions/shared'
 
-
 describe 'The "include" function' do
   include PuppetSpec::Compiler
   include ContainmentMatchers
@@ -128,7 +126,6 @@ describe 'The "include" function' do
     expect(catalog).to_not contain_class("not_contained").in("container")
   end
 
-
   it 'produces an array with a single class references given a single argument' do
     catalog = compile_to_catalog(<<-MANIFEST)
       class a {
@@ -186,5 +183,4 @@ describe 'The "include" function' do
   it_should_behave_like 'all functions transforming relative to absolute names', :include
   it_should_behave_like 'an inclusion function, regardless of the type of class reference,', :include
   it_should_behave_like 'an inclusion function, when --tasks is on,', :include
-
 end