puppet 5.5.22 → 6.0.0

data/spec/integration/type/package_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package), "when choosing a default package provider" do
@@ -63,8 +64,8 @@ end
 
 describe Puppet::Type.type(:package), "when packages with the same name are sourced" do
   before :each do
-    allow(Process).to receive(:euid).and_return(0)
-    @provider = double(
+    Process.stubs(:euid).returns 0
+    @provider = stub(
       'provider',
       :class           => Puppet::Type.type(:package).defaultprovider,
       :clear           => nil,
@@ -72,8 +73,8 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
       :name            => :mock,
       :validate_source => nil
     )
-    allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(@provider)
-    allow(Puppet::Type.type(:package).defaultprovider).to receive(:instances).and_return([])
+    Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(@provider)
+    Puppet::Type.type(:package).defaultprovider.stubs(:instances).returns([])
     @package = Puppet::Type.type(:package).new(:name => "yay", :ensure => :present)
 
     @catalog = Puppet::Resource::Catalog.new
@@ -100,11 +101,11 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
       provider_name = Puppet::Type.type(:package).defaultprovider.name
       expect {
         @catalog.add_resource(@alt_package)
-      }.to raise_error ArgumentError, "Cannot alias Package[gem-yay] to [nil, \"yay\", :#{provider_name}]; resource [\"Package\", nil, \"yay\", :#{provider_name}] already declared"
+      }.to raise_error ArgumentError, "Cannot alias Package[gem-yay] to [\"yay\", :#{provider_name}]; resource [\"Package\", \"yay\", :#{provider_name}] already declared"
     end
   end
 
-  describe "from multiple providers" do
+  describe "from multiple providers", unless: Puppet::Util::Platform.jruby? do
     provider_class = Puppet::Type.type(:package).provider(:gem)
 
     before :each do
@@ -116,18 +117,18 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
     describe "when it should be present" do
       [:present, :latest, "1.0"].each do |state|
         it "should do nothing if it is #{state.to_s}" do
-          expect(@provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
-          expect(@alt_provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
+          @provider.expects(:properties).returns(:ensure => state).at_least_once
+          @alt_provider.expects(:properties).returns(:ensure => state).at_least_once
           @catalog.apply
         end
       end
 
       [:purged, :absent].each do |state|
         it "should install if it is #{state.to_s}" do
-          allow(@provider).to receive(:properties).and_return(:ensure => state)
-          expect(@provider).to receive(:install)
-          allow(@alt_provider).to receive(:properties).and_return(:ensure => state)
-          expect(@alt_provider).to receive(:install)
+          @provider.stubs(:properties).returns(:ensure => state)
+          @provider.expects(:install)
+          @alt_provider.stubs(:properties).returns(:ensure => state)
+          @alt_provider.expects(:install)
           @catalog.apply
         end
       end
@@ -136,17 +137,18 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
 end
 
 describe Puppet::Type.type(:package), 'logging package state transitions' do
+
   let(:catalog) { Puppet::Resource::Catalog.new }
-  let(:provider) { double('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
+  let(:provider) { stub('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
 
   before :each do
-    allow(Process).to receive(:euid).and_return(0)
-    allow(provider).to receive(:satisfies?).with([:purgeable]).and_return(true)
-    allow(provider.class).to receive(:instances).and_return([])
-    allow(provider).to receive(:install).and_return(nil)
-    allow(provider).to receive(:uninstall).and_return(nil)
-    allow(provider).to receive(:purge).and_return(nil)
-    allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(provider)
+    Process.stubs(:euid).returns 0
+    provider.stubs(:satisfies?).with([:purgeable]).returns(true)
+    provider.class.stubs(:instances).returns([])
+    provider.stubs(:install).returns nil
+    provider.stubs(:uninstall).returns nil
+    provider.stubs(:purge).returns nil
+    Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(provider)
   end
 
   after :each do
@@ -177,8 +179,9 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
 
   states.each do |old, new_states|
     describe "#{old} package" do
+
       before :each do
-        allow(provider).to receive(:properties).and_return(:ensure => old)
+        provider.stubs(:properties).returns(:ensure => old)
       end
 
       new_states.each do |new, status|
@@ -198,3 +201,4 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
     end
   end
 end
+

data/spec/integration/type/tidy_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/compiler'
@@ -9,7 +10,7 @@ describe Puppet::Type.type(:tidy) do
   include PuppetSpec::Compiler
 
   before do
-    allow(Puppet::Util::Storage).to receive(:store)
+    Puppet::Util::Storage.stubs(:store)
   end
 
   it "should be able to recursively remove directories" do

data/spec/integration/type_spec.rb

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

data/spec/integration/util/autoload_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/autoload'
@@ -23,6 +24,8 @@ require 'puppet_spec/files'
 describe Puppet::Util::Autoload do
   include PuppetSpec::Files
 
+  let(:env) { Puppet::Node::Environment.create(:foo, []) }
+
   def with_file(name, *path)
     path = File.join(*path)
     # Now create a file to load
@@ -48,13 +51,13 @@ describe Puppet::Util::Autoload do
   end
 
   it "should not fail when asked to load a missing file" do
-    expect(Puppet::Util::Autoload.new("foo", "bar").load(:eh)).to be_falsey
+    expect(Puppet::Util::Autoload.new("foo", "bar").load(:eh, env)).to be_falsey
   end
 
   it "should load and return true when it successfully loads a file" do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:mything, dir, "mything.rb") {
-        expect(loader.load(:mything)).to be_truthy
+        expect(loader.load(:mything, env)).to be_truthy
         expect(loader.class).to be_loaded("bar/mything")
         expect(AutoloadIntegrator).to be_thing(:mything)
       }
@@ -64,7 +67,7 @@ describe Puppet::Util::Autoload do
   it "should consider a file loaded when asked for the name without an extension" do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:noext, dir, "noext.rb") {
-        loader.load(:noext)
+        loader.load(:noext, env)
         expect(loader.class).to be_loaded("bar/noext")
       }
     }
@@ -73,7 +76,7 @@ describe Puppet::Util::Autoload do
   it "should consider a file loaded when asked for the name with an extension" do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:noext, dir, "withext.rb") {
-        loader.load(:withext)
+        loader.load(:withext, env)
         expect(loader.class).to be_loaded("bar/withext.rb")
       }
     }
@@ -81,7 +84,7 @@ describe Puppet::Util::Autoload do
 
   it "should be able to load files directly from modules" do
     ## modulepath can't be used until after app settings are initialized, so we need to simulate that:
-    expect(Puppet.settings).to receive(:app_defaults_initialized?).and_return(true).at_least(:once)
+    Puppet.settings.expects(:app_defaults_initialized?).returns(true).at_least_once
 
     modulepath = tmpfile("autoload_module_testing")
     libdir = File.join(modulepath, "mymod", "lib", "foo")
@@ -89,10 +92,11 @@ describe Puppet::Util::Autoload do
 
     file = File.join(libdir, "plugin.rb")
 
-    Puppet.override(:environments => Puppet::Environments::Static.new(Puppet::Node::Environment.create(:production, [modulepath]))) do
+    env = Puppet::Node::Environment.create(:production, [modulepath])
+    Puppet.override(:environments => Puppet::Environments::Static.new(env)) do
       with_loader("foo", "foo") do |dir, loader|
         with_file(:plugin, file.split("/")) do
-          loader.load(:plugin)
+          loader.load(:plugin, env)
           expect(loader.class).to be_loaded("foo/plugin.rb")
         end
       end

data/spec/integration/util/execution_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Puppet::Util::Execution do
+describe Puppet::Util::Execution, unless: Puppet::Util::Platform.jruby? do
   include PuppetSpec::Files
 
   describe "#execpipe" do
-    it "should set LANG to C avoid localized output", :if => !Puppet.features.microsoft_windows? do
+    it "should set LANG to C avoid localized output", :if => !Puppet::Util::Platform.windows? do
       out = ""
       Puppet::Util::Execution.execpipe('echo $LANG'){ |line| out << line.read.chomp }
       expect(out).to eq("C")
     end
 
-    it "should set LC_ALL to C avoid localized output", :if => !Puppet.features.microsoft_windows? do
+    it "should set LC_ALL to C avoid localized output", :if => !Puppet::Util::Platform.windows? do
       out = ""
       Puppet::Util::Execution.execpipe('echo $LC_ALL'){ |line| out << line.read.chomp }
       expect(out).to eq("C")
@@ -25,34 +25,7 @@ describe Puppet::Util::Execution do
     end
   end
 
-  describe "#execute" do
-    if Puppet::Util::Platform.windows?
-      let(:argv) { ["cmd", "/c", "echo", 123] }
-    else
-      let(:argv) { ["echo", 123] }
-    end
-
-    it 'stringifies sensitive arguments when given an array containing integers' do
-      result = Puppet::Util::Execution.execute(argv, sensitive: true)
-      expect(result.to_s.strip).to eq("123")
-      expect(result.exitstatus).to eq(0)
-    end
-
-    it 'redacts sensitive arguments when given an array' do
-      Puppet[:log_level] = :debug
-      Puppet::Util::Execution.execute(argv, sensitive: true)
-      expect(@logs).to include(an_object_having_attributes(level: :debug, message: "Executing: '[redacted]'"))
-    end
-
-    it 'redacts sensitive arguments when given a string' do
-      Puppet[:log_level] = :debug
-      str = argv.map(&:to_s).join(' ')
-      Puppet::Util::Execution.execute(str, sensitive: true)
-      expect(@logs).to include(an_object_having_attributes(level: :debug, message: "Executing: '[redacted]'"))
-    end
-  end
-
-  describe "#execute (non-Windows)", :if => !Puppet.features.microsoft_windows? do
+  describe "#execute (non-Windows)", :if => !Puppet::Util::Platform.windows? do
     it "should execute basic shell command" do
       result = Puppet::Util::Execution.execute("ls /tmp", :failonfail => true)
       expect(result.exitstatus).to eq(0)
@@ -60,7 +33,7 @@ describe Puppet::Util::Execution do
     end
   end
 
-  describe "#execute (Windows)", :if => Puppet.features.microsoft_windows? do
+  describe "#execute (Windows)", :if => Puppet::Util::Platform.windows? do
     let(:utf8text) do
       # Japanese Lorem Ipsum snippet
       "utf8testfile" + [227, 131, 171, 227, 131, 147, 227, 131, 179, 227, 131, 132, 227,

data/spec/integration/util/rdoc/parser_spec.rb

@@ -1,7 +1,8 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/rdoc'
 
-describe "RDoc::Parser", :unless => Puppet.features.microsoft_windows? do
+describe "RDoc::Parser", :unless => Puppet::Util::Platform.windows? do
   require 'puppet_spec/files'
   include PuppetSpec::Files
 
@@ -140,22 +141,21 @@ end
     Puppet::Util::RDoc.rdoc(doc_dir, [modules_dir, manifests_dir])
   end
 
-  module RdocTesters
-    def has_plugin_rdoc(module_name, type, name)
-      file_exists_and_matches_content(plugin_path(module_name, type, name), /The .*?#{name}.*?\s*#{type} comment/m, /Type.*?#{type}/m)
+  describe "rdoc2 support" do
+    def module_path(module_name)
+      "#{doc_dir}/#{module_name}.html"
     end
-  end
 
-  shared_examples_for :an_rdoc_site do
-    # PUP-3274 / PUP-3638 not sure if this should be kept or not - it is now broken
-#    it "documents the __site__ module" do
-#      has_module_rdoc("__site__")
-#    end
+    def plugin_path(module_name, type, name)
+      "#{doc_dir}/#{module_name}/__#{type}s__.html"
+    end
 
-    # PUP-3274 / PUP-3638 not sure if this should be kept or not - it is now broken
-#    it "documents the a_module module" do
-#      has_module_rdoc("a_module", /The .*?a_module.*? .*?README.*?docs/m)
-#    end
+    def has_plugin_rdoc(module_name, type, name)
+      file_exists_and_matches_content(
+        plugin_path(module_name, type, name),
+        /The .*?#{name}.*?\s*#{type} comment/m, /Type.*?#{type}/m
+      )
+    end
 
     it "documents the a_module::a_plugin type" do
       has_plugin_rdoc("a_module", :type, 'a_plugin')
@@ -169,13 +169,4 @@ end
       has_plugin_rdoc("a_module", :fact, 'a_fact')
     end
   end
-
-  describe "rdoc2 support" do
-    def module_path(module_name); "#{doc_dir}/#{module_name}.html" end
-    def plugin_path(module_name, type, name); "#{doc_dir}/#{module_name}/__#{type}s__.html" end
-
-    include RdocTesters
-
-    it_behaves_like :an_rdoc_site
-  end
 end

data/spec/integration/util/settings_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'
@@ -70,7 +71,7 @@ environment=#{rune_utf8}
     expect(settings[:environment]).to eq(rune_utf8)
   end
 
-  it "reparses configuration if configuration file is touched", :if => !Puppet.features.microsoft_windows? do
+  it "reparses configuration if configuration file is touched", :if => !Puppet::Util::Platform.windows? do
     config = tmpfile("config")
     define_settings(:main,
       :config => {

data/spec/integration/util/windows/adsi_spec.rb

@@ -1,8 +1,9 @@
+#!/usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/windows'
 
 describe Puppet::Util::Windows::ADSI::User,
-  :if => Puppet.features.microsoft_windows? do
+  :if => Puppet::Util::Platform.windows? do
 
   describe ".initialize" do
     it "cannot reference BUILTIN accounts like SYSTEM due to WinNT moniker limitations" do
@@ -58,7 +59,7 @@ describe Puppet::Util::Windows::ADSI::User,
 end
 
 describe Puppet::Util::Windows::ADSI::Group,
-  :if => Puppet.features.microsoft_windows? do
+  :if => Puppet::Util::Platform.windows? do
 
   let (:administrator_bytes) { [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0] }
   let (:administrators_principal) { Puppet::Util::Windows::SID::Principal.lookup_account_sid(administrator_bytes) }
@@ -69,6 +70,7 @@ describe Puppet::Util::Windows::ADSI::Group,
         original_codepage = Encoding.default_external
         Encoding.default_external = Encoding::CP850 # Western Europe
 
+
         Puppet::Util::Windows::ADSI::Group.each do |group|
           expect(group.name.encoding).to be(Encoding::UTF_8)
         end
@@ -82,9 +84,6 @@ describe Puppet::Util::Windows::ADSI::Group,
     it 'should return a list of members resolvable with Puppet::Util::Windows::ADSI::Group.name_sid_hash' do
       temp_groupname = "g#{SecureRandom.uuid}"
       temp_username  = "u#{SecureRandom.uuid}"[0..12]
-      # From https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/password-must-meet-complexity-requirements
-      specials = "~!@#$%^&*_-+=`|\(){}[]:;\"'<>,.?/"
-      temp_password = "p#{SecureRandom.uuid[0..7]}-#{SecureRandom.uuid.upcase[0..7]}-#{specials[rand(specials.length)]}"
 
       # select a virtual account that requires an authority to be able to resolve to SID
       # the Dhcp service is chosen for no particular reason aside from it's a service available on all Windows versions
@@ -113,8 +112,6 @@ describe Puppet::Util::Windows::ADSI::Group,
       begin
         # :SidTypeUser as user on localhost, can be resolved with or without authority prefix
         user = Puppet::Util::Windows::ADSI::User.create(temp_username)
-        # appveyor sometimes requires a password
-        user.password = temp_password
         user.commit()
         users.push({ :sid => user.sid.sid, :name => Puppet::Util::Windows::ADSI.computer_name + '\\' + temp_username })
 
@@ -138,13 +135,13 @@ describe Puppet::Util::Windows::ADSI::Group,
     it 'should return a list of Principal objects even with unresolvable SIDs' do
       members = [
         # NULL SID is not localized
-        double('WIN32OLE', {
+        stub('WIN32OLE', {
           :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           :Name => 'NULL SID',
           :ole_respond_to? => true,
         }),
         # unresolvable SID is a different story altogether
-        double('WIN32OLE', {
+        stub('WIN32OLE', {
           # completely valid SID, but Name is just a stringified version
           :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
           :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
@@ -157,7 +154,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
       # touch the native_object member to have it lazily loaded, so COM objects can be stubbed
       admins.native_object
-      allow(admins.native_object).to receive(:Members).and_return(members)
+      admins.native_object.stubs(:Members).returns(members)
 
       # well-known NULL SID
       expect(admins.members[0].sid).to eq('S-1-0-0')
@@ -165,7 +162,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
       # unresolvable SID
       expect(admins.members[1].sid).to eq('S-1-5-21-3661721861-956923663-2119435483-1112')
-      expect(admins.members[1].account).to eq('S-1-5-21-3661721861-956923663-2119435483-1112')
+      expect(admins.members[1].account).to eq('S-1-5-21-3661721861-956923663-2119435483-1112 (unresolvable)')
       expect(admins.members[1].account_type).to eq(:SidTypeUnknown)
     end
 

data/spec/integration/util/windows/principal_spec.rb

@@ -1,7 +1,8 @@
+#!/usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/windows'
 
-describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft_windows? do
+describe Puppet::Util::Windows::SID::Principal, :if => Puppet::Util::Platform.windows? do
 
   let (:current_user_sid) { Puppet::Util::Windows::ADSI::User.current_user_sid }
   let (:system_bytes) { [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0] }

data/spec/integration/util/windows/process_spec.rb

@@ -1,10 +1,12 @@
+#! /usr/bin/env ruby
+
 require 'spec_helper'
 require 'facter'
 
-describe "Puppet::Util::Windows::Process", :if => Puppet.features.microsoft_windows?  do
+describe "Puppet::Util::Windows::Process", :if => Puppet::Util::Platform.windows?  do
   describe "as an admin" do
     it "should have the SeCreateSymbolicLinkPrivilege necessary to create symlinks on Vista / 2008+",
-      :if => Facter.value(:kernelmajversion).to_f >= 6.0 && Puppet.features.microsoft_windows? do
+      :if => Facter.value(:kernelmajversion).to_f >= 6.0 && Puppet::Util::Platform.windows? do
       # this is a bit of a lame duck test since it requires running user to be admin
       # a better integration test would create a new user with the privilege and verify
       expect(Puppet::Util::Windows::User).to be_admin
@@ -12,7 +14,7 @@ describe "Puppet::Util::Windows::Process", :if => Puppet.features.microsoft_wind
     end
 
     it "should not have the SeCreateSymbolicLinkPrivilege necessary to create symlinks on 2003 and earlier",
-      :if => Facter.value(:kernelmajversion).to_f < 6.0 && Puppet.features.microsoft_windows? do
+      :if => Facter.value(:kernelmajversion).to_f < 6.0 && Puppet::Util::Platform.windows? do
       expect(Puppet::Util::Windows::User).to be_admin
       expect(Puppet::Util::Windows::Process.process_privilege_symlink?).to be_falsey
     end
@@ -36,8 +38,8 @@ describe "Puppet::Util::Windows::Process", :if => Puppet.features.microsoft_wind
     after :each do
       # spec\integration\test\test_helper_spec.rb calls set_environment_strings
       # after :all and thus needs access to the real APIs once again
-      allow(Puppet::Util::Windows::Process).to receive(:GetEnvironmentStringsW).and_call_original
-      allow(Puppet::Util::Windows::Process).to receive(:FreeEnvironmentStringsW).and_call_original
+      Puppet::Util::Windows::Process.unstub(:GetEnvironmentStringsW)
+      Puppet::Util::Windows::Process.unstub(:FreeEnvironmentStringsW)
     end
 
     it "will ignore only keys or values with corrupt byte sequences" do
@@ -61,9 +63,9 @@ describe "Puppet::Util::Windows::Process", :if => Puppet.features.microsoft_wind
         ptr.put_array_of_uchar(0, env_var_block_bytes)
 
         # stub the block of memory that the Win32 API would typically return via pointer
-        expect(Puppet::Util::Windows::Process).to receive(:GetEnvironmentStringsW).and_return(ptr)
+        Puppet::Util::Windows::Process.expects(:GetEnvironmentStringsW).returns(ptr)
         # stub out the real API call to free memory, else process crashes
-        expect(Puppet::Util::Windows::Process).to receive(:FreeEnvironmentStringsW)
+        Puppet::Util::Windows::Process.expects(:FreeEnvironmentStringsW)
 
         env_vars = Puppet::Util::Windows::Process.get_environment_strings
       end