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

data/spec/unit/confiner_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/confiner'
@@ -22,15 +21,15 @@ describe Puppet::Confiner do
   end
 
   it "should delegate its confine method to its confine collection" do
-    coll = mock 'collection'
-    @object.stubs(:confine_collection).returns coll
-    coll.expects(:confine).with(:foo => :bar, :bee => :baz)
+    coll = double('collection')
+    allow(@object).to receive(:confine_collection).and_return(coll)
+    expect(coll).to receive(:confine).with(:foo => :bar, :bee => :baz)
     @object.confine(:foo => :bar, :bee => :baz)
   end
 
   it "should create a new confine collection if one does not exist" do
-    Puppet::ConfineCollection.expects(:new).with("mylabel").returns "mycoll"
-    @object.expects(:to_s).returns "mylabel"
+    expect(Puppet::ConfineCollection).to receive(:new).with("mylabel").and_return("mycoll")
+    expect(@object).to receive(:to_s).and_return("mylabel")
     expect(@object.confine_collection).to eq("mycoll")
   end
 
@@ -40,22 +39,22 @@ describe Puppet::Confiner do
 
   describe "when testing suitability" do
     before do
-      @coll = mock 'collection'
-      @object.stubs(:confine_collection).returns @coll
+      @coll = double('collection')
+      allow(@object).to receive(:confine_collection).and_return(@coll)
     end
 
     it "should return true if the confine collection is valid" do
-      @coll.expects(:valid?).returns true
+      expect(@coll).to receive(:valid?).and_return(true)
       expect(@object).to be_suitable
     end
 
     it "should return false if the confine collection is invalid" do
-      @coll.expects(:valid?).returns false
+      expect(@coll).to receive(:valid?).and_return(false)
       expect(@object).not_to be_suitable
     end
 
     it "should return the summary of the confine collection if a long result is asked for" do
-      @coll.expects(:summary).returns "myresult"
+      expect(@coll).to receive(:summary).and_return("myresult")
       expect(@object.suitable?(false)).to eq("myresult")
     end
   end

data/spec/unit/context/trusted_information_spec.rb

@@ -53,7 +53,7 @@ describe Puppet::Context::TrustedInformation, :unless => RUBY_PLATFORM == 'java'
     end
 
     it "is remote but lacks certificate information when it is authenticated" do
-      Puppet.expects(:info).once.with("TrustedInformation expected a certificate, but none was given.")
+      expect(Puppet).to receive(:info).once.with("TrustedInformation expected a certificate, but none was given.")
 
       trusted = Puppet::Context::TrustedInformation.remote(true, 'cert name', nil)
 

data/spec/unit/daemon_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/daemon'
 require 'puppet/agent'
@@ -28,29 +27,29 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
   end
 
   let(:agent) { Puppet::Agent.new(TestClient.new, false) }
-  let(:server) { stub("Server", :start => nil, :wait_for_shutdown => nil) }
+  let(:server) { double("Server", :start => nil, :wait_for_shutdown => nil) }
 
-  let(:pidfile) { stub("PidFile", :lock => true, :unlock => true, :file_path => 'fake.pid') }
+  let(:pidfile) { double("PidFile", :lock => true, :unlock => true, :file_path => 'fake.pid') }
   let(:scheduler) { RecordingScheduler.new }
 
   let(:daemon) { Puppet::Daemon.new(pidfile, scheduler) }
 
   before(:each) do
-    Signal.stubs(:trap)
-    daemon.stubs(:close_streams).returns nil
+    allow(Signal).to receive(:trap)
+    allow(daemon).to receive(:close_streams).and_return(nil)
   end
 
   it "should reopen the Log logs when told to reopen logs" do
-    Puppet::Util::Log.expects(:reopen)
+    expect(Puppet::Util::Log).to receive(:reopen)
     daemon.reopen_logs
   end
 
   describe "when setting signal traps" do
     [:INT, :TERM].each do |signal|
       it "logs a notice and exits when sent #{signal}" do
-        Signal.stubs(:trap).with(signal).yields
-        Puppet.expects(:notice).with("Caught #{signal}; exiting")
-        daemon.expects(:stop)
+        allow(Signal).to receive(:trap).with(signal).and_yield
+        expect(Puppet).to receive(:notice).with("Caught #{signal}; exiting")
+        expect(daemon).to receive(:stop)
 
         daemon.set_signal_traps
       end
@@ -58,8 +57,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
     {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
       it "logs a notice and remembers to call #{method} when it receives #{signal}" do
-        Signal.stubs(:trap).with(signal).yields
-        Puppet.expects(:notice).with("Caught #{signal}; storing #{method}")
+        allow(Signal).to receive(:trap).with(signal).and_yield
+        expect(Puppet).to receive(:notice).with("Caught #{signal}; storing #{method}")
 
         daemon.set_signal_traps
 
@@ -70,7 +69,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
   describe "when starting" do
     before do
-      daemon.stubs(:set_signal_traps)
+      allow(daemon).to receive(:set_signal_traps)
     end
 
     it "should fail if it has neither agent nor server" do
@@ -78,14 +77,14 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should create its pidfile" do
-      pidfile.expects(:lock).returns(true)
+      expect(pidfile).to receive(:lock).and_return(true)
 
       daemon.agent = agent
       daemon.start
     end
 
     it "should fail if it cannot lock" do
-      pidfile.expects(:lock).returns(false)
+      expect(pidfile).to receive(:lock).and_return(false)
       daemon.agent = agent
 
       expect { daemon.start }.to raise_error(RuntimeError, "Could not create PID file: #{pidfile.file_path}")
@@ -94,7 +93,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     it "should start its server if one is configured" do
       daemon.server = server
 
-      server.expects(:start)
+      expect(server).to receive(:start)
 
       daemon.start
     end
@@ -120,7 +119,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     it "waits for the server to shutdown when there is one" do
       daemon.server = server
 
-      server.expects(:wait_for_shutdown)
+      expect(server).to receive(:wait_for_shutdown)
 
       daemon.start
     end
@@ -128,7 +127,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     it "waits for the server to shutdown when there is one" do
       daemon.server = server
 
-      server.expects(:wait_for_shutdown)
+      expect(server).to receive(:wait_for_shutdown)
 
       daemon.start
     end
@@ -136,7 +135,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
   describe "when stopping" do
     before do
-      Puppet::Util::Log.stubs(:close_all)
+      allow(Puppet::Util::Log).to receive(:close_all)
       # to make the global safe to mock, set it to a subclass of itself,
       # then restore it in an after pass
       without_warnings { Puppet::Application = Class.new(Puppet::Application) }
@@ -148,7 +147,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should stop its server if one is configured" do
-      server.expects(:stop)
+      expect(server).to receive(:stop)
 
       daemon.server = server
 
@@ -156,18 +155,18 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it 'should request a stop from Puppet::Application' do
-      Puppet::Application.expects(:stop!)
+      expect(Puppet::Application).to receive(:stop!)
       expect { daemon.stop }.to exit_with 0
     end
 
     it "should remove its pidfile" do
-      pidfile.expects(:unlock)
+      expect(pidfile).to receive(:unlock)
 
       expect { daemon.stop }.to exit_with 0
     end
 
     it "should close all logs" do
-      Puppet::Util::Log.expects(:close_all)
+      expect(Puppet::Util::Log).to receive(:close_all)
       expect { daemon.stop }.to exit_with 0
     end
 
@@ -186,8 +185,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should do nothing if the agent is running" do
-      agent.expects(:run).with({:splay => false}).raises Puppet::LockError, 'Failed to aquire lock'
-      Puppet.expects(:notice).with('Not triggering already-running agent')
+      expect(agent).to receive(:run).with({:splay => false}).and_raise(Puppet::LockError, 'Failed to aquire lock')
+      expect(Puppet).to receive(:notice).with('Not triggering already-running agent')
 
       daemon.agent = agent
 
@@ -195,8 +194,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should run the agent if one is available and it is not running" do
-      agent.expects(:run).with({:splay => false})
-      Puppet.expects(:notice).with('Not triggering already-running agent').never
+      expect(agent).to receive(:run).with({:splay => false})
+      expect(Puppet).not_to receive(:notice).with('Not triggering already-running agent')
 
       daemon.agent = agent
 
@@ -214,21 +213,21 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it 'should set Puppet::Application.restart!' do
-      Puppet::Application.expects(:restart!)
-      daemon.stubs(:reexec)
+      expect(Puppet::Application).to receive(:restart!)
+      allow(daemon).to receive(:reexec)
       daemon.restart
     end
 
     it "should reexec itself if no agent is available" do
-      daemon.expects(:reexec)
+      expect(daemon).to receive(:reexec)
 
       daemon.restart
     end
 
     it "should reexec itself if the agent is not running" do
-      agent.expects(:running?).returns false
+      expect(agent).to receive(:running?).and_return(false)
       daemon.agent = agent
-      daemon.expects(:reexec)
+      expect(daemon).to receive(:reexec)
 
       daemon.restart
     end
@@ -236,25 +235,25 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
   describe "when reexecing it self" do
     before do
-      daemon.stubs(:exec)
-      daemon.stubs(:stop)
+      allow(daemon).to receive(:exec)
+      allow(daemon).to receive(:stop)
     end
 
     it "should fail if no argv values are available" do
-      daemon.expects(:argv).returns nil
+      expect(daemon).to receive(:argv).and_return(nil)
       expect { daemon.reexec }.to raise_error(Puppet::DevError)
     end
 
     it "should shut down without exiting" do
       daemon.argv = %w{foo}
-      daemon.expects(:stop).with(:exit => false)
+      expect(daemon).to receive(:stop).with(:exit => false)
 
       daemon.reexec
     end
 
     it "should call 'exec' with the original executable and arguments" do
       daemon.argv = %w{foo}
-      daemon.expects(:exec).with($0 + " foo")
+      expect(daemon).to receive(:exec).with($0 + " foo")
 
       daemon.reexec
     end

data/spec/unit/data_providers/function_data_provider_spec.rb

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

data/spec/unit/data_providers/hiera_data_provider_spec.rb

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

data/spec/unit/datatypes_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet_spec/files'
@@ -284,7 +283,7 @@ describe "Puppet::DataTypes" do
         'position.rb' => <<-RUBY
             module PuppetX; module Mytest; class Position
               attr_reader :x, :y
-  
+
               def initialize(x, y)
                 @x = x
                 @y = y
@@ -311,7 +310,7 @@ describe "Puppet::DataTypes" do
                 PUPPET
 
               load_file('puppetx/mytest/position')
-  
+
               implementation_class PuppetX::Mytest::Position
             end
             RUBY
@@ -337,7 +336,7 @@ describe "Puppet::DataTypes" do
                 PUPPET
 
               load_file('puppetx/mytest/position')
-  
+
               implementation_class PuppetX::Mytest::Position
             end
         RUBY

data/spec/unit/defaults_spec.rb

@@ -5,16 +5,19 @@ describe "Defaults" do
   describe ".default_diffargs" do
     describe "on AIX" do
       before(:each) do
-        Facter.stubs(:value).with(:kernel).returns("AIX")
+        allow(Facter).to receive(:value).with(:kernel).and_return("AIX")
       end
+
       describe "on 5.3" do
         before(:each) do
-          Facter.stubs(:value).with(:kernelmajversion).returns("5300")
+          allow(Facter).to receive(:value).with(:kernelmajversion).and_return("5300")
         end
+
         it "should be empty" do
           expect(Puppet.default_diffargs).to eq("")
         end
       end
+
       [ "",
         nil,
         "6300",
@@ -22,7 +25,7 @@ describe "Defaults" do
       ].each do |kernel_version|
         describe "on kernel version #{kernel_version.inspect}" do
           before(:each) do
-            Facter.stubs(:value).with(:kernelmajversion).returns(kernel_version)
+            allow(Facter).to receive(:value).with(:kernelmajversion).and_return(kernel_version)
           end
 
           it "should be '-u'" do
@@ -31,9 +34,10 @@ describe "Defaults" do
         end
       end
     end
+
     describe "on everything else" do
       before(:each) do
-        Facter.stubs(:value).with(:kernel).returns("NOT_AIX")
+        allow(Facter).to receive(:value).with(:kernel).and_return("NOT_AIX")
       end
 
       it "should be '-u'" do
@@ -62,24 +66,24 @@ describe "Defaults" do
 
   describe '.default_digest_algorithm' do
     it 'defaults to md5 when FIPS is not enabled' do
-      Puppet::Util::Platform.stubs(:fips_enabled?).returns false
+      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
       expect(Puppet.default_digest_algorithm).to eq('md5')
     end
 
     it 'defaults to sha256 when FIPS is enabled' do
-      Puppet::Util::Platform.stubs(:fips_enabled?).returns true
+      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
       expect(Puppet.default_digest_algorithm).to eq('sha256')
     end
   end
 
   describe '.supported_checksum_types' do
     it 'defaults to md5, sha256, sha384, sha512, sha224 when FIPS is not enabled' do
-      Puppet::Util::Platform.stubs(:fips_enabled?).returns false
+      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
       expect(Puppet.default_file_checksum_types).to eq(%w[md5 sha256 sha384 sha512 sha224])
     end
 
     it 'defaults to sha256, sha384, sha512, sha224 when FIPS is enabled' do
-      Puppet::Util::Platform.stubs(:fips_enabled?).returns true
+      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
       expect(Puppet.default_file_checksum_types).to eq(%w[sha256 sha384 sha512 sha224])
     end
   end
@@ -102,7 +106,7 @@ describe "Defaults" do
     end
 
     it 'raises when setting md5 in FIPS mode' do
-      Puppet::Util::Platform.stubs(:fips_enabled?).returns true
+      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
       expect {
         Puppet.settings[:supported_checksum_types] = %w[md5]
       }.to raise_error(ArgumentError,
@@ -116,6 +120,7 @@ describe "Defaults" do
         expect(Puppet.settings[:manage_internal_file_permissions]).to be false
       end
     end
+
     describe 'on non-windows', :if => ! Puppet::Util::Platform.windows? do
       it 'should default to true' do
         expect(Puppet.settings[:manage_internal_file_permissions]).to be true
@@ -134,7 +139,7 @@ describe "Defaults" do
       let(:installdir) { 'C:\Program Files\Puppet Labs\Puppet' }
 
       it 'includes user and system modules' do
-        Facter.stubs(:value).with(:env_windows_installdir).returns(installdir)
+        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(installdir)
 
         expect(
           Puppet.default_basemodulepath
@@ -142,7 +147,7 @@ describe "Defaults" do
       end
 
       it 'includes user modules if installdir fact is missing' do
-        Facter.stubs(:value).with(:env_windows_installdir).returns(nil)
+        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(nil)
 
         expect(
           Puppet.default_basemodulepath
@@ -162,7 +167,7 @@ describe "Defaults" do
       let(:installdir) { 'C:\Program Files\Puppet Labs\Puppet' }
 
       it 'includes the default vendormoduledir' do
-        Facter.stubs(:value).with(:env_windows_installdir).returns(installdir)
+        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(installdir)
 
         expect(
           Puppet.default_vendormoduledir
@@ -170,7 +175,7 @@ describe "Defaults" do
       end
 
       it 'is nil if installdir fact is missing' do
-        Facter.stubs(:value).with(:env_windows_installdir).returns(nil)
+        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(nil)
 
         expect(Puppet.default_vendormoduledir).to be_nil
       end

data/spec/unit/environments_spec.rb

@@ -266,7 +266,7 @@ config_version=relative/script
       end
 
       it "interprets glob modulepaths from the environment's directory" do
-        Dir.stubs(:glob).with(File.join(envdir, 'env1', 'other', '*', 'modules')).returns([
+        allow(Dir).to receive(:glob).with(File.join(envdir, 'env1', 'other', '*', 'modules')).and_return([
           File.join(envdir, 'env1', 'other', 'foo', 'modules'),
           File.join(envdir, 'env1', 'other', 'bar', 'modules')
         ])
@@ -563,9 +563,9 @@ config_version=$vardir/random/scripts
 
       it "does not reload the environment if it isn't expired" do
         env = Puppet::Node::Environment.create(:cached, [])
-        mocked_loader = mock('loader')
-        mocked_loader.expects(:get).with(:cached).returns(env).once
-        mocked_loader.expects(:get_conf).with(:cached).returns(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
+        mocked_loader = double('loader')
+        expect(mocked_loader).to receive(:get).with(:cached).and_return(env).once
+        expect(mocked_loader).to receive(:get_conf).with(:cached).and_return(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
 
         cached = Puppet::Environments::Cached.new(mocked_loader)
 
@@ -589,9 +589,9 @@ config_version=$vardir/random/scripts
 
       it "does not reload the environment if it isn't expired" do
         env = Puppet::Node::Environment.create(:cached, [])
-        mocked_loader = mock('loader')
-        mocked_loader.expects(:get).with(:cached).returns(env).once
-        mocked_loader.expects(:get_conf).with(:cached).returns(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
+        mocked_loader = double('loader')
+        expect(mocked_loader).to receive(:get).with(:cached).and_return(env).once
+        expect(mocked_loader).to receive(:get_conf).with(:cached).and_return(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
 
         cached = Puppet::Environments::Cached.new(mocked_loader)