Remove RuboCop::RSpec::Language::NodePattern

ydah · ydah · commit 904f2634a941 · 2024-03-30T02:14:47.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## 2.28.0 (2024-03-30)
 
+- Remove `RuboCop::RSpec::Language::NodePattern`. ([@ydah])
+
+## 2.28.0 (2024-03-30)
+
 - Extract RSpec Rails cops to a separate repository, [`rubocop-rspec_rails`](https://github.com/rubocop/rubocop-rspec_rails). The `rubocop-rspec_rails` repository is a dependency of `rubocop-rspec` and the cops related to rspec-rails are aliased (`RSpec/Rails/Foo` == `RSpecRails/Foo`) until v3.0 is released, so the change will be invisible to users until then. ([@ydah])
 
 ## 2.27.1 (2024-03-03)
diff --git a/lib/rubocop-rspec.rb b/lib/rubocop-rspec.rb
@@ -9,14 +9,11 @@
 
 require_relative 'rubocop/rspec'
 require_relative 'rubocop/rspec/inject'
-require_relative 'rubocop/rspec/language/node_pattern'
+require_relative 'rubocop/rspec/language'
 require_relative 'rubocop/rspec/node'
 require_relative 'rubocop/rspec/version'
 require_relative 'rubocop/rspec/wording'
 
-# Dependent on `RuboCop::RSpec::Language::NodePattern`.
-require_relative 'rubocop/rspec/language'
-
 require_relative 'rubocop/cop/rspec/mixin/file_help'
 require_relative 'rubocop/cop/rspec/mixin/final_end_location'
 require_relative 'rubocop/cop/rspec/mixin/inside_example_group'
diff --git a/lib/rubocop/cop/rspec/base.rb b/lib/rubocop/cop/rspec/base.rb
@@ -6,7 +6,6 @@ module RSpec
       # @abstract parent class to RSpec cops
       class Base < ::RuboCop::Cop::Base
         include RuboCop::RSpec::Language
-        extend RuboCop::RSpec::Language::NodePattern
 
         exclude_from_registry
 
diff --git a/lib/rubocop/cop/rspec/remove_const.rb b/lib/rubocop/cop/rspec/remove_const.rb
@@ -17,7 +17,6 @@ module RSpec
       #
       class RemoveConst < Base
         include RuboCop::RSpec::Language
-        extend RuboCop::RSpec::Language::NodePattern
 
         MSG = 'Do not use remove_const in specs. ' \
               'Consider using e.g. `stub_const`.'
diff --git a/lib/rubocop/rspec/concept.rb b/lib/rubocop/rspec/concept.rb
@@ -5,7 +5,6 @@ module RSpec
     # Wrapper for RSpec DSL methods
     class Concept
       extend RuboCop::NodePattern::Macros
-      extend Language::NodePattern
       include Language
 
       def initialize(node)
diff --git a/lib/rubocop/rspec/language.rb b/lib/rubocop/rspec/language.rb
@@ -13,7 +13,6 @@ module RSpec
     # using the configured aliases.
     module Language
       extend RuboCop::NodePattern::Macros
-      extend NodePattern
 
       class << self
         attr_accessor :config
diff --git a/lib/rubocop/rspec/language/node_pattern.rb b/lib/rubocop/rspec/language/node_pattern.rb

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ module RSpec`
`17`	`17`	`#`
`18`	`18`	`class RemoveConst < Base`
`19`	`19`	`include RuboCop::RSpec::Language`
`20`		`- extend RuboCop::RSpec::Language::NodePattern`
`21`	`20`
`22`	`21`	`MSG = 'Do not use remove_const in specs. ' \`
`23`	`22`	'Consider using e.g. `stub_const`.'