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

data/spec/unit/file_serving/http_metadata_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/http_metadata'
 require 'matchers/json'
@@ -32,8 +31,8 @@ describe Puppet::FileServing::HttpMetadata do
 
     context "with no Last-Modified or Content-MD5 header from the server" do
       before do
-        http_response.stubs(:[]).with('last-modified').returns nil
-        http_response.stubs(:[]).with('content-md5').returns nil
+        allow(http_response).to receive(:[]).with('last-modified').and_return(nil)
+        allow(http_response).to receive(:[]).with('content-md5').and_return(nil)
       end
 
       it "should use :mtime as the checksum type, based on current time" do
@@ -51,13 +50,14 @@ describe Puppet::FileServing::HttpMetadata do
 
     context "with a Last-Modified header from the server" do
       let(:time) { Time.now.utc }
+
       before do
-        http_response.stubs(:[]).with('content-md5').returns nil
+        allow(http_response).to receive(:[]).with('content-md5').and_return(nil)
       end
 
       it "should use :mtime as the checksum type, based on Last-Modified" do
         # HTTP uses "GMT" not "UTC"
-        http_response.stubs(:[]).with('last-modified').returns(time.strftime("%a, %d %b %Y %T GMT"))
+        allow(http_response).to receive(:[]).with('last-modified').and_return(time.strftime("%a, %d %b %Y %T GMT"))
         metadata = described_class.new(http_response)
         metadata.collect
         expect( metadata.checksum_type ).to eq :mtime
@@ -69,9 +69,10 @@ describe Puppet::FileServing::HttpMetadata do
       let(:input) { Time.now.to_s }
       let(:base64) { Digest::MD5.new.base64digest input }
       let(:hex) { Digest::MD5.new.hexdigest input }
+
       before do
-        http_response.stubs(:[]).with('last-modified').returns nil
-        http_response.stubs(:[]).with('content-md5').returns base64
+        allow(http_response).to receive(:[]).with('last-modified').and_return(nil)
+        allow(http_response).to receive(:[]).with('content-md5').and_return(base64)
       end
 
       it "should use the md5 checksum" do

data/spec/unit/file_serving/metadata_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/metadata'
 require 'matchers/json'
@@ -184,14 +183,14 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
 
           it "should give a mtime checksum when checksum_type is set" do
             metadata.checksum_type = "mtime"
-            metadata.expects(:mtime_file).returns(time)
+            expect(metadata).to receive(:mtime_file).and_return(time)
             metadata.collect
             expect(metadata.checksum).to eq("{mtime}#{time}")
           end
 
           it "should give a ctime checksum when checksum_type is set" do
             metadata.checksum_type = "ctime"
-            metadata.expects(:ctime_file).returns(time)
+            expect(metadata).to receive(:ctime_file).and_return(time)
             metadata.collect
             expect(metadata.checksum).to eq("{ctime}#{time}")
           end
@@ -218,7 +217,7 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
         let(:time) { Time.now }
 
         before :each do
-          metadata.expects(:ctime_file).returns(time)
+          expect(metadata).to receive(:ctime_file).and_return(time)
         end
 
         it "should only use checksums of type 'ctime' for directories" do
@@ -228,7 +227,7 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
 
         it "should only use checksums of type 'ctime' for directories even if checksum_type set" do
           metadata.checksum_type = "mtime"
-          metadata.expects(:mtime_file).never
+          expect(metadata).not_to receive(:mtime_file)
           metadata.collect
           expect(metadata.checksum).to eq("{ctime}#{time}")
         end
@@ -249,9 +248,9 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
       path = tmpfile('foo')
       FileUtils.touch(path)
 
-      Puppet::Util::Windows::Security.stubs(:get_owner).with(path).raises(invalid_error)
-      Puppet::Util::Windows::Security.stubs(:get_group).with(path).raises(invalid_error)
-      Puppet::Util::Windows::Security.stubs(:get_mode).with(path).raises(invalid_error)
+      allow(Puppet::Util::Windows::Security).to receive(:get_owner).with(path).and_raise(invalid_error)
+      allow(Puppet::Util::Windows::Security).to receive(:get_group).with(path).and_raise(invalid_error)
+      allow(Puppet::Util::Windows::Security).to receive(:get_mode).with(path).and_raise(invalid_error)
 
       stat = Puppet::FileSystem.stat(path)
 
@@ -267,9 +266,9 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
       path = tmpfile('bar')
       FileUtils.touch(path)
 
-      Puppet::Util::Windows::Security.stubs(:get_owner).with(path, :use).raises(invalid_error)
-      Puppet::Util::Windows::Security.stubs(:get_group).with(path, :use).raises(invalid_error)
-      Puppet::Util::Windows::Security.stubs(:get_mode).with(path, :use).raises(invalid_error)
+      allow(Puppet::Util::Windows::Security).to receive(:get_owner).with(path, :use).and_raise(invalid_error)
+      allow(Puppet::Util::Windows::Security).to receive(:get_group).with(path, :use).and_raise(invalid_error)
+      allow(Puppet::Util::Windows::Security).to receive(:get_mode).with(path, :use).and_raise(invalid_error)
 
       stat = Puppet::FileSystem.stat(path)
 
@@ -348,8 +347,8 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
     let(:group) {20}
 
     before :each do
-      File::Stat.any_instance.stubs(:uid).returns owner
-      File::Stat.any_instance.stubs(:gid).returns group
+      allow_any_instance_of(File::Stat).to receive(:uid).and_return(owner)
+      allow_any_instance_of(File::Stat).to receive(:gid).and_return(group)
     end
 
     describe "when collecting attributes when managing files" do
@@ -394,8 +393,8 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
 
     before :each do
       require 'puppet/util/windows/security'
-      Puppet::Util::Windows::Security.stubs(:get_owner).returns owner
-      Puppet::Util::Windows::Security.stubs(:get_group).returns group
+      allow(Puppet::Util::Windows::Security).to receive(:get_owner).and_return(owner)
+      allow(Puppet::Util::Windows::Security).to receive(:get_group).and_return(group)
     end
 
     describe "when collecting attributes when managing files" do
@@ -441,19 +440,19 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
       end
 
       it "should default owner" do
-        Puppet::Util::Windows::Security.stubs(:get_owner).returns nil
+        allow(Puppet::Util::Windows::Security).to receive(:get_owner).and_return(nil)
 
         expect(metadata.owner).to eq('S-1-5-32-544')
       end
 
       it "should default group" do
-        Puppet::Util::Windows::Security.stubs(:get_group).returns nil
+        allow(Puppet::Util::Windows::Security).to receive(:get_group).and_return(nil)
 
         expect(metadata.group).to eq('S-1-0-0')
       end
 
       it "should default mode" do
-        Puppet::Util::Windows::Security.stubs(:get_mode).returns nil
+        allow(Puppet::Util::Windows::Security).to receive(:get_mode).and_return(nil)
 
         expect(metadata.mode).to eq(0644)
       end
@@ -461,24 +460,23 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
       describe "when the path raises an Invalid ACL error" do
         # these simulate the behavior of a symlink file whose target does not support ACLs
         it "should default owner" do
-          Puppet::Util::Windows::Security.stubs(:get_owner).raises(invalid_dacl_error)
+          allow(Puppet::Util::Windows::Security).to receive(:get_owner).and_raise(invalid_dacl_error)
 
           expect(metadata.owner).to eq('S-1-5-32-544')
         end
 
         it "should default group" do
-          Puppet::Util::Windows::Security.stubs(:get_group).raises(invalid_dacl_error)
+          allow(Puppet::Util::Windows::Security).to receive(:get_group).and_raise(invalid_dacl_error)
 
           expect(metadata.group).to eq('S-1-0-0')
         end
 
         it "should default mode" do
-          Puppet::Util::Windows::Security.stubs(:get_mode).raises(invalid_dacl_error)
+          allow(Puppet::Util::Windows::Security).to receive(:get_mode).and_raise(invalid_dacl_error)
 
           expect(metadata.mode).to eq(0644)
         end
       end
-
     end
 
     def set_mode(mode, path)
@@ -487,35 +485,35 @@ describe Puppet::FileServing::Metadata, :uses_checksums => true do
   end
 end
 
-
 describe Puppet::FileServing::Metadata, " when pointing to a link", :if => Puppet.features.manages_symlinks?, :uses_checksums => true do
   with_digest_algorithms do
     describe "when links are managed" do
       before do
         path = "/base/path/my/file"
         @file = Puppet::FileServing::Metadata.new(path, :links => :manage)
-        stat = stub("stat", :uid => 1, :gid => 2, :ftype => "link", :mode => 0755)
-        Puppet::FileSystem.expects(:lstat).with(path).at_least_once.returns stat
-        Puppet::FileSystem.expects(:readlink).with(path).at_least_once.returns "/some/other/path"
-        @file.stubs("#{digest_algorithm}_file".intern).returns(checksum) # Remove these when :managed links are no longer checksumed.
+        stat = double("stat", :uid => 1, :gid => 2, :ftype => "link", :mode => 0755)
+        expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(stat)
+        expect(Puppet::FileSystem).to receive(:readlink).with(path).and_return("/some/other/path")
+        allow(@file).to receive("#{digest_algorithm}_file".intern).and_return(checksum) # Remove these when :managed links are no longer checksumed.
 
         if Puppet.features.microsoft_windows?
-          win_stat = stub('win_stat', :owner => 'snarf', :group => 'thundercats',
+          win_stat = double('win_stat', :owner => 'snarf', :group => 'thundercats',
             :ftype => 'link', :mode => 0755)
-          Puppet::FileServing::Metadata::WindowsStat.stubs(:new).returns win_stat
+          allow(Puppet::FileServing::Metadata::WindowsStat).to receive(:new).and_return(win_stat)
         end
-
       end
 
       it "should store the destination of the link in :destination if links are :manage" do
         @file.collect
         expect(@file.destination).to eq("/some/other/path")
       end
+
       pending "should not collect the checksum if links are :manage" do
         # We'd like this to be true, but we need to always collect the checksum because in the server/client/server round trip we lose the distintion between manage and follow.
         @file.collect
         expect(@file.checksum).to be_nil
       end
+
       it "should collect the checksum if links are :manage" do # see pending note above
         @file.collect
         expect(@file.checksum).to eq("{#{digest_algorithm}}#{checksum}")
@@ -526,22 +524,24 @@ describe Puppet::FileServing::Metadata, " when pointing to a link", :if => Puppe
       before do
         path = "/base/path/my/file"
         @file = Puppet::FileServing::Metadata.new(path, :links => :follow)
-        stat = stub("stat", :uid => 1, :gid => 2, :ftype => "file", :mode => 0755)
-        Puppet::FileSystem.expects(:stat).with(path).at_least_once.returns stat
-        Puppet::FileSystem.expects(:readlink).never
+        stat = double("stat", :uid => 1, :gid => 2, :ftype => "file", :mode => 0755)
+        expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(stat)
+        expect(Puppet::FileSystem).not_to receive(:readlink)
 
         if Puppet.features.microsoft_windows?
-          win_stat = stub('win_stat', :owner => 'snarf', :group => 'thundercats',
+          win_stat = double('win_stat', :owner => 'snarf', :group => 'thundercats',
             :ftype => 'file', :mode => 0755)
-          Puppet::FileServing::Metadata::WindowsStat.stubs(:new).returns win_stat
+          allow(Puppet::FileServing::Metadata::WindowsStat).to receive(:new).and_return(win_stat)
         end
 
-        @file.stubs("#{digest_algorithm}_file".intern).returns(checksum)
+        allow(@file).to receive("#{digest_algorithm}_file".intern).and_return(checksum)
       end
+
       it "should not store the destination of the link in :destination if links are :follow" do
         @file.collect
         expect(@file.destination).to be_nil
       end
+
       it "should collect the checksum if links are :follow" do
         @file.collect
         expect(@file.checksum).to eq("{#{digest_algorithm}}#{checksum}")

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

@@ -1,11 +1,10 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/file'
 
 module FileServingMountTesting
   def stub_facter(hostname)
-    Facter.stubs(:value).with("hostname").returns(hostname.sub(/\..+/, ''))
-    Facter.stubs(:value).with("domain").returns(hostname.sub(/^[^.]+\./, ''))
+    allow(Facter).to receive(:value).with("hostname").and_return(hostname.sub(/\..+/, ''))
+    allow(Facter).to receive(:value).with("domain").and_return(hostname.sub(/^[^.]+\./, ''))
   end
 end
 
@@ -15,8 +14,8 @@ describe Puppet::FileServing::Mount::File do
   end
 
   it "should be valid if it has a path" do
-    FileTest.stubs(:directory?).returns true
-    FileTest.stubs(:readable?).returns true
+    allow(FileTest).to receive(:directory?).and_return(true)
+    allow(FileTest).to receive(:readable?).and_return(true)
     mount = Puppet::FileServing::Mount::File.new("foo")
     mount.path = "/foo"
     expect { mount.validate }.not_to raise_error
@@ -29,13 +28,13 @@ describe Puppet::FileServing::Mount::File do
     end
 
     it "should fail if the path is not a directory" do
-      FileTest.expects(:directory?).returns(false)
+      expect(FileTest).to receive(:directory?).and_return(false)
       expect { @mount.path = @dir }.to raise_error(ArgumentError)
     end
 
     it "should fail if the path is not readable" do
-      FileTest.expects(:directory?).returns(true)
-      FileTest.expects(:readable?).returns(false)
+      expect(FileTest).to receive(:directory?).and_return(true)
+      expect(FileTest).to receive(:readable?).and_return(false)
       expect { @mount.path = @dir }.to raise_error(ArgumentError)
     end
   end
@@ -44,8 +43,8 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @host = "host.domain.com"
     end
@@ -85,9 +84,9 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @mount.path = "/mount"
       stub_facter("myhost.mydomain.com")
@@ -95,25 +94,25 @@ describe Puppet::FileServing::Mount::File do
     end
 
     it "should return nil if the file is absent" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
       expect(@mount.complete_path("/my/path", nil)).to be_nil
     end
 
     it "should write a log message if the file is absent" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
 
-      Puppet.expects(:info).with("File does not exist or is not accessible: /mount/my/path")
+      expect(Puppet).to receive(:info).with("File does not exist or is not accessible: /mount/my/path")
 
       @mount.complete_path("/my/path", nil)
     end
 
     it "should return the file path if the file is present" do
-      Puppet::FileSystem.stubs(:exist?).with("/my/path").returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).with("/my/path").and_return(true)
       expect(@mount.complete_path("/my/path", nil)).to eq("/mount/my/path")
     end
 
     it "should treat a nil file name as the path to the mount itself" do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
       expect(@mount.complete_path(nil, nil)).to eq("/mount")
     end
 
@@ -141,20 +140,20 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @mount.path = "/mount"
       stub_facter("myhost.mydomain.com")
       @host = "host.domain.com"
 
-      @request = stub 'request', :node => "foo"
+      @request = double('request', :node => "foo")
     end
 
     it "should return the results of the complete file path" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
-      @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
+      expect(@mount).to receive(:complete_path).with("/my/path", "foo").and_return("eh")
       expect(@mount.find("/my/path", @request)).to eq("eh")
     end
   end
@@ -163,26 +162,26 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @mount.path = "/mount"
       stub_facter("myhost.mydomain.com")
       @host = "host.domain.com"
 
-      @request = stub 'request', :node => "foo"
+      @request = double('request', :node => "foo")
     end
 
     it "should return the results of the complete file path as an array" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
-      @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
+      expect(@mount).to receive(:complete_path).with("/my/path", "foo").and_return("eh")
       expect(@mount.search("/my/path", @request)).to eq(["eh"])
     end
 
     it "should return nil if the complete path is nil" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
-      @mount.expects(:complete_path).with("/my/path", "foo").returns nil
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
+      expect(@mount).to receive(:complete_path).with("/my/path", "foo").and_return(nil)
       expect(@mount.search("/my/path", @request)).to be_nil
     end
   end

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

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/locales'
 
@@ -6,67 +5,67 @@ describe Puppet::FileServing::Mount::Locales do
   before do
     @mount = Puppet::FileServing::Mount::Locales.new("locales")
 
-    @environment = stub 'environment', :module => nil
+    @environment = double('environment', :module => nil)
     @options = { :recurse => true }
-    @request = stub 'request', :environment => @environment, :options => @options
+    @request = double('request', :environment => @environment, :options => @options)
   end
 
   describe  "when finding files" do
     it "should use the provided environment to find the modules" do
-      @environment.expects(:modules).returns []
+      expect(@environment).to receive(:modules).and_return([])
 
       @mount.find("foo", @request)
     end
 
     it "should return nil if no module can be found with a matching locale" do
-      mod = mock 'module'
-      mod.stubs(:locale).with("foo/bar").returns nil
+      mod = double('module')
+      allow(mod).to receive(:locale).with("foo/bar").and_return(nil)
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to be_nil
     end
 
     it "should return the file path from the module" do
-      mod = mock 'module'
-      mod.stubs(:locale).with("foo/bar").returns "eh"
+      mod = double('module')
+      allow(mod).to receive(:locale).with("foo/bar").and_return("eh")
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to eq("eh")
     end
   end
 
   describe "when searching for files" do
     it "should use the node's environment to find the modules" do
-      @environment.expects(:modules).at_least_once.returns []
-      @environment.stubs(:modulepath).returns ["/tmp/modules"]
+      expect(@environment).to receive(:modules).at_least(:once).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/tmp/modules"])
 
       @mount.search("foo", @request)
     end
 
     it "should return modulepath if no modules can be found that have locales" do
-      mod = mock 'module'
-      mod.stubs(:locales?).returns false
+      mod = double('module')
+      allow(mod).to receive(:locales?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns ["/"]
-      @options.expects(:[]=).with(:recurse, false)
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/"])
+      expect(@options).to receive(:[]=).with(:recurse, false)
       expect(@mount.search("foo/bar", @request)).to eq(["/"])
     end
 
     it "should return nil if no modules can be found that have locales and modulepath is invalid" do
-      mod = mock 'module'
-      mod.stubs(:locales?).returns false
+      mod = double('module')
+      allow(mod).to receive(:locales?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns []
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return([])
       expect(@mount.search("foo/bar", @request)).to be_nil
     end
 
     it "should return the locale paths for each module that has locales" do
-      one = stub 'module', :locales? => true, :locale_directory => "/one"
-      two = stub 'module', :locales? => true, :locale_directory => "/two"
+      one = double('module', :locales? => true, :locale_directory => "/one")
+      two = double('module', :locales? => true, :locale_directory => "/two")
 
-      @environment.stubs(:modules).returns [one, two]
+      allow(@environment).to receive(:modules).and_return([one, two])
       expect(@mount.search("foo/bar", @request)).to eq(%w{/one /two})
     end
   end