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

data/spec/unit/file_serving/mount/tasks_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/tasks'
 
@@ -6,8 +5,8 @@ describe Puppet::FileServing::Mount::Tasks do
   before do
     @mount = Puppet::FileServing::Mount::Tasks.new("tasks")
 
-    @environment = stub 'environment', :module => nil
-    @request = stub 'request', :environment => @environment
+    @environment = double('environment', :module => nil)
+    @request = double('request', :environment => @environment)
   end
 
   describe "when finding task files" do
@@ -17,25 +16,25 @@ describe Puppet::FileServing::Mount::Tasks do
 
     it "should use the request's environment to find the module" do
       mod_name = 'foo'
-      @environment.expects(:module).with(mod_name)
+      expect(@environment).to receive(:module).with(mod_name)
 
       @mount.find(mod_name, @request)
     end
 
     it "should use the first segment of the request's path as the module name" do
-      @environment.expects(:module).with("foo")
+      expect(@environment).to receive(:module).with("foo")
       @mount.find("foo/bartask", @request)
     end
 
     it "should return nil if the module in the path doesn't exist" do
-      @environment.expects(:module).with("foo").returns(nil)
+      expect(@environment).to receive(:module).with("foo").and_return(nil)
       expect(@mount.find("foo/bartask", @request)).to be_nil
     end
 
     it "should return the file path from the module" do
-      mod = mock('module')
-      mod.expects(:task_file).with("bartask").returns("mocked")
-      @environment.expects(:module).with("foo").returns(mod)
+      mod = double('module')
+      expect(mod).to receive(:task_file).with("bartask").and_return("mocked")
+      expect(@environment).to receive(:module).with("foo").and_return(mod)
       expect(@mount.find("foo/bartask", @request)).to eq("mocked")
     end
   end
@@ -47,25 +46,25 @@ describe Puppet::FileServing::Mount::Tasks do
 
     it "should use the request's environment to find the module" do
       mod_name = 'foo'
-      @environment.expects(:module).with(mod_name)
+      expect(@environment).to receive(:module).with(mod_name)
 
       @mount.search(mod_name, @request)
     end
 
     it "should use the first segment of the request's path as the module name" do
-      @environment.expects(:module).with("foo")
+      expect(@environment).to receive(:module).with("foo")
       @mount.search("foo/bartask", @request)
     end
 
     it "should return nil if the module in the path doesn't exist" do
-      @environment.expects(:module).with("foo").returns(nil)
+      expect(@environment).to receive(:module).with("foo").and_return(nil)
       expect(@mount.search("foo/bartask", @request)).to be_nil
     end
 
     it "should return the file path from the module" do
-      mod = mock('module')
-      mod.expects(:task_file).with("bartask").returns("mocked")
-      @environment.expects(:module).with("foo").returns(mod)
+      mod = double('module')
+      expect(mod).to receive(:task_file).with("bartask").and_return("mocked")
+      expect(@environment).to receive(:module).with("foo").and_return(mod)
       expect(@mount.search("foo/bartask", @request)).to eq(["mocked"])
     end
   end

data/spec/unit/file_serving/mount_spec.rb

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

data/spec/unit/file_serving/terminus_helper_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/terminus_helper'
@@ -8,103 +7,99 @@ describe Puppet::FileServing::TerminusHelper do
     @helper = Object.new
     @helper.extend(Puppet::FileServing::TerminusHelper)
 
-    @model = mock 'model'
-    @helper.stubs(:model).returns(@model)
+    @model = double('model')
+    allow(@helper).to receive(:model).and_return(@model)
 
-    @request = stub 'request', :key => "url", :options => {}
+    @request = double('request', :key => "url", :options => {})
 
-    @fileset = stub 'fileset', :files => [], :path => "/my/file"
-    Puppet::FileServing::Fileset.stubs(:new).with("/my/file", {}).returns(@fileset)
+    @fileset = double('fileset', :files => [], :path => "/my/file")
+    allow(Puppet::FileServing::Fileset).to receive(:new).with("/my/file", {}).and_return(@fileset)
   end
 
   it "should find a file with absolute path" do
-    file = stub 'file', :collect => nil
-    file.expects(:collect).with(nil)
-    @model.expects(:new).with("/my/file", {:relative_path => nil}).returns(file)
+    file = double('file', :collect => nil)
+    expect(file).to receive(:collect).with(no_args)
+    expect(@model).to receive(:new).with("/my/file", {:relative_path => nil}).and_return(file)
     @helper.path2instance(@request, "/my/file")
   end
 
   it "should pass through links, checksum_type, and source_permissions" do
-    file = stub 'file', :checksum_type= => nil, :links= => nil, :collect => nil
+    file = double('file', :checksum_type= => nil, :links= => nil, :collect => nil)
     [[:checksum_type, :sha256], [:links, true], [:source_permissions, :use]].each {|k, v|
-      file.expects(k.to_s+'=').with(v)
+      expect(file).to receive(k.to_s+'=').with(v)
       @request.options[k] = v
     }
-    file.expects(:collect)
-    @model.expects(:new).with("/my/file", {:relative_path => :file}).returns(file)
+    expect(file).to receive(:collect)
+    expect(@model).to receive(:new).with("/my/file", {:relative_path => :file}).and_return(file)
     @helper.path2instance(@request, "/my/file", {:relative_path => :file})
   end
 
   it "should use a fileset to find paths" do
-    @fileset = stub 'fileset', :files => [], :path => "/my/files"
-    Puppet::FileServing::Fileset.expects(:new).with { |key, options| key == "/my/file" }.returns(@fileset)
+    @fileset = double('fileset', :files => [], :path => "/my/files")
+    expect(Puppet::FileServing::Fileset).to receive(:new).with("/my/file", anything).and_return(@fileset)
     @helper.path2instances(@request, "/my/file")
   end
 
   it "should support finding across multiple paths by merging the filesets" do
-    first = stub 'fileset', :files => [], :path => "/first/file"
-    Puppet::FileServing::Fileset.expects(:new).with { |path, options| path == "/first/file" }.returns(first)
-    second = stub 'fileset', :files => [], :path => "/second/file"
-    Puppet::FileServing::Fileset.expects(:new).with { |path, options| path == "/second/file" }.returns(second)
+    first = double('fileset', :files => [], :path => "/first/file")
+    expect(Puppet::FileServing::Fileset).to receive(:new).with("/first/file", anything).and_return(first)
+    second = double('fileset', :files => [], :path => "/second/file")
+    expect(Puppet::FileServing::Fileset).to receive(:new).with("/second/file", anything).and_return(second)
 
-    Puppet::FileServing::Fileset.expects(:merge).with(first, second).returns({})
+    expect(Puppet::FileServing::Fileset).to receive(:merge).with(first, second).and_return({})
 
     @helper.path2instances(@request, "/first/file", "/second/file")
   end
 
   it "should pass the indirection request to the Fileset at initialization" do
-    Puppet::FileServing::Fileset.expects(:new).with { |path, options| options == @request }.returns @fileset
+    expect(Puppet::FileServing::Fileset).to receive(:new).with(anything, @request).and_return(@fileset)
     @helper.path2instances(@request, "/my/file")
   end
 
   describe "when creating instances" do
     before do
-      @request.stubs(:key).returns "puppet://host/mount/dir"
+      allow(@request).to receive(:key).and_return("puppet://host/mount/dir")
 
-      @one = stub 'one', :links= => nil, :collect => nil
-      @two = stub 'two', :links= => nil, :collect => nil
+      @one = double('one', :links= => nil, :collect => nil)
+      @two = double('two', :links= => nil, :collect => nil)
 
-      @fileset = stub 'fileset', :files => %w{one two}, :path => "/my/file"
-      Puppet::FileServing::Fileset.stubs(:new).returns(@fileset)
+      @fileset = double('fileset', :files => %w{one two}, :path => "/my/file")
+      allow(Puppet::FileServing::Fileset).to receive(:new).and_return(@fileset)
     end
 
     it "should set each returned instance's path to the original path" do
-      @model.expects(:new).with { |key, options| key == "/my/file" }.returns(@one)
-      @model.expects(:new).with { |key, options| key == "/my/file" }.returns(@two)
+      expect(@model).to receive(:new).with("/my/file", anything).and_return(@one, @two)
       @helper.path2instances(@request, "/my/file")
     end
 
     it "should set each returned instance's relative path to the file-specific path" do
-      @model.expects(:new).with { |key, options| options[:relative_path] == "one" }.returns(@one)
-      @model.expects(:new).with { |key, options| options[:relative_path] == "two" }.returns(@two)
+      expect(@model).to receive(:new).with(anything, hash_including(relative_path: "one")).and_return(@one)
+      expect(@model).to receive(:new).with(anything, hash_including(relative_path: "two")).and_return(@two)
       @helper.path2instances(@request, "/my/file")
     end
 
     it "should set the links value on each instance if one is provided" do
-      @one.expects(:links=).with :manage
-      @two.expects(:links=).with :manage
-      @model.expects(:new).returns(@one)
-      @model.expects(:new).returns(@two)
+      expect(@one).to receive(:links=).with(:manage)
+      expect(@two).to receive(:links=).with(:manage)
+      expect(@model).to receive(:new).and_return(@one, @two)
 
       @request.options[:links] = :manage
       @helper.path2instances(@request, "/my/file")
     end
 
     it "should set the request checksum_type if one is provided" do
-      @one.expects(:checksum_type=).with :test
-      @two.expects(:checksum_type=).with :test
-      @model.expects(:new).returns(@one)
-      @model.expects(:new).returns(@two)
+      expect(@one).to receive(:checksum_type=).with(:test)
+      expect(@two).to receive(:checksum_type=).with(:test)
+      expect(@model).to receive(:new).and_return(@one, @two)
 
       @request.options[:checksum_type] = :test
       @helper.path2instances(@request, "/my/file")
     end
 
     it "should collect the instance's attributes" do
-      @one.expects(:collect)
-      @two.expects(:collect)
-      @model.expects(:new).returns(@one)
-      @model.expects(:new).returns(@two)
+      expect(@one).to receive(:collect)
+      expect(@two).to receive(:collect)
+      expect(@model).to receive(:new).and_return(@one, @two)
 
       @helper.path2instances(@request, "/my/file")
     end

data/spec/unit/file_serving/terminus_selector_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/terminus_selector'
@@ -8,56 +7,56 @@ describe Puppet::FileServing::TerminusSelector do
     @object = Object.new
     @object.extend(Puppet::FileServing::TerminusSelector)
 
-    @request = stub 'request', :key => "mymod/myfile", :options => {:node => "whatever"}, :server => nil, :protocol => nil
+    @request = double('request', :key => "mymod/myfile", :options => {:node => "whatever"}, :server => nil, :protocol => nil)
   end
 
   describe "when being used to select termini" do
     it "should return :file if the request key is fully qualified" do
-      @request.expects(:key).returns File.expand_path('/foo')
+      expect(@request).to receive(:key).and_return(File.expand_path('/foo'))
       expect(@object.select(@request)).to eq(:file)
     end
 
     it "should return :file if the URI protocol is set to 'file'" do
-      @request.expects(:protocol).returns "file"
+      expect(@request).to receive(:protocol).and_return("file")
       expect(@object.select(@request)).to eq(:file)
     end
 
     it "should return :http if the URI protocol is set to 'http'" do
-      @request.expects(:protocol).returns "http"
+      expect(@request).to receive(:protocol).and_return("http")
       expect(@object.select(@request)).to eq :http
     end
 
     it "should return :http if the URI protocol is set to 'https'" do
-      @request.expects(:protocol).returns "https"
+      expect(@request).to receive(:protocol).and_return("https")
       expect(@object.select(@request)).to eq :http
     end
 
     it "should fail when a protocol other than :puppet, :http(s) or :file is used" do
-      @request.stubs(:protocol).returns "ftp"
+      allow(@request).to receive(:protocol).and_return("ftp")
       expect { @object.select(@request) }.to raise_error(ArgumentError)
     end
 
     describe "and the protocol is 'puppet'" do
       before do
-        @request.stubs(:protocol).returns "puppet"
+        allow(@request).to receive(:protocol).and_return("puppet")
       end
 
       it "should choose :rest when a server is specified" do
-        @request.stubs(:protocol).returns "puppet"
-        @request.expects(:server).returns "foo"
+        allow(@request).to receive(:protocol).and_return("puppet")
+        expect(@request).to receive(:server).and_return("foo")
         expect(@object.select(@request)).to eq(:rest)
       end
 
       # This is so a given file location works when bootstrapping with no server.
       it "should choose :rest when default_file_terminus is rest" do
-        @request.stubs(:protocol).returns "puppet"
+        allow(@request).to receive(:protocol).and_return("puppet")
         Puppet[:server] = 'localhost'
         expect(@object.select(@request)).to eq(:rest)
       end
 
       it "should choose :file_server when default_file_terminus is file_server and no server is specified on the request" do
-        @request.expects(:protocol).returns "puppet"
-        @request.expects(:server).returns nil
+        expect(@request).to receive(:protocol).and_return("puppet")
+        expect(@request).to receive(:server).and_return(nil)
         Puppet[:default_file_terminus] = 'file_server'
         expect(@object.select(@request)).to eq(:file_server)
       end

data/spec/unit/file_system/uniquefile_spec.rb

@@ -55,8 +55,8 @@ describe Puppet::FileSystem::Uniquefile do
   it "propagates lock creation failures" do
     # use an arbitrary exception so as not accidentally collide
     # with the ENOENT that occurs when trying to call rmdir
-    Puppet::FileSystem::Uniquefile.stubs(:mkdir).raises 'arbitrary failure'
-    Puppet::FileSystem::Uniquefile.expects(:rmdir).never
+    allow(Puppet::FileSystem::Uniquefile).to receive(:mkdir).and_raise('arbitrary failure')
+    expect(Puppet::FileSystem::Uniquefile).not_to receive(:rmdir)
 
     expect {
       Puppet::FileSystem::Uniquefile.open_tmp('foo') { |tmp| }
@@ -65,10 +65,10 @@ describe Puppet::FileSystem::Uniquefile do
 
   it "only removes lock files that exist" do
     # prevent the .lock directory from being created
-    Puppet::FileSystem::Uniquefile.stubs(:mkdir) { }
+    allow(Puppet::FileSystem::Uniquefile).to receive(:mkdir)
 
     # and expect cleanup to be skipped
-    Puppet::FileSystem::Uniquefile.expects(:rmdir).never
+    expect(Puppet::FileSystem::Uniquefile).not_to receive(:rmdir)
 
     Puppet::FileSystem::Uniquefile.open_tmp('foo') { |tmp| }
   end

data/spec/unit/file_system_spec.rb

@@ -362,7 +362,7 @@ describe "Puppet::FileSystem" do
     end
 
     it "should fall back to stat when trying to lstat a file" do
-      Puppet::Util::Windows::File.expects(:stat).with(Puppet::FileSystem.assert_path(file))
+      expect(Puppet::Util::Windows::File).to receive(:stat).with(Puppet::FileSystem.assert_path(file))
 
       Puppet::FileSystem.lstat(file)
     end
@@ -855,7 +855,7 @@ describe "Puppet::FileSystem" do
       describe 'on non-Windows', :unless => Puppet::Util::Platform.windows? do
         it 'should produce the same results as the Ruby File.expand_path' do
           # on Windows this may be 8.3 style, but not so on other platforms
-          # only done since ::File.expects(:expand_path).with(path).at_least_once
+          # only done since expect(::File).to receive(:expand_path).with(path).at_least(:once)
           # cannot be used since it will cause a stack overflow
           path = tmpdir('foobar')
 
@@ -1072,7 +1072,7 @@ describe "Puppet::FileSystem" do
         end
 
         it 'raises Errno::EACCES if access is denied' do
-          Puppet::Util::Windows::Security.stubs(:get_security_descriptor).raises(Puppet::Util::Windows::Error.new('access denied', 5))
+          allow(Puppet::Util::Windows::Security).to receive(:get_security_descriptor).and_raise(Puppet::Util::Windows::Error.new('access denied', 5))
 
           expect {
             Puppet::FileSystem.replace_file(dest) { |f| f.write(content) }
@@ -1080,7 +1080,7 @@ describe "Puppet::FileSystem" do
         end
 
         it 'raises SystemCallError otherwise' do
-          Puppet::Util::Windows::Security.stubs(:get_security_descriptor).raises(Puppet::Util::Windows::Error.new('arena is trashed', 7))
+          allow(Puppet::Util::Windows::Security).to receive(:get_security_descriptor).and_raise(Puppet::Util::Windows::Error.new('arena is trashed', 7))
 
           expect {
             Puppet::FileSystem.replace_file(dest) { |f| f.write(content) }

data/spec/unit/forge/errors_spec.rb

@@ -41,7 +41,7 @@ Could not connect to http://fake.com:1111
 
   describe 'ResponseError' do
     subject { Puppet::Forge::Errors::ResponseError }
-    let(:response) { stub(:body => '{}', :code => '404', :message => "not found") }
+    let(:response) { double(:body => '{}', :code => '404', :message => "not found") }
 
     context 'without message' do
       let(:exception) { subject.new(:uri => 'http://fake.com:1111', :response => response, :input => 'user/module') }

data/spec/unit/forge/forge_spec.rb

@@ -22,7 +22,7 @@ describe Puppet::Forge do
   let (:mixed_utf8_query_param) { "foo + A\u06FF\u16A0\u{2070E}" } # Aۿᚠ
   let (:mixed_utf8_query_param_encoded) { "foo%20%2B%20A%DB%BF%E1%9A%A0%F0%A0%9C%8E"}
   let (:empty_json) { '{ "results": [], "pagination" : { "next" : null } }' }
-  let (:ok_response) { stub('response', :code => '200', :body => empty_json) }
+  let (:ok_response) { double('response', :code => '200', :body => empty_json) }
 
   describe "making a" do
     before :each do
@@ -30,14 +30,13 @@ describe Puppet::Forge do
     end
 
     context "search request" do
-
       it "includes any defined module_groups, ensuring to only encode them once in the URI" do
         Puppet[:module_groups] = 'base+pe'
 
         # ignores Puppet::Forge::Repository#read_response, provides response to search
         performs_an_http_request(ok_response) do |http|
           encoded_uri = "/v3/modules?query=#{mixed_utf8_query_param_encoded}&module_groups=base%20pe"
-          http.expects(:request).with(responds_with(:path, encoded_uri))
+          expect(http).to receive(:request).with(have_attributes(path: encoded_uri))
         end
 
         forge.search(mixed_utf8_query_param)
@@ -47,7 +46,7 @@ describe Puppet::Forge do
         # ignores Puppet::Forge::Repository#read_response, provides response to search
         performs_an_http_request(ok_response) do |http|
           encoded_uri = "/v3/modules?query=#{mixed_utf8_query_param_encoded}"
-          http.expects(:request).with(responds_with(:path, encoded_uri))
+          expect(http).to receive(:request).with(have_attributes(path: encoded_uri))
         end
 
         forge.search(mixed_utf8_query_param)
@@ -64,7 +63,7 @@ describe Puppet::Forge do
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
           encoded_uri = "/v3/releases?module=#{module_name}&sort_by=version&exclude_fields=#{exclusions}&module_groups=base%20pe"
-          http.expects(:request).with(responds_with(:path, encoded_uri))
+          expect(http).to receive(:request).with(have_attributes(path: encoded_uri))
         end
 
         forge.fetch(module_name)
@@ -77,7 +76,7 @@ describe Puppet::Forge do
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
           encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}&sort_by=version&exclude_fields=#{exclusions}"
-          http.expects(:request).with(responds_with(:path, encoded_uri))
+          expect(http).to receive(:request).with(have_attributes(path: encoded_uri))
         end
 
         forge.fetch(module_name)
@@ -96,17 +95,17 @@ describe Puppet::Forge 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(host, port).returns(proxy)
+    expect(Net::HTTP).to receive(:Proxy).with(*proxy_args).and_return(proxy_class)
+    expect(proxy_class).to receive(:new).with(host, 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