Split RSpec/FilePath into RSpec/SpecFilePathSuffix and `RSpec/Spe…

…cFilePathFormat`
rubocop · Aug 25, 2023 · 21507cf · 21507cf
1 parent 456be2a
commit 21507cf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -112,7 +112,8 @@ Style/FormatStringToken:
 Style/RequireOrder:
   Enabled: true
 
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
+  Enabled: true
   Exclude:
     - spec/rubocop/cop/rspec/mixin/**/*.rb
 
@@ -163,6 +164,8 @@ RSpec/SkipBlockInsideExample:
   Enabled: true
 RSpec/SortMetadata:
   Enabled: true
+RSpec/SpecFilePathSuffix:
+  Enabled: true
 RSpec/SubjectDeclaration:
   Enabled: true
 RSpec/VerifiedDoubleReference:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,7 @@
 ## Master (Unreleased)
 
 - Fix an infinite loop error when `RSpec/ExcessiveDocstringSpacing` finds a description with non-ASCII leading/trailing whitespace. ([@bcgraham])
-- Add `RSpec/SpecFilePathSuffix` cop. ([@ydah])
-- Add `RSpec/SpecFilePathFormat` cop. ([@ydah])
+- Split `RSpec/FilePath` into `RSpec/SpecFilePathSuffix` and `RSpec/SpecFilePathFormat`. ([@ydah])
 
 ## 2.23.2 (2023-08-09)
 

diff --git a/config/default.yml b/config/default.yml
@@ -436,7 +436,7 @@ RSpec/ExpectOutput:
 
 RSpec/FilePath:
   Description: Checks that spec file paths are consistent and well-formed.
-  Enabled: true
+  Enabled: false
   Include:
     - "**/*_spec*rb*"
     - "**/spec/**/*"
@@ -446,7 +446,7 @@ RSpec/FilePath:
   IgnoreMethods: false
   SpecSuffixOnly: false
   VersionAdded: '1.2'
-  VersionChanged: '1.40'
+  VersionChanged: "<<next>>"
   Reference: https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FilePath
 
 RSpec/Focus:

diff --git a/config/obsoletion.yml b/config/obsoletion.yml
@@ -27,3 +27,9 @@ renamed:
   RSpec/FactoryBot/FactoryClassName: FactoryBot/FactoryClassName
   RSpec/FactoryBot/FactoryNameStyle: FactoryBot/FactoryNameStyle
   RSpec/FactoryBot/SyntaxMethods: FactoryBot/SyntaxMethods
+
+split:
+  RSpec/FilePath:
+    alternatives:
+      - RSpec/SpecFilePathFormat
+      - RSpec/SpecFilePathSuffix
diff --git a/docs/modules/ROOT/pages/cops_rspec.adoc b/docs/modules/ROOT/pages/cops_rspec.adoc
@@ -1943,11 +1943,11 @@ expect { my_app.print_report }.to output('Hello World').to_stdout
 |===
 | Enabled by default | Safe | Supports autocorrection | Version Added | Version Changed
 
-| Enabled
+| Disabled
 | Yes
 | No
 | 1.2
-| 1.40
+| <<next>>
 |===
 
 Checks that spec file paths are consistent and well-formed.