puppet 5.5.12-x64-mingw32 → 5.5.13-x64-mingw32

data/spec/unit/transaction/event_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/transaction/event'
@@ -31,7 +30,7 @@ describe Puppet::Transaction::Event do
 
   it "should produce the message when converted to a string" do
     event = Puppet::Transaction::Event.new
-    event.expects(:message).returns "my message"
+    expect(event).to receive(:message).and_return("my message")
     expect(event.to_s).to eq("my message")
   end
 
@@ -62,60 +61,62 @@ describe Puppet::Transaction::Event do
 
   describe "when sending logs" do
     before do
-      Puppet::Util::Log.stubs(:new)
+      allow(Puppet::Util::Log).to receive(:new)
     end
 
     it "should set the level to the resources's log level if the event status is 'success' and a resource is available" do
-      resource = stub 'resource'
-      resource.expects(:[]).with(:loglevel).returns :myloglevel
-      Puppet::Util::Log.expects(:create).with { |args| args[:level] == :myloglevel }
+      resource = double('resource')
+      expect(resource).to receive(:[]).with(:loglevel).and_return(:myloglevel)
+      expect(Puppet::Util::Log).to receive(:create).with(hash_including(level: :myloglevel))
       Puppet::Transaction::Event.new(:status => "success", :resource => resource).send_log
     end
 
     it "should set the level to 'notice' if the event status is 'success' and no resource is available" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:level] == :notice }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :notice))
       Puppet::Transaction::Event.new(:status => "success").send_log
     end
 
     it "should set the level to 'notice' if the event status is 'noop'" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:level] == :notice }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :notice))
       Puppet::Transaction::Event.new(:status => "noop").send_log
     end
 
     it "should set the level to 'err' if the event status is 'failure'" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:level] == :err }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(level: :err))
       Puppet::Transaction::Event.new(:status => "failure").send_log
     end
 
     it "should set the 'message' to the event log" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:message] == "my message" }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(message: "my message"))
       Puppet::Transaction::Event.new(:message => "my message").send_log
     end
 
     it "should set the tags to the event tags" do
-      Puppet::Util::Log.expects(:new).with { |args| expect(args[:tags].to_a).to match_array(%w{one two}) }
+      expect(Puppet::Util::Log).to receive(:new) do |args|
+        expect(args[:tags].to_a).to match_array(%w{one two})
+      end
       Puppet::Transaction::Event.new(:tags => %w{one two}).send_log
     end
 
     [:file, :line].each do |attr|
       it "should pass the #{attr}" do
-        Puppet::Util::Log.expects(:new).with { |args| args[attr] == "my val" }
+        expect(Puppet::Util::Log).to receive(:new).with(hash_including(attr => "my val"))
         Puppet::Transaction::Event.new(attr => "my val").send_log
       end
     end
 
     it "should use the source description as the source if one is set" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:source] == "/my/param" }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "/my/param"))
       Puppet::Transaction::Event.new(:source_description => "/my/param", :resource => TestResource.new, :property => "foo").send_log
     end
 
     it "should use the property as the source if one is available and no source description is set" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:source] == "foo" }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "foo"))
       Puppet::Transaction::Event.new(:resource => TestResource.new, :property => "foo").send_log
     end
 
     it "should use the property as the source if one is available and no property or source description is set" do
-      Puppet::Util::Log.expects(:new).with { |args| args[:source] == "Foo[bar]" }
+      expect(Puppet::Util::Log).to receive(:new).with(hash_including(source: "Foo[bar]"))
       Puppet::Transaction::Event.new(:resource => TestResource.new).send_log
     end
   end

data/spec/unit/transaction/persistence_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'yaml'
@@ -14,7 +13,7 @@ describe Puppet::Transaction::Persistence do
 
   describe "when loading from file" do
     before do
-      Puppet.settings.stubs(:use).returns(true)
+      allow(Puppet.settings).to receive(:use).and_return(true)
     end
 
     describe "when the file/directory does not exist" do
@@ -48,7 +47,7 @@ describe Puppet::Transaction::Persistence do
         property = "my"
         value = "something"
 
-        Puppet.expects(:err).never
+        expect(Puppet).not_to receive(:err)
 
         persistence = Puppet::Transaction::Persistence.new
         persistence.set_system_value(resource, property, value)
@@ -62,7 +61,7 @@ describe Puppet::Transaction::Persistence do
         test_yaml = {"resources"=>{"a"=>"b"}}
         write_state_file(test_yaml.to_yaml)
 
-        Puppet.expects(:err).never
+        expect(Puppet).not_to receive(:err)
 
         persistence = Puppet::Transaction::Persistence.new
         persistence.load
@@ -73,7 +72,7 @@ describe Puppet::Transaction::Persistence do
       it "should initialize with a clear internal state if the file does not contain valid YAML" do
         write_state_file('{ invalid')
 
-        Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is corrupt/))
+        expect(Puppet).to receive(:err).with(/Transaction store file .* is corrupt/)
 
         persistence = Puppet::Transaction::Persistence.new
         persistence.load
@@ -84,7 +83,7 @@ describe Puppet::Transaction::Persistence do
       it "should initialize with a clear internal state if the file does not contain a hash of data" do
         write_state_file("not_a_hash")
 
-        Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is valid YAML but not returning a hash/))
+        expect(Puppet).to receive(:err).with(/Transaction store file .* is valid YAML but not returning a hash/)
 
         persistence = Puppet::Transaction::Persistence.new
         persistence.load
@@ -95,10 +94,10 @@ describe Puppet::Transaction::Persistence do
       it "should raise an error if the file does not contain valid YAML and cannot be renamed" do
         write_state_file('{ invalid')
 
-        File.expects(:rename).raises(SystemCallError)
+        expect(File).to receive(:rename).and_raise(SystemCallError)
 
-        Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is corrupt/))
-        Puppet.expects(:err).with(regexp_matches(/Unable to rename/))
+        expect(Puppet).to receive(:err).with(/Transaction store file .* is corrupt/)
+        expect(Puppet).to receive(:err).with(/Unable to rename/)
 
         persistence = Puppet::Transaction::Persistence.new
         expect { persistence.load }.to raise_error(Puppet::Error, /Could not rename/)
@@ -107,9 +106,9 @@ describe Puppet::Transaction::Persistence do
       it "should attempt to rename the file if the file is corrupted" do
         write_state_file('{ invalid')
 
-        File.expects(:rename).at_least_once
+        expect(File).to receive(:rename).at_least(:once)
 
-        Puppet.expects(:err).with(regexp_matches(/Transaction store file .* is corrupt/))
+        expect(Puppet).to receive(:err).with(/Transaction store file .* is corrupt/)
 
         persistence = Puppet::Transaction::Persistence.new
         persistence.load
@@ -119,7 +118,7 @@ describe Puppet::Transaction::Persistence do
         FileUtils.rm_f(@tmpfile)
         Dir.mkdir(@tmpfile)
 
-        Puppet.expects(:warning).with(regexp_matches(/Transaction store file .* is not a file/))
+        expect(Puppet).to receive(:warning).with(/Transaction store file .* is not a file/)
 
         persistence = Puppet::Transaction::Persistence.new
         persistence.load
@@ -178,7 +177,7 @@ describe Puppet::Transaction::Persistence do
 
   describe "when checking if persistence is enabled" do
     let(:mock_catalog) do
-      mock
+      double()
     end
 
     let (:persistence) do
@@ -195,25 +194,25 @@ describe Puppet::Transaction::Persistence do
 
     it "should not be enabled when not running in agent mode" do
       Puppet.settings.preferred_run_mode = :user
-      mock_catalog.stubs(:host_config?).returns(true)
+      allow(mock_catalog).to receive(:host_config?).and_return(true)
       expect(persistence.enabled?(mock_catalog)).to be false
     end
 
     it "should not be enabled when the catalog is not the host catalog" do
       Puppet.settings.preferred_run_mode = :agent
-      mock_catalog.stubs(:host_config?).returns(false)
+      allow(mock_catalog).to receive(:host_config?).and_return(false)
       expect(persistence.enabled?(mock_catalog)).to be false
     end
 
     it "should not be enabled outside of agent mode and the catalog is not the host catalog" do
       Puppet.settings.preferred_run_mode = :user
-      mock_catalog.stubs(:host_config?).returns(false)
+      allow(mock_catalog).to receive(:host_config?).and_return(false)
       expect(persistence.enabled?(mock_catalog)).to be false
     end
 
     it "should be enabled in agent mode and when the catalog is the host catalog" do
       Puppet.settings.preferred_run_mode = :agent
-      mock_catalog.stubs(:host_config?).returns(true)
+      allow(mock_catalog).to receive(:host_config?).and_return(true)
       expect(persistence.enabled?(mock_catalog)).to be true
     end
   end

data/spec/unit/transaction/report_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet'
@@ -10,7 +9,7 @@ describe Puppet::Transaction::Report do
   include PuppetSpec::Files
 
   before do
-    Puppet::Util::Storage.stubs(:store)
+    allow(Puppet::Util::Storage).to receive(:store)
   end
 
   it "should set its host name to the node_name_value" do
@@ -24,7 +23,7 @@ describe Puppet::Transaction::Report do
   end
 
   it "should create an initialization timestamp" do
-    Time.expects(:now).returns "mytime"
+    expect(Time).to receive(:now).and_return("mytime")
     expect(Puppet::Transaction::Report.new.time).to eq("mytime")
   end
 
@@ -116,7 +115,7 @@ describe Puppet::Transaction::Report do
   end
 
   it "should not include whits" do
-    Puppet::FileBucket::File.indirection.stubs(:save)
+    allow(Puppet::FileBucket::File.indirection).to receive(:save)
 
     filename = tmpfile('whit_test')
     file = Puppet::Type.type(:file).new(:path => filename)
@@ -167,7 +166,7 @@ describe Puppet::Transaction::Report do
     end
 
     it "should add each status to its status list" do
-      status = stub 'status', :resource => "foo"
+      status = double('status', :resource => "foo")
       @report.add_resource_status status
       expect(@report.resource_statuses["foo"]).to equal(status)
     end
@@ -175,11 +174,11 @@ describe Puppet::Transaction::Report do
 
   describe "when using the indirector" do
     it "should redirect :save to the indirection" do
-      Facter.stubs(:value).returns("eh")
-      @indirection = stub 'indirection', :name => :report
-      Puppet::Transaction::Report.stubs(:indirection).returns(@indirection)
+      allow(Facter).to receive(:value).and_return("eh")
+      @indirection = double('indirection', :name => :report)
+      allow(Puppet::Transaction::Report).to receive(:indirection).and_return(@indirection)
       report = Puppet::Transaction::Report.new
-      @indirection.expects(:save)
+      expect(@indirection).to receive(:save)
       Puppet::Transaction::Report.indirection.save(report)
     end
 
@@ -189,7 +188,7 @@ describe Puppet::Transaction::Report do
 
     it "should delegate its name attribute to its host method" do
       report = Puppet::Transaction::Report.new
-      report.expects(:host).returns "me"
+      expect(report).to receive(:host).and_return("me")
       expect(report.name).to eq("me")
     end
   end
@@ -455,7 +454,7 @@ describe Puppet::Transaction::Report do
 
   describe "when producing a summary" do
     before do
-      Benchmark.stubs(:realtime).returns(5.05683418)
+      allow(Benchmark).to receive(:realtime).and_return(5.05683418)
       resource = Puppet::Type.type(:notify).new(:name => "testing")
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
@@ -474,7 +473,7 @@ describe Puppet::Transaction::Report do
     end
 
     it "should include the last run time in the raw summary hash" do
-      Time.stubs(:now).returns(Time.utc(2010,11,10,12,0,24))
+      allow(Time).to receive(:now).and_return(Time.utc(2010,11,10,12,0,24))
       expect(@report.raw_summary["time"]["last_run"]).to eq(1289390424)
     end
 

data/spec/unit/transaction/resource_harness_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/transaction/resource_harness'
@@ -15,7 +14,7 @@ describe Puppet::Transaction::ResourceHarness do
     @resource = Puppet::Type.type(:file).new :path => path
     @harness = Puppet::Transaction::ResourceHarness.new(@transaction)
     @current_state = Puppet::Resource.new(:file, path)
-    @resource.stubs(:retrieve).returns @current_state
+    allow(@resource).to receive(:retrieve).and_return(@current_state)
   end
 
   it "should accept a transaction at initialization" do
@@ -24,7 +23,7 @@ describe Puppet::Transaction::ResourceHarness do
   end
 
   it "should delegate to the transaction for its relationship graph" do
-    @transaction.expects(:relationship_graph).returns "relgraph"
+    expect(@transaction).to receive(:relationship_graph).and_return("relgraph")
     expect(Puppet::Transaction::ResourceHarness.new(@transaction).relationship_graph).to eq("relgraph")
   end
 
@@ -38,14 +37,14 @@ describe Puppet::Transaction::ResourceHarness do
     end
 
     it "retrieves the current state of the resource" do
-      @resource.expects(:retrieve).returns @current_state
+      expect(@resource).to receive(:retrieve).and_return(@current_state)
 
       @harness.evaluate(@resource)
     end
 
     it "produces a failure status for the resource when an error occurs" do
       the_message = "retrieve failed in testing"
-      @resource.expects(:retrieve).raises(ArgumentError.new(the_message))
+      expect(@resource).to receive(:retrieve).and_raise(ArgumentError.new(the_message))
 
       status = @harness.evaluate(@resource)
 
@@ -290,7 +289,7 @@ describe Puppet::Transaction::ResourceHarness do
     before :each do
       stub_provider = make_stub_provider
       resource = stub_provider.new :name => 'name', :foo => 1, :bar => 2
-      resource.expects(:err).never
+      expect(resource).not_to receive(:err)
       @status = @harness.evaluate(resource)
     end
 
@@ -309,7 +308,7 @@ describe Puppet::Transaction::ResourceHarness do
     before :each do
       stub_provider = make_stub_provider
       @resource = stub_provider.new :name => 'name', :baz => 1
-      @resource.expects(:err).never
+      expect(@resource).not_to receive(:err)
     end
 
     it "should log and pass the exception through" do
@@ -323,7 +322,7 @@ describe Puppet::Transaction::ResourceHarness do
     before :each do
       stub_provider = make_stub_provider
       @resource = stub_provider.new :name => 'name', :brillig => 1
-      @resource.expects(:err).never
+      expect(@resource).not_to receive(:err)
     end
 
     it "should record a failure event" do
@@ -338,7 +337,7 @@ describe Puppet::Transaction::ResourceHarness do
     before :each do
       stub_provider = make_stub_provider
       @resource = stub_provider.new :name => 'name', :slithy => 1
-      @resource.expects(:err).never
+      expect(@resource).not_to receive(:err)
     end
 
     it "should log and pass the exception through" do
@@ -352,7 +351,7 @@ describe Puppet::Transaction::ResourceHarness do
     it "should not call insync? on parameters that are merely audited" do
       stub_provider = make_stub_provider
       resource = stub_provider.new :name => 'name', :audit => ['foo']
-      resource.property(:foo).expects(:insync?).never
+      expect(resource.property(:foo)).not_to receive(:insync?)
       status = @harness.evaluate(resource)
 
       expect(status.events).to be_empty
@@ -362,7 +361,7 @@ describe Puppet::Transaction::ResourceHarness do
       test_file = tmpfile('foo')
       File.open(test_file, 'w').close
       resource = Puppet::Type.type(:file).new :path => test_file, :audit => ['group'], :backup => false
-      resource.expects(:err).never # make sure no exceptions get swallowed
+      expect(resource).not_to receive(:err) # make sure no exceptions get swallowed
 
       status = @harness.evaluate(resource)
 
@@ -388,11 +387,9 @@ describe Puppet::Transaction::ResourceHarness do
       # set up the sequence of stubs; yeah, this is pretty
       # brittle, so this might need to be adjusted if the
       # resource_harness logic changes
-      resource.expects(:retrieve).returns(current_from_filesystem)
-      Puppet::Util::Storage.stubs(:cache).with(resource).
-        returns(historical_from_state_yaml).then.
-        returns(current_from_filesystem).then.
-        returns(current_from_filesystem)
+      expect(resource).to receive(:retrieve).and_return(current_from_filesystem)
+      allow(Puppet::Util::Storage).to receive(:cache).with(resource).
+        and_return(historical_from_state_yaml, current_from_filesystem, current_from_filesystem)
 
       # there should be an audit change recorded, since the two
       # timestamps differ by at least 1 microsecond
@@ -421,11 +418,9 @@ describe Puppet::Transaction::ResourceHarness do
       # set up the sequence of stubs; yeah, this is pretty
       # brittle, so this might need to be adjusted if the
       # resource_harness logic changes
-      resource.expects(:retrieve).returns(current_from_filesystem)
-      Puppet::Util::Storage.stubs(:cache).with(resource).
-        returns(historical_from_state_yaml).then.
-        returns(current_from_filesystem).then.
-        returns(current_from_filesystem)
+      expect(resource).to receive(:retrieve).and_return(current_from_filesystem)
+      allow(Puppet::Util::Storage).to receive(:cache).with(resource).
+        and_return(historical_from_state_yaml, current_from_filesystem, current_from_filesystem)
 
       # there should be no audit change recorded, despite the
       # slight difference in the two timestamps
@@ -476,19 +471,19 @@ describe Puppet::Transaction::ResourceHarness do
         end
 
         it "redacts notices when a parameter is newly audited" do
-          resource.property(:content).expects(:notice).with("audit change: newly-recorded value [redacted]")
+          expect(resource.property(:content)).to receive(:notice).with("audit change: newly-recorded value [redacted]")
           @harness.evaluate(resource)
         end
 
         it "redacts event messages for sensitive properties" do
-          Puppet::Util::Storage.stubs(:cache).with(resource).returns({:content => "historical world"})
+          allow(Puppet::Util::Storage).to receive(:cache).with(resource).and_return({:content => "historical world"})
           status = @harness.evaluate(resource)
           sync_event = status.events[0]
           expect(sync_event.message).to eq 'changed [redacted] to [redacted] (previously recorded value was [redacted])'
         end
 
         it "redacts audit event messages for sensitive properties when simulating noop changes" do
-          Puppet::Util::Storage.stubs(:cache).with(resource).returns({:content => "historical world"})
+          allow(Puppet::Util::Storage).to receive(:cache).with(resource).and_return({:content => "historical world"})
           resource[:noop] = true
           status = @harness.evaluate(resource)
           sync_event = status.events[0]
@@ -496,7 +491,7 @@ describe Puppet::Transaction::ResourceHarness do
         end
 
         it "redacts event contents for sensitive properties" do
-          Puppet::Util::Storage.stubs(:cache).with(resource).returns({:content => "historical world"})
+          allow(Puppet::Util::Storage).to receive(:cache).with(resource).and_return({:content => "historical world"})
           status = @harness.evaluate(resource)
           sync_event = status.events[0]
           expect(sync_event.historical_value).to eq '[redacted]'
@@ -535,7 +530,7 @@ describe Puppet::Transaction::ResourceHarness do
 
     it "should warn and return nil if the resource has no catalog" do
       @resource.catalog = nil
-      @resource.expects(:warning)
+      expect(@resource).to receive(:warning)
 
       expect(@harness.schedule(@resource)).to be_nil
     end
@@ -546,7 +541,7 @@ describe Puppet::Transaction::ResourceHarness do
 
     it "should fail if the named schedule cannot be found" do
       @resource[:schedule] = "whatever"
-      @resource.expects(:fail)
+      expect(@resource).to receive(:fail)
       @harness.schedule(@resource)
     end
 
@@ -576,13 +571,13 @@ describe Puppet::Transaction::ResourceHarness do
 
     it "should return the result of matching the schedule with the cached 'checked' time if a schedule is set" do
       t = Time.now
-      @harness.expects(:cached).with(@resource, :checked).returns(t)
+      expect(@harness).to receive(:cached).with(@resource, :checked).and_return(t)
 
       sched = Puppet::Type.type(:schedule).new(:name => "sched")
       @catalog.add_resource(sched)
       @resource[:schedule] = "sched"
 
-      sched.expects(:match?).with(t.to_i).returns "feh"
+      expect(sched).to receive(:match?).with(t.to_i).and_return("feh")
 
       expect(@harness.scheduled?(@resource)).to eq("feh")
     end
@@ -590,7 +585,7 @@ describe Puppet::Transaction::ResourceHarness do
 
   it "should be able to cache data in the Storage module" do
     data = {}
-    Puppet::Util::Storage.expects(:cache).with(@resource).returns data
+    expect(Puppet::Util::Storage).to receive(:cache).with(@resource).and_return(data)
     @harness.cache(@resource, :foo, "something")
 
     expect(data[:foo]).to eq("something")
@@ -598,7 +593,7 @@ describe Puppet::Transaction::ResourceHarness do
 
   it "should be able to retrieve data from the cache" do
     data = {:foo => "other"}
-    Puppet::Util::Storage.expects(:cache).with(@resource).returns data
+    expect(Puppet::Util::Storage).to receive(:cache).with(@resource).and_return(data)
     expect(@harness.cached(@resource, :foo)).to eq("other")
   end
 
@@ -614,14 +609,14 @@ describe Puppet::Transaction::ResourceHarness do
     end
 
     it "contains (corrective) when corrective change" do
-      Puppet::Transaction::Event.any_instance.stubs(:corrective_change).returns(true)
+      allow_any_instance_of(Puppet::Transaction::Event).to receive(:corrective_change).and_return(true)
       status = @harness.evaluate(resource)
       sync_event = status.events[0]
       expect(sync_event.message).to match(/content changed '{md5}[0-9a-f]+' to '{md5}[0-9a-f]+' \(corrective\)/)
     end
 
     it "contains no modifier when intentional change" do
-      Puppet::Transaction::Event.any_instance.stubs(:corrective_change).returns(false)
+      allow_any_instance_of(Puppet::Transaction::Event).to receive(:corrective_change).and_return(false)
       status = @harness.evaluate(resource)
       sync_event = status.events[0]
       expect(sync_event.message).to match(/content changed '{md5}[0-9a-f]+' to '{md5}[0-9a-f]+'$/)