(CONT-792) - Correct Style/MixinUsage

puppetlabs · Apr 19, 2023 · 902cc7f · 902cc7f
1 parent b141749
commit 902cc7f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -160,13 +160,6 @@ Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/puppet/util/postgresql_validator.rb'
 
-
-# Offense count: 2
-Style/MixinUsage:
-  Exclude:
-    - 'spec/spec_helper.rb'
-    - 'spec/spec_helper_local.rb'
-
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -9,7 +9,7 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts
+include RspecPuppetFacts # rubocop:disable Style/MixinUsage
 
 default_facts = {
   puppetversion: Puppet.version,

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
@@ -101,7 +101,7 @@ def param(type, title, param)
 end
 
 # This duplicates spec_helper but we need it for add_custom_fact
-include RspecPuppetFacts
+include RspecPuppetFacts # rubocop:disable Style/MixinUsage
 # Rough conversion of grepping in the puppet source:
 # grep defaultfor lib/puppet/provider/service/*.rb
 # See https://github.com/voxpupuli/voxpupuli-test/blob/master/lib/voxpupuli/test/facts.rb