Merge pull request #369 from puppetlabs/maint_remove_deprecated_rubocops

(maint) - Removed soon-to-be deprecated RSpec/FilePath cops
puppetlabs · Oct 13, 2023 · a95ae94 · a95ae94
2 parents 4c7e9e5 + 650520c
commit a95ae94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -17,3 +17,11 @@ AllCops:
 # Disabled
 Style/ClassAndModuleChildren:
   Enabled: false
+
+####################################################
+# Cops below here due for deprecation
+####################################################
+# ``Rspec/FilePath`` is going to be deprecated in the next major release of rubocop >=3.0.0: see <https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FilePath>
+# As the new cops are already present, e.g., Rspec/SpecFilePathPathFormat, then disabling this in preparation
+RSpec/FilePath:
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -133,12 +133,6 @@ RSpec/ExpectInHook:
   Exclude:
     - 'spec/unit/puppet-strings/json_spec.rb'
 
-# Offense count: 20
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Enabled: false
-
 # Offense count: 91
 RSpec/MultipleExpectations:
   Max: 64