(CAT-1226) - Remove Compatibility Puppet 6.x and below

lib/rspec-puppet/adapters.rb

@@ -162,7 +162,7 @@ def setup_puppet(example_group)
           {
             environments: loader,
             current_environment: env,
-            loaders: (Puppet::Pops::Loaders.new(env) if Gem::Version.new(Puppet.version) >= Gem::Version.new('6.0.0'))
+            loaders: (Puppet::Pops::Loaders.new(env))
           },
           'Setup rspec-puppet environments'
         )

lib/rspec-puppet/example/function_example_group.rb

@@ -88,19 +88,17 @@ def find_function(function_name = self.class.top_level_description)
       with_vardir do
         env = adapter.current_environment
 
-        if Puppet.version.to_f >= 4.0
-          context_overrides = compiler.context_overrides
-          func = nil
-          loaders = Puppet.lookup(:loaders)
-          Puppet.override(context_overrides, 'rspec-test scope') do
-            func = V4FunctionWrapper.new(function_name,
-                                         loaders.private_environment_loader.load(:function, function_name), context_overrides)
-            @scope = context_overrides[:global_scope]
-          end
-
-          return func if func.func
+        context_overrides = compiler.context_overrides
+        func = nil
+        loaders = Puppet.lookup(:loaders)
+        Puppet.override(context_overrides, 'rspec-test scope') do
+          func = V4FunctionWrapper.new(function_name,
+                                        loaders.private_environment_loader.load(:function, function_name), context_overrides)
+          @scope = context_overrides[:global_scope]
         end
 
+        return func if func.func
+
         if Puppet::Parser::Functions.function(function_name)
           V3FunctionWrapper.new(function_name, scope.method("function_#{function_name}".intern))
         end
@@ -157,46 +155,28 @@ def build_compiler
 
       node = build_node(node_name, node_options)
 
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0
-        Puppet.push_context(
-          {
-            trusted_information: Puppet::Context::TrustedInformation.new('remote', node_name, trusted_values)
-          },
-          'Context for spec trusted hash'
-        )
-      end
+      Puppet.push_context(
+        {
+          trusted_information: Puppet::Context::TrustedInformation.new('remote', node_name, trusted_values)
+        },
+        'Context for spec trusted hash'
+      )
 
       compiler = Puppet::Parser::Compiler.new(node)
       compiler.compile
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.0.0') >= 0
-        loaders = Puppet::Pops::Loaders.new(adapter.current_environment)
-        Puppet.push_context(
-          {
-            loaders: loaders,
-            global_scope: compiler.context_overrides[:global_scope]
-          },
-          'set globals'
-        )
-      end
+      loaders = Puppet::Pops::Loaders.new(adapter.current_environment)
+      Puppet.push_context(
+        {
+          loaders: loaders,
+          global_scope: compiler.context_overrides[:global_scope]
+        },
+        'set globals'
+      )
       compiler
     end
 
     def build_scope(compiler, node_name)
-      if Puppet.version.to_f >= 4.0
-        return compiler.context_overrides[:global_scope]
-      elsif /^2\.[67]/.match?(Puppet.version)
-        # loadall should only be necessary prior to 3.x
-        # Please note, loadall needs to happen first when creating a scope, otherwise
-        # you might receive undefined method `function_*' errors
-        Puppet::Parser::Functions.autoloader.loadall
-        scope = Puppet::Parser::Scope.new(compiler: compiler)
-      else
-        scope = Puppet::Parser::Scope.new(compiler)
-      end
-
-      scope.source = Puppet::Resource::Type.new(:node, node_name)
-      scope.parent = compiler.topscope
-      scope
+      compiler.context_overrides[:global_scope]
     end
 
     def build_node(name, opts = {})

lib/rspec-puppet/monkey_patches.rb

@@ -267,42 +267,40 @@ class Provider::Confine::Exists < Puppet::Provider::Confine
     end
   end
 
-  if Puppet::Util::Package.versioncmp(Puppet.version, '4.9.0') >= 0
-    class Module
-      old_hiera_conf_file = instance_method(:hiera_conf_file)
-      define_method(:hiera_conf_file) do
-        if RSpec::Puppet.rspec_puppet_example?
-          if RSpec.configuration.disable_module_hiera
-            return nil
-          elsif RSpec.configuration.fixture_hiera_configs.key?(name)
-            config = RSpec.configuration.fixture_hiera_configs[name]
-            config = File.absolute_path(config, path) unless config.nil?
-            return config
-          elsif RSpec.configuration.use_fixture_spec_hiera
-            config = RSpec::Puppet.current_example.fixture_spec_hiera_conf(self)
-            return config unless config.nil? && RSpec.configuration.fallback_to_default_hiera
-          end
+  class Module
+    old_hiera_conf_file = instance_method(:hiera_conf_file)
+    define_method(:hiera_conf_file) do
+      if RSpec::Puppet.rspec_puppet_example?
+        if RSpec.configuration.disable_module_hiera
+          return nil
+        elsif RSpec.configuration.fixture_hiera_configs.key?(name)
+          config = RSpec.configuration.fixture_hiera_configs[name]
+          config = File.absolute_path(config, path) unless config.nil?
+          return config
+        elsif RSpec.configuration.use_fixture_spec_hiera
+          config = RSpec::Puppet.current_example.fixture_spec_hiera_conf(self)
+          return config unless config.nil? && RSpec.configuration.fallback_to_default_hiera
         end
-        old_hiera_conf_file.bind_call(self)
       end
+      old_hiera_conf_file.bind_call(self)
     end
+  end
 
-    class Pops::Lookup::ModuleDataProvider
-      old_configuration_path = instance_method(:configuration_path)
-      define_method(:configuration_path) do |lookup_invocation|
-        if RSpec::Puppet.rspec_puppet_example?
-          env = lookup_invocation.scope.environment
-          mod = env.module(module_name)
-          unless mod
-            raise Puppet::DataBinding::LookupError,
-                  format(_("Environment '%<env>s', cannot find module '%<module_name>s'"), env: env.name,
-                                                                                           module_name: module_name)
-          end
-
-          return Pathname.new(mod.hiera_conf_file)
+  class Pops::Lookup::ModuleDataProvider
+    old_configuration_path = instance_method(:configuration_path)
+    define_method(:configuration_path) do |lookup_invocation|
+      if RSpec::Puppet.rspec_puppet_example?
+        env = lookup_invocation.scope.environment
+        mod = env.module(module_name)
+        unless mod
+          raise Puppet::DataBinding::LookupError,
+                format(_("Environment '%<env>s', cannot find module '%<module_name>s'"), env: env.name,
+                                                                                          module_name: module_name)
         end
-        old_configuration_path.bind_call(self, lookup_invocation)
+
+        return Pathname.new(mod.hiera_conf_file)
       end
+      old_configuration_path.bind_call(self, lookup_invocation)
     end
   end
 end

lib/rspec-puppet/setup.rb

@@ -93,12 +93,8 @@ def self.get_module_name
     def self.get_module_name_from_file(file)
       # FIXME: see discussion at
       # https://github.com/rodjek/rspec-puppet/issues/290
-      if Puppet.version.to_f >= 4.0 || RSpec.configuration.parser == 'future'
-        require 'puppet/pops'
-        p = Puppet::Pops::Parser::Lexer2.new
-      else
-        p = Puppet::Parser::Lexer.new
-      end
+      require 'puppet/pops'
+      p = Puppet::Pops::Parser::Lexer2.new
       module_name = nil
       p.string = File.read(file)
       tokens = p.fullscan

lib/rspec-puppet/support.rb

@@ -21,11 +21,7 @@ def environment
     end
 
     def build_code(type, manifest_opts)
-      if (Puppet.version.to_f >= 4.0) || (Puppet[:parser] == 'future')
-        [site_pp_str, pre_cond, test_manifest(type, manifest_opts), post_cond].compact.join("\n")
-      else
-        [import_str, pre_cond, test_manifest(type, manifest_opts), post_cond].compact.join("\n")
-      end
+      [site_pp_str, pre_cond, test_manifest(type, manifest_opts), post_cond].compact.join("\n")
     end
 
     def guess_type_from_path(path)
@@ -302,8 +298,6 @@ def param_str(params)
     end
 
     def trusted_facts_hash(_node_name)
-      return {} unless Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0
-
       extensions = {}
 
       if RSpec.configuration.default_trusted_facts.any?
@@ -315,8 +309,6 @@ def trusted_facts_hash(_node_name)
     end
 
     def trusted_external_data_hash
-      return {} unless Puppet::Util::Package.versioncmp(Puppet.version, '6.14.0') >= 0
-
       external_data = {}
 
       if RSpec.configuration.default_trusted_external_data.any?
@@ -389,11 +381,6 @@ def setup_puppet
       vardir = Dir.mktmpdir
       Puppet[:vardir] = vardir
 
-      # Enable app_management by default for Puppet versions that support it
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0 && Puppet.version.to_i < 5
-        Puppet[:app_management] = !ENV.include?('PUPPET_NOAPP_MANAGMENT')
-      end
-
       adapter.modulepath.map do |d|
         Dir["#{d}/*/lib"].entries
       end.flatten.each do |lib|
@@ -457,17 +444,15 @@ def build_catalog_without_cache_v2(
       node_obj = Puppet::Node.new(nodename, { parameters: node_params, facts: node_facts })
 
       trusted_info = ['remote', nodename, trusted_facts_val]
-      trusted_info.push(trusted_external_data) if Puppet::Util::Package.versioncmp(Puppet.version, '6.14.0') >= 0
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0
-        Puppet.push_context(
-          {
-            trusted_information: Puppet::Context::TrustedInformation.new(*trusted_info)
-          },
-          'Context for spec trusted hash'
-        )
-
-        node_obj.add_server_facts(server_facts_hash) if RSpec.configuration.trusted_server_facts
-      end
+      trusted_info.push(trusted_external_data)
+      Puppet.push_context(
+        {
+          trusted_information: Puppet::Context::TrustedInformation.new(*trusted_info)
+        },
+        'Context for spec trusted hash'
+      )
+
+      node_obj.add_server_facts(server_facts_hash) if RSpec.configuration.trusted_server_facts
 
       adapter.catalog(node_obj, exported)
     end

spec/classes/array_spec.rb

@@ -38,25 +38,7 @@
       ] }
     end
 
-    # Puppet 2.6 will automatically flatten nested arrays. If we're going
-    # to be testing recursive data structures, we might as well ensure that
-    # we're still handling numeric values correctly.
-    describe 'on Puppet 2.6', if: Puppet.version =~ /^2\.6/ do
-      it {
-        expect(subject).to contain_structured_data__def('thing').with(
-          { 'data' => [
-            'first',
-            'second',
-            'third',
-            'fourth',
-            5,
-            6
-          ] }
-        )
-      }
-    end
-
-    describe 'on Puppet 2.7 and later', unless: Puppet.version =~ /^2\.6/ do
+    describe 'on Puppet 2.7 and later' do
       it {
         expect(subject).to contain_structured_data__def('thing').with(
           { 'data' => [

spec/classes/default_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'default_test', if: Puppet.version.to_f >= 4.0 do
+describe 'default_test' do
   let(:params) { { value: :default } }
 
   it { is_expected.to compile.with_all_deps }

spec/classes/deferred_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe 'deferred', if: Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') >= 0 do
+describe 'deferred' do
   it { is_expected.to contain_notify('deferred msg').with_message('A STRING') }
 end

spec/classes/facts_spec.rb

@@ -8,7 +8,7 @@
 # with the description of "Facter should not downcast fact names".  The "mixed case in facts" tests this functionality.
 
 describe 'structured_facts::hash' do
-  context 'symbols and strings in facts', if: Puppet.version.to_f >= 4.0 do
+  context 'symbols and strings in facts' do
     let(:facts) do
       {
         os: {
@@ -23,7 +23,7 @@
     it { is_expected.to contain_notify(family) }
   end
 
-  context 'only symbols in facts', if: Puppet.version.to_f >= 4.0 do
+  context 'only symbols in facts' do
     let(:facts) do
       {
         os: {
@@ -39,7 +39,7 @@
   end
 
   # See note concerning mixed case in facts at the beginning of the file
-  context 'mixed case symbols in facts', if: Puppet.version.to_f >= 4.0 do
+  context 'mixed case symbols in facts' do
     let(:facts) do
       {
         oS: {
@@ -54,7 +54,7 @@
     it { is_expected.to contain_notify(family) }
   end
 
-  context 'only strings in facts', if: Puppet.version.to_f >= 4.0 do
+  context 'only strings in facts' do
     let(:facts) do
       {
         'os' => {
@@ -70,7 +70,7 @@
   end
 
   # See note concerning mixed case in facts at the beginning of the file
-  context 'mixed case strings in facts', if: Puppet.version.to_f >= 4.0 do
+  context 'mixed case strings in facts' do
     let(:facts) do
       {
         'oS' => {
@@ -166,7 +166,7 @@
 end
 
 describe 'structured_facts::case_check' do
-  context 'mixed case in structure fact nested keys', if: Puppet.version.to_f >= 4.0 do
+  context 'mixed case in structure fact nested keys' do
     let(:facts) do
       {
         'custom_fact' => {

spec/classes/hash_spec.rb

@@ -20,15 +20,7 @@
       { 'data' => { 1 => 'uno', 2 => 'dos' } }
     end
 
-    context 'puppet less than 4', unless: Puppet.version.to_f >= 4.0 do
-      it {
-        expect(subject).to contain_structured_data__def('thing').with(
-          { 'data'  => { '1' => 'uno', '2' => 'dos' } }
-        )
-      }
-    end
-
-    context 'puppet 4 or greater', if: Puppet.version.to_f >= 4.0 do
+    context 'puppet 4 or greater' do
       it {
         expect(subject).to contain_structured_data__def('thing').with(
           { 'data'  => { 1 => 'uno', 2 => 'dos' } }

spec/classes/hiera_integration_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # hiera is not supported before 2.7
-describe 'test::hiera', if: Puppet.version.to_f >= 3.0 do
+describe 'test::hiera' do
   context 'with :hiera_config set' do
     let(:hiera_config) { 'spec/fixtures/hiera.yaml' }
 
@@ -15,7 +15,7 @@
   end
 end
 
-describe 'hiera_test', if: Puppet::Util::Package.versioncmp(Puppet.version, '4.9.0') >= 0 do
+describe 'hiera_test' do
   before do
     RSpec.configuration.disable_module_hiera = false
     RSpec.configuration.use_fixture_spec_hiera = false
@@ -106,7 +106,7 @@
   end
 end
 
-describe 'hiera_test2', if: Puppet::Util::Package.versioncmp(Puppet.version, '4.9.0') >= 0 do
+describe 'hiera_test2' do
   before do
     RSpec.configuration.disable_module_hiera = false
     RSpec.configuration.use_fixture_spec_hiera = false