puppet 5.5.12-x86-mingw32 → 5.5.13-x86-mingw32

data/spec/unit/util/at_fork_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe 'Puppet::Util::AtFork' do
@@ -19,7 +18,7 @@ describe 'Puppet::Util::AtFork' do
   describe '.get_handler' do
     context 'when on Solaris' do
       before :each do
-        Facter.expects(:value).with(:operatingsystem).returns('Solaris')
+        expect(Facter).to receive(:value).with(:operatingsystem).and_return('Solaris')
       end
 
       after :each do
@@ -29,7 +28,7 @@ describe 'Puppet::Util::AtFork' do
       end
 
       def stub_solaris_handler(stub_noop_too = false)
-        Puppet::Util::AtFork.stubs(:require).with() do |lib|
+        allow(Puppet::Util::AtFork).to receive(:require).with(anything) do |lib|
           if lib == 'puppet/util/at_fork/solaris'
             load lib + '.rb'
             true
@@ -41,7 +40,7 @@ describe 'Puppet::Util::AtFork' do
           else
             false
           end
-        end.returns(true)
+        end.and_return(true)
 
         unless stub_noop_too
           Object.class_exec do
@@ -56,18 +55,18 @@ describe 'Puppet::Util::AtFork' do
           end
         end
 
-        TOPLEVEL_BINDING.eval('self').stubs(:require).with() do |lib|
+        allow(TOPLEVEL_BINDING.eval('self')).to receive(:require).with(anything) do |lib|
           if lib == 'fiddle'
             raise LoadError, 'no fiddle' if stub_noop_too
           else
             Kernel.require lib
           end
           true
-        end.returns(true)
+        end.and_return(true)
       end
 
       it %q(should return the Solaris specific AtFork handler) do
-        Puppet::Util::AtFork.stubs(:require).with() do |lib|
+        allow(Puppet::Util::AtFork).to receive(:require).with(anything) do |lib|
           if lib == 'puppet/util/at_fork/solaris'
             Puppet::Util::AtFork.class_exec do
               const_set(:Solaris, Class.new)
@@ -76,7 +75,7 @@ describe 'Puppet::Util::AtFork' do
           else
             false
           end
-        end.returns(true)
+        end.and_return(true)
         load 'puppet/util/at_fork.rb'
         expect(Puppet::Util::AtFork.get_handler.class).to eq(Puppet::Util::AtFork::Solaris)
       end
@@ -89,24 +88,24 @@ describe 'Puppet::Util::AtFork' do
 
       it %q(should fail when libcontract cannot be loaded) do
         stub_solaris_handler
-        Fiddle::Handle.expects(:new).with(regexp_matches(/^libcontract.so.*/)).raises(Fiddle::DLError, 'no such library')
+        expect(Fiddle::Handle).to receive(:new).with(/^libcontract.so.*/).and_raise(Fiddle::DLError, 'no such library')
         expect { load 'puppet/util/at_fork.rb' }.to raise_error(Fiddle::DLError, 'no such library')
       end
 
       it %q(should fail when libcontract doesn't define all the necessary functions) do
         stub_solaris_handler
-        handle = stub('Fiddle::Handle')
-        Fiddle::Handle.expects(:new).with(regexp_matches(/^libcontract.so.*/)).returns(handle)
-        handle.expects(:[]).raises(Fiddle::DLError, 'no such method')
+        handle = double('Fiddle::Handle')
+        expect(Fiddle::Handle).to receive(:new).with(/^libcontract.so.*/).and_return(handle)
+        expect(handle).to receive(:[]).and_raise(Fiddle::DLError, 'no such method')
         expect { load 'puppet/util/at_fork.rb' }.to raise_error(Fiddle::DLError, 'no such method')
       end
 
       it %q(the returned Solaris specific handler should respond to the expected methods) do
         stub_solaris_handler
-        handle = stub('Fiddle::Handle')
-        Fiddle::Handle.expects(:new).with(regexp_matches(/^libcontract.so.*/)).returns(handle)
-        handle.stubs(:[]).returns(nil)
-        Fiddle::Function.stubs(:new).returns(Proc.new {})
+        handle = double('Fiddle::Handle')
+        expect(Fiddle::Handle).to receive(:new).with(/^libcontract.so.*/).and_return(handle)
+        allow(handle).to receive(:[]).and_return(nil)
+        allow(Fiddle::Function).to receive(:new).and_return(Proc.new {})
         load 'puppet/util/at_fork.rb'
         expect(Puppet::Util::AtFork.get_handler.public_methods).to include(*EXPECTED_HANDLER_METHODS)
       end
@@ -114,11 +113,11 @@ describe 'Puppet::Util::AtFork' do
 
     context 'when NOT on Solaris' do
       before :each do
-        Facter.expects(:value).with(:operatingsystem).returns(nil)
+        expect(Facter).to receive(:value).with(:operatingsystem).and_return(nil)
       end
 
       def stub_noop_handler(namespace_only = false)
-        Puppet::Util::AtFork.stubs(:require).with() do |lib|
+        allow(Puppet::Util::AtFork).to receive(:require).with(anything) do |lib|
           if lib == 'puppet/util/at_fork/noop'
             if namespace_only
               Puppet::Util::AtFork.class_exec do
@@ -131,7 +130,7 @@ describe 'Puppet::Util::AtFork' do
           else
             false
           end
-        end.returns(true)
+        end.and_return(true)
       end
 
       it %q(should return the Noop AtFork handler) do

data/spec/unit/util/autoload_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/autoload'
@@ -10,13 +9,13 @@ describe Puppet::Util::Autoload do
     @autoload = Puppet::Util::Autoload.new("foo", "tmp")
 
     @loaded = {}
-    @autoload.class.stubs(:loaded).returns(@loaded)
+    allow(@autoload.class).to receive(:loaded).and_return(@loaded)
   end
 
   describe "when building the search path" do
     before :each do
       ## modulepath/libdir can't be used until after app settings are initialized, so we need to simulate that:
-      Puppet.settings.expects(:app_defaults_initialized?).returns(true).at_least_once
+      expect(Puppet.settings).to receive(:app_defaults_initialized?).and_return(true).at_least(:once)
     end
 
     it "should collect all of the lib directories that exist in the current environment's module path" do
@@ -59,8 +58,8 @@ describe Puppet::Util::Autoload do
 
     it "should include the module directories, the Puppet libdir, and all of the Ruby load directories" do
       Puppet[:libdir] = '/libdir1'
-      @autoload.class.expects(:gem_directories).returns %w{/one /two}
-      @autoload.class.expects(:module_directories).returns %w{/three /four}
+      expect(@autoload.class).to receive(:gem_directories).and_return(%w{/one /two})
+      expect(@autoload.class).to receive(:module_directories).and_return(%w{/three /four})
       expect(@autoload.class.search_directories(nil)).to eq(%w{/one /two /three /four} + [Puppet[:libdir]] + $LOAD_PATH)
     end
 
@@ -73,17 +72,17 @@ describe Puppet::Util::Autoload do
 
   describe "when loading a file" do
     before do
-      @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
-      FileTest.stubs(:directory?).returns true
+      allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a")])
+      allow(FileTest).to receive(:directory?).and_return(true)
       @time_a = Time.utc(2010, 'jan', 1, 6, 30)
-      File.stubs(:mtime).returns @time_a
+      allow(File).to receive(:mtime).and_return(@time_a)
     end
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
       it "should die with Puppet::Error if a #{error.to_s} exception is thrown" do
-        Puppet::FileSystem.stubs(:exist?).returns true
+        allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
 
-        Kernel.expects(:load).raises error
+        expect(Kernel).to receive(:load).and_raise(error)
 
         expect { @autoload.load("foo") }.to raise_error(Puppet::Error)
       end
@@ -94,8 +93,8 @@ describe Puppet::Util::Autoload do
     end
 
     it "should register loaded files with the autoloader" do
-      Puppet::FileSystem.stubs(:exist?).returns true
-      Kernel.stubs(:load)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(Kernel).to receive(:load)
       @autoload.load("myfile")
 
       expect(@autoload.class.loaded?("tmp/myfile.rb")).to be
@@ -104,8 +103,8 @@ describe Puppet::Util::Autoload do
     end
 
     it "should be seen by loaded? on the instance using the short name" do
-      Puppet::FileSystem.stubs(:exist?).returns true
-      Kernel.stubs(:load)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(Kernel).to receive(:load)
       @autoload.load("myfile")
 
       expect(@autoload.loaded?("myfile.rb")).to be
@@ -114,8 +113,8 @@ describe Puppet::Util::Autoload do
     end
 
     it "should register loaded files with the main loaded file list so they are not reloaded by ruby" do
-      Puppet::FileSystem.stubs(:exist?).returns true
-      Kernel.stubs(:load)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(Kernel).to receive(:load)
 
       @autoload.load("myfile")
 
@@ -125,10 +124,10 @@ describe Puppet::Util::Autoload do
     end
 
     it "should load the first file in the searchpath" do
-      @autoload.stubs(:search_directories).returns [make_absolute("/a"), make_absolute("/b")]
-      FileTest.stubs(:directory?).returns true
-      Puppet::FileSystem.stubs(:exist?).returns true
-      Kernel.expects(:load).with(make_absolute("/a/tmp/myfile.rb"), optionally(anything))
+      allow(@autoload).to receive(:search_directories).and_return([make_absolute("/a"), make_absolute("/b")])
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      expect(Kernel).to receive(:load).with(make_absolute("/a/tmp/myfile.rb"), any_args)
 
       @autoload.load("myfile")
 
@@ -136,8 +135,8 @@ describe Puppet::Util::Autoload do
     end
 
     it "should treat equivalent paths to a loaded file as loaded" do
-      Puppet::FileSystem.stubs(:exist?).returns true
-      Kernel.stubs(:load)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(Kernel).to receive(:load)
       @autoload.load("myfile")
 
       expect(@autoload.class.loaded?("tmp/myfile")).to be
@@ -151,26 +150,26 @@ describe Puppet::Util::Autoload do
 
   describe "when loading all files" do
     before do
-      @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
-      FileTest.stubs(:directory?).returns true
-      Dir.stubs(:glob).returns [make_absolute("/a/foo/file.rb")]
-      Puppet::FileSystem.stubs(:exist?).returns true
+      allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a")])
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(Dir).to receive(:glob).and_return([make_absolute("/a/foo/file.rb")])
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
       @time_a = Time.utc(2010, 'jan', 1, 6, 30)
-      File.stubs(:mtime).returns @time_a
+      allow(File).to receive(:mtime).and_return(@time_a)
 
-      @autoload.class.stubs(:loaded?).returns(false)
+      allow(@autoload.class).to receive(:loaded?).and_return(false)
     end
 
     [RuntimeError, LoadError, SyntaxError].each do |error|
       it "should die an if a #{error.to_s} exception is thrown" do
-        Kernel.expects(:load).raises error
+        expect(Kernel).to receive(:load).and_raise(error)
 
         expect { @autoload.loadall }.to raise_error(Puppet::Error)
       end
     end
 
     it "should require the full path to the file" do
-      Kernel.expects(:load).with(make_absolute("/a/foo/file.rb"), optionally(anything))
+      expect(Kernel).to receive(:load).with(make_absolute("/a/foo/file.rb"), any_args)
 
       @autoload.loadall
     end
@@ -194,14 +193,14 @@ describe Puppet::Util::Autoload do
     end
 
     it "changes should be seen by changed? on the instance using the short name" do
-      File.stubs(:mtime).returns(@first_time)
-      Puppet::FileSystem.stubs(:exist?).returns true
-      Kernel.stubs(:load)
+      allow(File).to receive(:mtime).and_return(@first_time)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(Kernel).to receive(:load)
       @autoload.load("myfile")
       expect(@autoload.loaded?("myfile")).to be
       expect(@autoload.changed?("myfile")).not_to be
 
-      File.stubs(:mtime).returns(@second_time)
+      allow(File).to receive(:mtime).and_return(@second_time)
       expect(@autoload.changed?("myfile")).to be
 
       $LOADED_FEATURES.delete("tmp/myfile.rb")
@@ -209,51 +208,51 @@ describe Puppet::Util::Autoload do
 
     describe "in one directory" do
       before :each do
-        @autoload.class.stubs(:search_directories).returns [make_absolute("/a")]
-        File.expects(:mtime).with(@file_a).returns(@first_time)
+        allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a")])
+        expect(File).to receive(:mtime).with(@file_a).and_return(@first_time)
         @autoload.class.mark_loaded("file", @file_a)
       end
 
       it "should reload if mtime changes" do
-        File.stubs(:mtime).with(@file_a).returns(@first_time + 60)
-        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns true
-        Kernel.expects(:load).with(@file_a, optionally(anything))
+        allow(File).to receive(:mtime).with(@file_a).and_return(@first_time + 60)
+        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(true)
+        expect(Kernel).to receive(:load).with(@file_a, any_args)
         @autoload.class.reload_changed
       end
 
       it "should do nothing if the file is deleted" do
-        File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
-        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns false
-        Kernel.expects(:load).never
+        allow(File).to receive(:mtime).with(@file_a).and_raise(Errno::ENOENT)
+        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(false)
+        expect(Kernel).not_to receive(:load)
         @autoload.class.reload_changed
       end
     end
 
     describe "in two directories" do
       before :each do
-        @autoload.class.stubs(:search_directories).returns [make_absolute("/a"), make_absolute("/b")]
+        allow(@autoload.class).to receive(:search_directories).and_return([make_absolute("/a"), make_absolute("/b")])
       end
 
       it "should load b/file when a/file is deleted" do
-        File.expects(:mtime).with(@file_a).returns(@first_time)
+        expect(File).to receive(:mtime).with(@file_a).and_return(@first_time)
         @autoload.class.mark_loaded("file", @file_a)
-        File.stubs(:mtime).with(@file_a).raises(Errno::ENOENT)
-        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns false
-        Puppet::FileSystem.stubs(:exist?).with(@file_b).returns true
-        File.stubs(:mtime).with(@file_b).returns @first_time
-        Kernel.expects(:load).with(@file_b, optionally(anything))
+        allow(File).to receive(:mtime).with(@file_a).and_raise(Errno::ENOENT)
+        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(@file_b).and_return(true)
+        allow(File).to receive(:mtime).with(@file_b).and_return(@first_time)
+        expect(Kernel).to receive(:load).with(@file_b, any_args)
         @autoload.class.reload_changed
         expect(@autoload.class.send(:loaded)["file"]).to eq([@file_b, @first_time])
       end
 
       it "should load a/file when b/file is loaded and a/file is created" do
-        File.stubs(:mtime).with(@file_b).returns @first_time
-        Puppet::FileSystem.stubs(:exist?).with(@file_b).returns true
+        allow(File).to receive(:mtime).with(@file_b).and_return(@first_time)
+        allow(Puppet::FileSystem).to receive(:exist?).with(@file_b).and_return(true)
         @autoload.class.mark_loaded("file", @file_b)
 
-        File.stubs(:mtime).with(@file_a).returns @first_time
-        Puppet::FileSystem.stubs(:exist?).with(@file_a).returns true
-        Kernel.expects(:load).with(@file_a, optionally(anything))
+        allow(File).to receive(:mtime).with(@file_a).and_return(@first_time)
+        allow(Puppet::FileSystem).to receive(:exist?).with(@file_a).and_return(true)
+        expect(Kernel).to receive(:load).with(@file_a, any_args)
         @autoload.class.reload_changed
         expect(@autoload.class.send(:loaded)["file"]).to eq([@file_a, @first_time])
       end

data/spec/unit/util/backups_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/backups'
@@ -6,10 +5,10 @@ require 'puppet/util/backups'
 describe Puppet::Util::Backups do
   include PuppetSpec::Files
 
-  let(:bucket) { stub('bucket', :name => "foo") }
+  let(:bucket) { double('bucket', :name => "foo") }
   let!(:file) do
     f = Puppet::Type.type(:file).new(:name => path, :backup => 'foo')
-    f.stubs(:bucket).returns(bucket)
+    allow(f).to receive(:bucket).and_return(bucket)
     f
   end
 
@@ -19,8 +18,8 @@ describe Puppet::Util::Backups do
     it "should noop if the file does not exist" do
       file = Puppet::Type.type(:file).new(:name => path)
 
-      file.expects(:bucket).never
-      Puppet::FileSystem.expects(:exist?).with(path).returns false
+      expect(file).not_to receive(:bucket)
+      expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(false)
 
       file.perform_backup
     end
@@ -28,24 +27,24 @@ describe Puppet::Util::Backups do
     it "should succeed silently if self[:backup] is false" do
       file = Puppet::Type.type(:file).new(:name => path, :backup => false)
 
-      file.expects(:bucket).never
-      Puppet::FileSystem.expects(:exist?).never
+      expect(file).not_to receive(:bucket)
+      expect(Puppet::FileSystem).not_to receive(:exist?)
 
       file.perform_backup
     end
 
     it "a bucket should be used when provided" do
       lstat_path_as(path, 'file')
-      bucket.expects(:backup).with(path).returns("mysum")
-      Puppet::FileSystem.expects(:exist?).with(path).returns(true)
+      expect(bucket).to receive(:backup).with(path).and_return("mysum")
+      expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
 
       file.perform_backup
     end
 
     it "should propagate any exceptions encountered when backing up to a filebucket" do
       lstat_path_as(path, 'file')
-      bucket.expects(:backup).raises ArgumentError
-      Puppet::FileSystem.expects(:exist?).with(path).returns(true)
+      expect(bucket).to receive(:backup).and_raise(ArgumentError)
+      expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
 
       expect { file.perform_backup }.to raise_error(ArgumentError)
     end
@@ -57,42 +56,42 @@ describe Puppet::Util::Backups do
 
       it "should remove any local backup if one exists" do
         lstat_path_as(backup, 'file')
-        Puppet::FileSystem.expects(:unlink).with(backup)
-        FileUtils.stubs(:cp_r)
-        Puppet::FileSystem.expects(:exist?).with(path).returns(true)
+        expect(Puppet::FileSystem).to receive(:unlink).with(backup)
+        allow(FileUtils).to receive(:cp_r)
+        expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
 
         file.perform_backup
       end
 
       it "should fail when the old backup can't be removed" do
         lstat_path_as(backup, 'file')
-        Puppet::FileSystem.expects(:unlink).with(backup).raises ArgumentError
-        FileUtils.expects(:cp_r).never
-        Puppet::FileSystem.expects(:exist?).with(path).returns(true)
+        expect(Puppet::FileSystem).to receive(:unlink).with(backup).and_raise(ArgumentError)
+        expect(FileUtils).not_to receive(:cp_r)
+        expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
 
         expect { file.perform_backup }.to raise_error(Puppet::Error)
       end
 
       it "should not try to remove backups that don't exist" do
-        Puppet::FileSystem.expects(:lstat).with(backup).raises(Errno::ENOENT)
-        Puppet::FileSystem.expects(:unlink).with(backup).never
-        FileUtils.stubs(:cp_r)
-        Puppet::FileSystem.expects(:exist?).with(path).returns(true)
+        expect(Puppet::FileSystem).to receive(:lstat).with(backup).and_raise(Errno::ENOENT)
+        expect(Puppet::FileSystem).not_to receive(:unlink).with(backup)
+        allow(FileUtils).to receive(:cp_r)
+        expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
 
         file.perform_backup
       end
 
       it "a copy should be created in the local directory" do
-        FileUtils.expects(:cp_r).with(path, backup, :preserve => true)
-        Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
+        expect(FileUtils).to receive(:cp_r).with(path, backup, :preserve => true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
 
         expect(file.perform_backup).to be_truthy
       end
 
       it "should propagate exceptions if no backup can be created" do
-        FileUtils.expects(:cp_r).raises ArgumentError
+        expect(FileUtils).to receive(:cp_r).and_raise(ArgumentError)
 
-        Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
         expect { file.perform_backup }.to raise_error(Puppet::Error)
       end
     end
@@ -103,15 +102,15 @@ describe Puppet::Util::Backups do
     let(:filename) { File.join(path, 'file') }
 
     it "a bucket should work when provided" do
-      File.stubs(:file?).with(filename).returns true
-      Find.expects(:find).with(path).yields(filename)
+      allow(File).to receive(:file?).with(filename).and_return(true)
+      expect(Find).to receive(:find).with(path).and_yield(filename)
 
-      bucket.expects(:backup).with(filename).returns true
+      expect(bucket).to receive(:backup).with(filename).and_return(true)
 
       lstat_path_as(path, 'directory')
 
-      Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
-      Puppet::FileSystem.stubs(:exist?).with(filename).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
+      allow(Puppet::FileSystem).to receive(:exist?).with(filename).and_return(true)
 
       file.perform_backup
     end
@@ -119,16 +118,16 @@ describe Puppet::Util::Backups do
     it "should do nothing when recursing" do
       file = Puppet::Type.type(:file).new(:name => path, :backup => 'foo', :recurse => true)
 
-      bucket.expects(:backup).never
-      stub_file = stub('file', :stat => stub('stat', :ftype => 'directory'))
-      Puppet::FileSystem.stubs(:new).with(path).returns stub_file
-      Find.expects(:find).never
+      expect(bucket).not_to receive(:backup)
+      stub_file = double('file', :stat => double('stat', :ftype => 'directory'))
+      allow(Puppet::FileSystem).to receive(:new).with(path).and_return(stub_file)
+      expect(Find).not_to receive(:find)
 
       file.perform_backup
     end
   end
 
   def lstat_path_as(path, ftype)
-    Puppet::FileSystem.expects(:lstat).with(path).returns(stub('File::Stat', :ftype => ftype))
+    expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double('File::Stat', :ftype => ftype))
   end
 end