Remove RuboCop::RSpec::Language::NodePattern

rubocop · May 3, 2024 · d841fe4 · d841fe4
1 parent b5b8a7f
commit d841fe4
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Master (Unreleased)
 
 - Remove extracted cops in `Capybara`, `FactoryBot` and `Rails` departments. ([@ydah])
+- Remove `RuboCop::RSpec::Language::NodePattern`. ([@ydah])
 
 ## 2.29.2 (2024-05-02)
 

diff --git a/lib/rubocop-rspec.rb b/lib/rubocop-rspec.rb
@@ -7,14 +7,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