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

data/spec/integration/reference/providers_spec.rb

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

data/spec/integration/reports_spec.rb

@@ -1,11 +1,10 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/reports'
 
 describe Puppet::Reports, " when using report types" do
   before do
-    Puppet.settings.stubs(:use)
+    allow(Puppet.settings).to receive(:use)
   end
 
   it "should load report types as modules" do

data/spec/integration/resource/catalog_spec.rb

@@ -1,49 +1,46 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Resource::Catalog do
   describe "when using the indirector" do
     before do
       # This is so the tests work w/out networking.
-      Facter.stubs(:to_hash).returns({"hostname" => "foo.domain.com"})
-      Facter.stubs(:value).returns("eh")
+      allow(Facter).to receive(:to_hash).and_return({"hostname" => "foo.domain.com"})
+      allow(Facter).to receive(:value).and_return("eh")
     end
 
-
     it "should be able to delegate to the :yaml terminus" do
-      Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :yaml
+      allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class).and_return(:yaml)
 
       # Load now, before we stub the exists? method.
       terminus = Puppet::Resource::Catalog.indirection.terminus(:yaml)
-      terminus.expects(:path).with("me").returns "/my/yaml/file"
+      expect(terminus).to receive(:path).with("me").and_return("/my/yaml/file")
 
-      Puppet::FileSystem.expects(:exist?).with("/my/yaml/file").returns false
+      expect(Puppet::FileSystem).to receive(:exist?).with("/my/yaml/file").and_return(false)
       expect(Puppet::Resource::Catalog.indirection.find("me")).to be_nil
     end
 
     it "should be able to delegate to the :compiler terminus" do
-      Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :compiler
+      allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class).and_return(:compiler)
 
       # Load now, before we stub the exists? method.
       compiler = Puppet::Resource::Catalog.indirection.terminus(:compiler)
 
-      node = mock 'node'
-      node.stub_everything
+      node = double('node', :add_server_facts => nil, :trusted_data= => nil, :environment => nil)
 
-      Puppet::Node.indirection.expects(:find).returns(node)
-      compiler.expects(:compile).with(node, anything).returns nil
+      expect(Puppet::Node.indirection).to receive(:find).and_return(node)
+      expect(compiler).to receive(:compile).with(node, anything).and_return(nil)
 
       expect(Puppet::Resource::Catalog.indirection.find("me")).to be_nil
     end
 
     it "should pass provided node information directly to the terminus" do
-      terminus = mock 'terminus'
+      node = double('node')
+      terminus = double('terminus')
+      allow(terminus).to receive(:validate)
+      expect(terminus).to receive(:find) { |request| expect(request.options[:use_node]).to eq(node) }
 
-      Puppet::Resource::Catalog.indirection.stubs(:terminus).returns terminus
+      allow(Puppet::Resource::Catalog.indirection).to receive(:terminus).and_return(terminus)
 
-      node = mock 'node'
-      terminus.stubs(:validate)
-      terminus.expects(:find).with { |request| request.options[:use_node] == node }
       Puppet::Resource::Catalog.indirection.find("me", :use_node => node)
     end
   end

data/spec/integration/resource/type_collection_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'
@@ -13,12 +12,12 @@ describe Puppet::Resource::TypeCollection do
       FileUtils.mkdir_p @dir
 
       loader = Object.new
-      loader.stubs(:load).returns nil
-      loader.stubs(:set_entry)
+      allow(loader).to receive(:load).and_return(nil)
+      allow(loader).to receive(:set_entry)
 
       loaders = Object.new
-      loaders.expects(:runtime3_type_loader).at_most_once.returns loader
-      Puppet::Pops::Loaders.expects(:loaders).at_most_once.returns loaders
+      expect(loaders).to receive(:runtime3_type_loader).at_most(:once).and_return(loader)
+      expect(Puppet::Pops::Loaders).to receive(:loaders).at_most(:once).and_return(loaders)
 
       environment = Puppet::Node::Environment.create(:env, [@dir])
       @code = environment.known_resource_types

data/spec/integration/ssl/certificate_authority_spec.rb

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

data/spec/integration/ssl/certificate_request_spec.rb

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

data/spec/integration/ssl/certificate_revocation_list_spec.rb

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

data/spec/integration/ssl/host_spec.rb

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

data/spec/integration/ssl/key_spec.rb

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

data/spec/integration/test/test_helper_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "Windows UTF8 environment variables", :if => Puppet.features.microsoft_windows? do
@@ -16,7 +15,7 @@ describe "Windows UTF8 environment variables", :if => Puppet.features.microsoft_
     # Need to cleanup this environment variable otherwise it contaminates any subsequent tests
     Puppet::Util::Windows::Process.set_environment_variable(@varname, nil)
   }
-  
+
   it "#after_each_test should preserve UTF8 environment variables" do
     envhash = Puppet::Util::Windows::Process.get_environment_strings
     expect(envhash[@varname]).to eq(@rune_utf8)

data/spec/integration/transaction/report_spec.rb

@@ -1,28 +1,23 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 
 describe Puppet::Transaction::Report do
   before :each do
     # Enable persistence during tests
-    Puppet::Transaction::Persistence.any_instance.stubs(:enabled?).returns(true)
+    allow_any_instance_of(Puppet::Transaction::Persistence).to receive(:enabled?).and_return(true)
   end
 
   describe "when using the indirector" do
-    after do
-      Puppet.settings.stubs(:use)
-    end
-
     it "should be able to delegate to the :processor terminus" do
-      Puppet::Transaction::Report.indirection.stubs(:terminus_class).returns :processor
+      allow(Puppet::Transaction::Report.indirection).to receive(:terminus_class).and_return(:processor)
 
       terminus = Puppet::Transaction::Report.indirection.terminus(:processor)
 
-      Facter.stubs(:value).returns "host.domain.com"
+      allow(Facter).to receive(:value).and_return("host.domain.com")
 
       report = Puppet::Transaction::Report.new
 
-      terminus.expects(:process).with(report)
+      expect(terminus).to receive(:process).with(report)
 
       Puppet::Transaction::Report.indirection.save(report)
     end
@@ -50,10 +45,10 @@ describe Puppet::Transaction::Report do
 
     def run_catalogs(resources1, resources2, noop1 = false, noop2 = false, &block)
       last_run_report = nil
-      Puppet::Transaction::Report.indirection.expects(:save).twice.with do |report, x|
+      expect(Puppet::Transaction::Report.indirection).to receive(:save) do |report, x|
         last_run_report = report
         true
-      end
+      end.twice
 
       Puppet[:report] = true
       Puppet[:noop] = noop1

data/spec/integration/transaction_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 
@@ -9,7 +8,7 @@ describe Puppet::Transaction do
   include PuppetSpec::Compiler
 
   before do
-    Puppet::Util::Storage.stubs(:store)
+    allow(Puppet::Util::Storage).to receive(:store)
   end
 
   def mk_catalog(*resources)
@@ -37,14 +36,14 @@ describe Puppet::Transaction do
 
     child_resource = Puppet::Type.type(:file).new :path => make_absolute("/foo/bar/baz"), :backup => false
 
-    resource.expects(:eval_generate).returns([child_resource])
+    expect(resource).to receive(:eval_generate).and_return([child_resource])
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
 
-    resource.expects(:retrieve).raises "this is a failure"
-    resource.stubs(:err)
+    expect(resource).to receive(:retrieve).and_raise("this is a failure")
+    allow(resource).to receive(:err)
 
-    child_resource.expects(:retrieve).never
+    expect(child_resource).not_to receive(:retrieve)
 
     transaction.evaluate
   end
@@ -57,7 +56,7 @@ describe Puppet::Transaction do
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
 
-    resource.expects(:evaluate).never
+    expect(resource).not_to receive(:evaluate)
 
     transaction.evaluate
   end
@@ -82,7 +81,7 @@ describe Puppet::Transaction do
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
 
-    resource.expects(:evaluate).never
+    expect(resource).not_to receive(:evaluate)
 
     transaction.evaluate
   end
@@ -95,7 +94,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
     transaction.for_network_device = false
 
-    transaction.expects(:apply).never.with(resource, nil)
+    expect(transaction).not_to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).to be_skipped
@@ -109,7 +108,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
     transaction.for_network_device = true
 
-    transaction.expects(:apply).never.with(resource, nil)
+    expect(transaction).not_to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).to be_skipped
@@ -123,7 +122,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
     transaction.for_network_device = true
 
-    transaction.expects(:apply).with(resource, nil)
+    expect(transaction).to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).not_to be_skipped
@@ -137,7 +136,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
     transaction.for_network_device = true
 
-    transaction.expects(:apply).with(resource, nil)
+    expect(transaction).to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).not_to be_skipped
@@ -163,7 +162,7 @@ describe Puppet::Transaction do
     ecomp[:subscribe] = Puppet::Resource.new(:foo, "file")
     exec[:refreshonly] = true
 
-    exec.expects(:refresh)
+    expect(exec).to receive(:refresh)
     catalog.apply
   end
 
@@ -227,7 +226,7 @@ describe Puppet::Transaction do
     notify = Puppet::Type.type(:notify).new(
       :title => "foo"
     )
-    notify.expects(:pre_run_check).raises(Puppet::Error, "fail for testing")
+    expect(notify).to receive(:pre_run_check).and_raise(Puppet::Error, "fail for testing")
 
     catalog = mk_catalog(file, notify)
     expect { catalog.apply }.to raise_error(Puppet::Error, /Some pre-run checks failed/)
@@ -260,7 +259,7 @@ describe Puppet::Transaction do
       :title => "two"
     )
 
-    exec1.stubs(:err)
+    allow(exec1).to receive(:err)
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
@@ -317,8 +316,8 @@ describe Puppet::Transaction do
           :command     => touch(file1),
         )
 
-        exec1.stubs(:eval_generate).returns(
-          [ (Puppet::Type.type(:notify).new :name => "eval1_notify")]
+        allow(exec1).to receive(:eval_generate).and_return(
+          [ Puppet::Type.type(:notify).new(:name => "eval1_notify") ]
         )
 
         exec2 = Puppet::Type.type(:exec).new(
@@ -328,8 +327,8 @@ describe Puppet::Transaction do
           :refreshonly => true,
           :subscribe   => exec1,
         )
-        exec2.stubs(:eval_generate).returns(
-          [ (Puppet::Type.type(:notify).new :name => "eval2_notify")]
+        allow(exec2).to receive(:eval_generate).and_return(
+          [ Puppet::Type.type(:notify).new(:name => "eval2_notify") ]
         )
 
         Puppet[:tags] = "exec"

data/spec/integration/type/exec_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/type/file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'
@@ -79,10 +78,10 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   before do
     # stub this to not try to create state.yaml
-    Puppet::Util::Storage.stubs(:store)
+    allow(Puppet::Util::Storage).to receive(:store)
 
-    Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
-    Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
+    allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return('my/file.pp')
+    allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(5)
   end
 
   it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
@@ -419,7 +418,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
             it "should not give a deprecation warning about using a checksum in content when using source to define content" do
               FileUtils.touch(path)
-              Puppet.expects(:puppet_deprecation_warning).never
+              expect(Puppet).not_to receive(:puppet_deprecation_warning)
               catalog.add_resource described_class.new(:path => path, :source => link, :links => :follow)
               catalog.apply
             end
@@ -533,7 +532,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         # Create a directory where the backup should be so that writing to it fails
         Dir.mkdir(File.join(dir, "testfile.bak"))
 
-        Puppet::Util::Log.stubs(:newmessage)
+        allow(Puppet::Util::Log).to receive(:newmessage)
 
         catalog.apply
 
@@ -603,7 +602,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
 
     it "should not give a checksum deprecation warning when given actual content" do
-      Puppet.expects(:puppet_deprecation_warning).never
+      expect(Puppet).not_to receive(:puppet_deprecation_warning)
       catalog.add_resource described_class.new(:path => path, :content => 'this is content')
       catalog.apply
     end
@@ -614,14 +613,14 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       end
 
       it "should give a checksum deprecation warning" do
-        Puppet.expects(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
+        expect(Puppet).to receive(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
         d = digest("this is some content")
         catalog.add_resource described_class.new(:path => path, :content => "{#{digest_algorithm}}#{d}")
         catalog.apply
       end
 
       it "should not give a checksum deprecation warning when no content is specified while checksum and checksum value are used" do
-        Puppet.expects(:puppet_deprecation_warning).never
+        expect(Puppet).not_to receive(:puppet_deprecation_warning)
         d = digest("this is some content")
         catalog.add_resource described_class.new(:path => path, :checksum => digest_algorithm, :checksum_value => d)
         catalog.apply
@@ -1282,7 +1281,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   describe "when sourcing" do
     it "should give a deprecation warning when the user sets source_permissions" do
-      Puppet.expects(:puppet_deprecation_warning).with(
+      expect(Puppet).to receive(:puppet_deprecation_warning).with(
         'The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`.',
         {:file => 'my/file.pp', :line => 5})
 
@@ -1291,7 +1290,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
 
     it "should not give a deprecation warning when the user does not set source_permissions" do
-      Puppet.expects(:puppet_deprecation_warning).never
+      expect(Puppet).not_to receive(:puppet_deprecation_warning)
       catalog.add_resource described_class.new(:path => path, :content => 'this is content')
       catalog.apply
     end
@@ -1683,7 +1682,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   describe "when using validate_cmd" do
     it "should fail the file resource if command fails" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env false"))
-      Puppet::Util::Execution.expects(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).and_raise(Puppet::ExecutionFailure, "Failed")
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_falsey
@@ -1691,9 +1690,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
     it "should succeed the file resource if command succeeds" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env true"))
-      Puppet::Util::Execution.expects(:execute)
+      expect(Puppet::Util::Execution).to receive(:execute)
         .with("/usr/bin/env true", {:combine => true, :failonfail => true})
-        .returns Puppet::Util::Execution::ProcessOutput.new('', 0)
+        .and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_truthy

data/spec/integration/type/nagios_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 require 'puppet/file_bucket/dipper'
 
@@ -11,7 +9,7 @@ describe "Nagios file creation" do
   before :each do
     FileUtils.touch(target_file)
     Puppet::FileSystem.chmod(initial_mode, target_file)
-    Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to filebucket
+    allow_any_instance_of(Puppet::FileBucket::Dipper).to receive(:backup) # Don't backup to filebucket
   end
 
   let :target_file do
@@ -25,13 +23,13 @@ describe "Nagios file creation" do
     catalog = Puppet::Resource::Catalog.new
     catalog.host_config = false
     resources.each do |resource|
-      resource.expects(:err).never
+      expect(resource).not_to receive(:err)
       catalog.add_resource(resource)
     end
 
     # the resources are not properly contained and generated resources
     # will end up with dangling edges without this stubbing:
-    catalog.stubs(:container_of).returns resources[0]
+    allow(catalog).to receive(:container_of).and_return(resources[0])
     catalog.apply
   end