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

data/spec/unit/util/windows/string_spec.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-#!/usr/bin/env ruby
 
 require 'spec_helper'
 require 'puppet/util/windows'

data/spec/unit/util_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 
 describe Puppet::Util do
@@ -99,7 +97,6 @@ describe Puppet::Util do
   end
 
   describe "#withenv on Windows", :if => Puppet::Util::Platform.windows? do
-
     let(:process) { Puppet::Util::Windows::Process }
 
     it "should ignore case" do
@@ -123,7 +120,6 @@ describe Puppet::Util do
       end
     end
 
-
     def withenv_utf8(&block)
       env_var_name = SecureRandom.uuid
       utf_8_bytes = [225, 154, 160] # rune ᚠ
@@ -319,8 +315,8 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        Puppet.features.stubs(:posix).returns true
-        Puppet::Util::Platform.stubs(:windows?).returns false
+        allow(Puppet.features).to receive(:posix).and_return(true)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
       %w[/ /foo /foo/../bar].each do |path|
@@ -332,8 +328,8 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        Puppet.features.stubs(:posix).returns false
-        Puppet::Util::Platform.stubs(:windows?).returns true
+        allow(Puppet.features).to receive(:posix).and_return(false)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
       it "should normalize backslashes" do
@@ -466,8 +462,8 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        Puppet.features.stubs(:posix).returns true
-        Puppet::Util::Platform.stubs(:windows?).returns false
+        allow(Puppet.features).to receive(:posix).and_return(true)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
       %w[/ /foo /foo/../bar].each do |path|
@@ -505,8 +501,8 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        Puppet.features.stubs(:posix).returns false
-        Puppet::Util::Platform.stubs(:windows?).returns true
+        allow(Puppet.features).to receive(:posix).and_return(false)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
       it "should url encode \\ as %5C, but not replace : as %3F" do
@@ -598,14 +594,14 @@ describe Puppet::Util do
 
     before :each do
       # Most of the things this method does are bad to do during specs. :/
-      Kernel.stubs(:fork).returns(pid).yields
+      allow(Kernel).to receive(:fork).and_return(pid).and_yield
 
-      $stdin.stubs(:reopen)
-      $stdout.stubs(:reopen)
-      $stderr.stubs(:reopen)
+      allow($stdin).to receive(:reopen)
+      allow($stdout).to receive(:reopen)
+      allow($stderr).to receive(:reopen)
 
       # ensure that we don't really close anything!
-      (0..256).each {|n| IO.stubs(:new) }
+      allow(IO).to receive(:new)
     end
 
     it "should close all open file descriptors except stdin/stdout/stderr when /proc/self/fd exists" do
@@ -616,28 +612,32 @@ describe Puppet::Util do
         if fd == '.' || fd == '..'
           next
         elsif ['0', '1', '2'].include? fd
-          IO.expects(:new).with(fd.to_i).never
+          expect(IO).not_to receive(:new).with(fd.to_i)
         else
-          IO.expects(:new).with(fd.to_i).returns mock('io', :close)
+          expect(IO).to receive(:new).with(fd.to_i).and_return(double('io', close: nil))
         end
       end
 
-      Dir.stubs(:foreach).with('/proc/self/fd').multiple_yields(*fds)
+      dir_expectation = receive(:foreach).with('/proc/self/fd')
+      fds.each do |fd|
+        dir_expectation = dir_expectation.and_yield(fd)
+      end
+      allow(Dir).to dir_expectation
       Puppet::Util.safe_posix_fork
     end
 
     it "should close all open file descriptors except stdin/stdout/stderr when /proc/self/fd doesn't exists" do
       # This is ugly, but I can't really think of a better way to do it without
       # letting it actually close fds, which seems risky
-      (0..2).each {|n| IO.expects(:new).with(n).never}
-      (3..256).each { |n| IO.expects(:new).with(n).returns mock('io', :close)  }
-      Dir.stubs(:foreach).with('/proc/self/fd') { raise Errno::ENOENT }
+      (0..2).each {|n| expect(IO).not_to receive(:new).with(n)}
+      (3..256).each {|n| expect(IO).to receive(:new).with(n).and_return(double('io', close: nil))  }
+      allow(Dir).to receive(:foreach).with('/proc/self/fd').and_raise(Errno::ENOENT)
 
       Puppet::Util.safe_posix_fork
     end
 
     it "should fork a child process to execute the block" do
-      Kernel.expects(:fork).returns(pid).yields
+      expect(Kernel).to receive(:fork).and_return(pid).and_yield
 
       Puppet::Util.safe_posix_fork do
         "Fork this!"
@@ -654,11 +654,11 @@ describe Puppet::Util do
     let(:path) { File.join(base, 'foo') }
 
     before :each do
-      FileTest.stubs(:file?).returns false
-      FileTest.stubs(:file?).with(path).returns true
+      allow(FileTest).to receive(:file?).and_return(false)
+      allow(FileTest).to receive(:file?).with(path).and_return(true)
 
-      FileTest.stubs(:executable?).returns false
-      FileTest.stubs(:executable?).with(path).returns true
+      allow(FileTest).to receive(:executable?).and_return(false)
+      allow(FileTest).to receive(:executable?).with(path).and_return(true)
     end
 
     it "should accept absolute paths" do
@@ -675,8 +675,8 @@ describe Puppet::Util do
       env = {:HOME => nil, :PATH => env_path}
       env.merge!({:HOMEDRIVE => nil, :USERPROFILE => nil}) if Puppet::Util::Platform.windows?
 
+      expect(Puppet::Util::Warnings).to receive(:warnonce).once
       Puppet::Util.withenv(env) do
-        Puppet::Util::Warnings.expects(:warnonce).once
         Puppet::Util.which('foo')
       end
     end
@@ -698,13 +698,13 @@ describe Puppet::Util do
 
     describe "on POSIX systems" do
       before :each do
-        Puppet.features.stubs(:posix?).returns true
-        Puppet::Util::Platform.stubs(:windows?).returns false
+        allow(Puppet.features).to receive(:posix?).and_return(true)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
       it "should walk the search PATH returning the first executable" do
-        Puppet::Util.stubs(:get_env).with('PATH').returns(File.expand_path('/bin'))
-        Puppet::Util.stubs(:get_env).with('PATHEXT').returns(nil)
+        allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(File.expand_path('/bin'))
+        allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(nil)
 
         expect(Puppet::Util.which('foo')).to eq(path)
       end
@@ -714,16 +714,16 @@ describe Puppet::Util do
       let(:path) { File.expand_path(File.join(base, 'foo.CMD')) }
 
       before :each do
-        Puppet.features.stubs(:posix?).returns false
-        Puppet::Util::Platform.stubs(:windows?).returns true
+        allow(Puppet.features).to receive(:posix?).and_return(false)
+        allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
       describe "when a file extension is specified" do
         it "should walk each directory in PATH ignoring PATHEXT" do
-          Puppet::Util.stubs(:get_env).with('PATH').returns(%w[/bar /bin].map{|dir| File.expand_path(dir)}.join(File::PATH_SEPARATOR))
-          Puppet::Util.stubs(:get_env).with('PATHEXT').returns('.FOOBAR')
+          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(%w[/bar /bin].map{|dir| File.expand_path(dir)}.join(File::PATH_SEPARATOR))
+          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return('.FOOBAR')
 
-          FileTest.expects(:file?).with(File.join(File.expand_path('/bar'), 'foo.CMD')).returns false
+          expect(FileTest).to receive(:file?).with(File.join(File.expand_path('/bar'), 'foo.CMD')).and_return(false)
 
           expect(Puppet::Util.which('foo.CMD')).to eq(path)
         end
@@ -732,38 +732,36 @@ describe Puppet::Util do
       describe "when a file extension is not specified" do
         it "should walk each extension in PATHEXT until an executable is found" do
           bar = File.expand_path('/bar')
-          Puppet::Util.stubs(:get_env).with('PATH').returns("#{bar}#{File::PATH_SEPARATOR}#{base}")
-          Puppet::Util.stubs(:get_env).with('PATHEXT').returns(".EXE#{File::PATH_SEPARATOR}.CMD")
+          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return("#{bar}#{File::PATH_SEPARATOR}#{base}")
+          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(".EXE#{File::PATH_SEPARATOR}.CMD")
 
-          exts = sequence('extensions')
-          FileTest.expects(:file?).in_sequence(exts).with(File.join(bar, 'foo.EXE')).returns false
-          FileTest.expects(:file?).in_sequence(exts).with(File.join(bar, 'foo.CMD')).returns false
-          FileTest.expects(:file?).in_sequence(exts).with(File.join(base, 'foo.EXE')).returns false
-          FileTest.expects(:file?).in_sequence(exts).with(path).returns true
+          expect(FileTest).to receive(:file?).ordered().with(File.join(bar, 'foo.EXE')).and_return(false)
+          expect(FileTest).to receive(:file?).ordered().with(File.join(bar, 'foo.CMD')).and_return(false)
+          expect(FileTest).to receive(:file?).ordered().with(File.join(base, 'foo.EXE')).and_return(false)
+          expect(FileTest).to receive(:file?).ordered().with(path).and_return(true)
 
           expect(Puppet::Util.which('foo')).to eq(path)
         end
 
         it "should walk the default extension path if the environment variable is not defined" do
-          Puppet::Util.stubs(:get_env).with('PATH').returns(base)
-          Puppet::Util.stubs(:get_env).with('PATHEXT').returns(nil)
+          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(base)
+          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(nil)
 
-          exts = sequence('extensions')
           %w[.COM .EXE .BAT].each do |ext|
-            FileTest.expects(:file?).in_sequence(exts).with(File.join(base, "foo#{ext}")).returns false
+            expect(FileTest).to receive(:file?).ordered().with(File.join(base, "foo#{ext}")).and_return(false)
           end
-          FileTest.expects(:file?).in_sequence(exts).with(path).returns true
+          expect(FileTest).to receive(:file?).ordered().with(path).and_return(true)
 
           expect(Puppet::Util.which('foo')).to eq(path)
         end
 
         it "should fall back if no extension matches" do
-          Puppet::Util.stubs(:get_env).with('PATH').returns(base)
-          Puppet::Util.stubs(:get_env).with('PATHEXT').returns(".EXE")
+          allow(Puppet::Util).to receive(:get_env).with('PATH').and_return(base)
+          allow(Puppet::Util).to receive(:get_env).with('PATHEXT').and_return(".EXE")
 
-          FileTest.stubs(:file?).with(File.join(base, 'foo.EXE')).returns false
-          FileTest.stubs(:file?).with(File.join(base, 'foo')).returns true
-          FileTest.stubs(:executable?).with(File.join(base, 'foo')).returns true
+          allow(FileTest).to receive(:file?).with(File.join(base, 'foo.EXE')).and_return(false)
+          allow(FileTest).to receive(:file?).with(File.join(base, 'foo')).and_return(true)
+          allow(FileTest).to receive(:executable?).with(File.join(base, 'foo')).and_return(true)
 
           expect(Puppet::Util.which('foo')).to eq(File.join(base, 'foo'))
         end
@@ -785,6 +783,7 @@ describe Puppet::Util do
 
   context "#replace_file" do
     subject { Puppet::Util }
+
     it { is_expected.to respond_to :replace_file }
 
     let :target do
@@ -855,7 +854,7 @@ describe Puppet::Util do
       subject.replace_file(temp_path, 0440) do |fh|
         fh.puts('some text in there')
       end
-      
+
       expect(File.read(temp_path)).to eq("some text in there\n")
       expect(get_mode(temp_path)).to eq(0440)
     end
@@ -932,7 +931,6 @@ describe Puppet::Util do
   end
 
   describe "#deterministic_rand" do
-
     it "should not fiddle with future rand calls" do
       Puppet::Util.deterministic_rand(123,20)
       rand_one = rand()

data/spec/unit/version_spec.rb

@@ -18,12 +18,13 @@ describe "Puppet.version Public API" do
 
   context "without a VERSION file" do
     before :each do
-      Puppet.stubs(:read_version_file).returns(nil)
+      allow(Puppet).to receive(:read_version_file).and_return(nil)
     end
 
     it "is Puppet::PUPPETVERSION" do
       expect(Puppet.version).to eq(Puppet::PUPPETVERSION)
     end
+
     it "respects the version= setter" do
       Puppet.version = '1.2.3'
       expect(Puppet.version).to eq('1.2.3')
@@ -33,14 +34,15 @@ describe "Puppet.version Public API" do
 
   context "with a VERSION file" do
     it "is the content of the file" do
-      Puppet.expects(:read_version_file).with() do |path|
+      expect(Puppet).to receive(:read_version_file) do |path|
         pathname = Pathname.new(path)
         pathname.basename.to_s == "VERSION"
-      end.returns('3.0.1-260-g9ca4e54')
+      end.and_return('3.0.1-260-g9ca4e54')
 
       expect(Puppet.version).to eq('3.0.1-260-g9ca4e54')
       expect(Puppet.minor_version).to eq('3.0')
     end
+
     it "respects the version= setter" do
       Puppet.version = '1.2.3'
       expect(Puppet.version).to eq('1.2.3')
@@ -50,12 +52,10 @@ describe "Puppet.version Public API" do
 
   context "Using version setter" do
     it "does not read VERSION file if using set version" do
-      Puppet.expects(:read_version_file).never
+      expect(Puppet).not_to receive(:read_version_file)
       Puppet.version = '1.2.3'
       expect(Puppet.version).to eq('1.2.3')
       expect(Puppet.minor_version).to eq('1.2')
     end
   end
 end
-
-

data/spec/unit/x509/cert_provider_spec.rb

@@ -101,7 +101,7 @@ describe Puppet::X509::CertProvider do
       it 'raises if the cacerts are unreadable' do
         capath = File.join(fixture_dir, 'ca.pem')
         provider = create_provider(capath: capath)
-        provider.stubs(:load_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:load_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.load_cacerts
@@ -165,7 +165,7 @@ describe Puppet::X509::CertProvider do
       it 'raises if the CRLs are unreadable' do
         crlpath = File.join(fixture_dir, 'crl.pem')
         provider = create_provider(crlpath: crlpath)
-        provider.stubs(:load_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:load_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.load_crls
@@ -193,7 +193,7 @@ describe Puppet::X509::CertProvider do
 
       it 'raises if the CA certs are unwritable' do
         provider = create_provider(capath: ca_path)
-        provider.stubs(:save_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:save_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.save_cacerts([ca_cert])
@@ -219,7 +219,7 @@ describe Puppet::X509::CertProvider do
 
       it 'raises if the CRLs are unwritable' do
         provider = create_provider(crlpath: crl_path)
-        provider.stubs(:save_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:save_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.save_crls([ca_crl])
@@ -268,7 +268,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the private key is unreadable' do
-        provider.stubs(:load_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:load_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.load_private_key('signed')
@@ -304,12 +304,12 @@ describe Puppet::X509::CertProvider do
 
       it 'returns a certificate' do
         cert = provider.load_client_cert('signed')
-        expect(cert.subject.to_s).to eq('/CN=signed')
+        expect(cert.subject.to_utf8).to eq('CN=signed')
       end
 
       it 'downcases name' do
         cert = provider.load_client_cert('SIGNED')
-        expect(cert.subject.to_s).to eq('/CN=signed')
+        expect(cert.subject.to_utf8).to eq('CN=signed')
       end
 
       it 'raises if name is invalid' do
@@ -326,7 +326,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the certificate is unreadable' do
-        provider.stubs(:load_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:load_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.load_client_cert('signed')
@@ -348,7 +348,7 @@ describe Puppet::X509::CertProvider do
 
       it 'downcases name' do
         csr = provider.load_request('REQUEST')
-        expect(csr.subject.to_s).to eq('/CN=pending')
+        expect(csr.subject.to_utf8).to eq('CN=pending')
       end
 
       it 'raises if name is invalid' do
@@ -364,7 +364,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the certificate is unreadable' do
-        provider.stubs(:load_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:load_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.load_request('pending')
@@ -407,7 +407,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the private key is unwritable' do
-        provider.stubs(:save_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:save_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.save_private_key(name, private_key)
@@ -446,7 +446,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the cert is unwritable' do
-        provider.stubs(:save_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:save_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.save_client_cert(name, client_cert)
@@ -485,7 +485,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the request is unwritable' do
-        provider.stubs(:save_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:save_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.save_request(name, csr)
@@ -516,7 +516,7 @@ describe Puppet::X509::CertProvider do
       end
 
       it 'raises if the file is undeletable' do
-        provider.stubs(:delete_pem).raises(Errno::EACCES, 'Permission denied')
+        allow(provider).to receive(:delete_pem).and_raise(Errno::EACCES, 'Permission denied')
 
         expect {
           provider.delete_request(name)

data/spec/unit/x509/pem_store_spec.rb

@@ -87,21 +87,21 @@ describe Puppet::X509::PemStore do
     end
 
     it 'never changes the owner and group on Windows', if: Puppet::Util::Platform.windows? do
-      FileUtils.expects(:chown).never
+      expect(FileUtils).not_to receive(:chown)
 
       subject.save_pem('PEM', path, owner: 'Administrator', group: 'None')
     end
 
     it 'changes the owner and group when running as root', unless: Puppet::Util::Platform.windows? do
-      Puppet.features.stubs(:root?).returns(true)
-      FileUtils.expects(:chown).with('root', 'root', path)
+      allow(Puppet.features).to receive(:root?).and_return(true)
+      expect(FileUtils).to receive(:chown).with('root', 'root', path)
 
       subject.save_pem('PEM', path, owner: 'root', group: 'root')
     end
 
     it 'does not change owner and group when running not as roo', unless: Puppet::Util::Platform.windows? do
-      Puppet.features.stubs(:root?).returns(false)
-      FileUtils.expects(:chown).never
+      allow(Puppet.features).to receive(:root?).and_return(false)
+      expect(FileUtils).not_to receive(:chown)
 
       subject.save_pem('PEM', path, owner: 'root', group: 'root')
     end