Merge pull request #73 from puppetlabs/CAT-1226-address_outdated_code

(CAT-1226) - Remove Compatibility for Puppet 7.11 and below

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
           - ruby-version: '2.7'
             puppet_gem_version: '~> 7.0'
           - ruby_version: '3.2'
-            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
+            puppet_gem_version: '~> 8.0'
         runs_on:
           - "ubuntu-latest"
           - "windows-latest"

.github/workflows/nightly.yml

@@ -17,7 +17,7 @@ jobs:
           - ruby-version: '2.7'
             puppet_gem_version: '~> 7.0'
           - ruby_version: '3.2'
-            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
+            puppet_gem_version: '~> 8.0'
         runs_on:
           - "ubuntu-latest"
           - "windows-latest"

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-09-29 10:39:55 UTC using RuboCop version 1.56.4.
+# on 2023-10-03 14:14:01 UTC using RuboCop version 1.56.4.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,6 +13,11 @@ Lint/DuplicateBranch:
     - 'lib/rspec-puppet/matchers/compile.rb'
     - 'lib/rspec-puppet/matchers/run.rb'
 
+# Offense count: 1
+Lint/DuplicateMethods:
+  Exclude:
+    - 'lib/rspec-puppet/adapters.rb'
+
 # Offense count: 2
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@@ -59,48 +64,48 @@ Lint/UselessAssignment:
     - 'lib/rspec-puppet/matchers/create_generic.rb'
     - 'lib/rspec-puppet/monkey_patches.rb'
 
-# Offense count: 29
+# Offense count: 27
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 47
+  Max: 59
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 111
 
-# Offense count: 3
+# Offense count: 1
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 297
 
-# Offense count: 19
+# Offense count: 18
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 18
 
-# Offense count: 53
+# Offense count: 47
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 37
+  Max: 53
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 422
+  Max: 383
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 14
+# Offense count: 13
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 20
@@ -181,7 +186,7 @@ RSpec/BeforeAfterAll:
     - '**/spec/support/**/*.rb'
     - 'spec/unit/coverage_spec.rb'
 
-# Offense count: 76
+# Offense count: 74
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -192,31 +197,16 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 25
+# Offense count: 23
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 12
 
-# Offense count: 15
+# Offense count: 16
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
-  Exclude:
-    - 'spec/cache_spec.rb'
-    - 'spec/classes/test_multi_os.rb'
-    - 'spec/raw_string_spec.rb'
-    - 'spec/support_spec.rb'
-    - 'spec/unit/coverage_spec.rb'
-    - 'spec/unit/example/function_example_group_spec.rb'
-    - 'spec/unit/facter_impl_spec.rb'
-    - 'spec/unit/matchers/allow_value_spec.rb'
-    - 'spec/unit/matchers/count_generic_spec.rb'
-    - 'spec/unit/matchers/parameter_matcher_spec.rb'
-    - 'spec/unit/matchers/raise_error_spec.rb'
-    - 'spec/unit/matchers/run_spec.rb'
-    - 'spec/unit/monkey_patches/win32/taskscheduler_spec.rb'
-    - 'spec/unit/raw_string_spec.rb'
-    - 'spec/unit/sensitive_spec.rb'
+  Enabled: false
 
 # Offense count: 2
 RSpec/ImplicitBlockExpectation:
@@ -234,7 +224,7 @@ RSpec/InstanceVariable:
     - 'spec/types/cleanup_spec.rb'
     - 'spec/unit/coverage_spec.rb'
 
-# Offense count: 11
+# Offense count: 10
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -248,10 +238,10 @@ RSpec/MultipleDescribes:
     - 'spec/classes/sysctl_common_spec.rb'
     - 'spec/defines/sysctl_before_spec.rb'
     - 'spec/functions/test_function_spec.rb'
-    - 'spec/unit/adapters_spec.rb'
+    - 'spec/unit/example/function_example_group_spec.rb'
     - 'spec/unit/monkey_patches_spec.rb'
 
-# Offense count: 46
+# Offense count: 45
 RSpec/MultipleExpectations:
   Max: 8
 
@@ -260,13 +250,13 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 7
 
-# Offense count: 284
+# Offense count: 263
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 20
+# Offense count: 26
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
@@ -291,14 +281,15 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/types/valid_provider_spec.rb'
 
-# Offense count: 7
+# Offense count: 9
 RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/classes/facts_spec.rb'
     - 'spec/classes/sysctl_common_spec.rb'
     - 'spec/defines/sysctl_before_spec.rb'
+    - 'spec/unit/adapters_spec.rb'
 
-# Offense count: 14
+# Offense count: 15
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
@@ -307,10 +298,11 @@ RSpec/SpecFilePathFormat:
     - 'spec/cache_spec.rb'
     - 'spec/raw_string_spec.rb'
     - 'spec/support_spec.rb'
+    - 'spec/unit/adapters_spec.rb'
     - 'spec/unit/coverage_spec.rb'
-    - 'spec/unit/example/function_example_group_spec.rb'
     - 'spec/unit/facter_impl_spec.rb'
     - 'spec/unit/matchers/allow_value_spec.rb'
+    - 'spec/unit/matchers/compile_spec.rb'
     - 'spec/unit/matchers/count_generic_spec.rb'
     - 'spec/unit/matchers/parameter_matcher_spec.rb'
     - 'spec/unit/matchers/raise_error_spec.rb'
@@ -326,22 +318,15 @@ RSpec/SpecFilePathSuffix:
   Exclude:
     - 'spec/classes/test_multi_os.rb'
 
-# Offense count: 3
+# Offense count: 2
 RSpec/SubjectStub:
   Exclude:
-    - 'spec/unit/adapters_spec.rb'
     - 'spec/unit/coverage_spec.rb'
 
-# Offense count: 1
-RSpec/UnspecifiedException:
-  Exclude:
-    - 'spec/support_spec.rb'
-
-# Offense count: 16
+# Offense count: 7
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
-    - 'spec/spec_helper_unit.rb'
     - 'spec/unit/adapters_spec.rb'
     - 'spec/unit/example/function_example_group_spec.rb'
     - 'spec/unit/matchers/allow_value_spec.rb'
@@ -365,7 +350,7 @@ Style/CombinableLoops:
   Exclude:
     - 'spec/classes/catalogue_cache_spec.rb'
 
-# Offense count: 65
+# Offense count: 55
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -378,15 +363,14 @@ Style/FormatString:
   Exclude:
     - 'lib/rspec-puppet/coverage.rb'
 
-# Offense count: 15
+# Offense count: 14
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/rspec-puppet/adapters.rb'
     - 'lib/rspec-puppet/coverage.rb'
     - 'lib/rspec-puppet/example/function_example_group.rb'
     - 'lib/rspec-puppet/matchers/create_generic.rb'
-    - 'lib/rspec-puppet/monkey_patches.rb'
     - 'lib/rspec-puppet/support.rb'
 
 # Offense count: 5
@@ -424,7 +408,7 @@ Style/StringConcatenation:
     - 'lib/rspec-puppet/matchers/compile.rb'
     - 'lib/rspec-puppet/support.rb'
 
-# Offense count: 28
+# Offense count: 25
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https