From c65c6765e249ea36947c20480b43534fdd2229eb Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Sun, 19 May 2024 22:36:57 +0200 Subject: [PATCH] Don't require rubocop/rspec/language/node_pattern The node_pattern file has been removed from rubocop-rspec, and we should no longer require it. Also, in rubocop-rspec v3 all the pending cops are now enabled by default. The `RSpec/FilePath` has been split and `RSpec/SpecFilePathFormat` can be configured to work instead. --- .rubocop.yml | 64 ++++---------------------------------- Gemfile | 2 +- lib/rubocop-rspec_rails.rb | 3 -- 3 files changed, 7 insertions(+), 62 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index cc9d7ca4..18bf3ecd 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -98,9 +98,6 @@ RSpec/ExampleLength: - heredoc Max: 11 -RSpec/FilePath: - Enabled: false - RSpec/DescribeClass: Exclude: - spec/project/**/*.rb @@ -108,6 +105,10 @@ RSpec/DescribeClass: RSpec/MultipleExpectations: Max: 2 +RSpec/SpecFilePathFormat: + CustomTransform: + RSpecRails: rspec_rails + Style/FormatStringToken: Exclude: - spec/rubocop/**/*.rb @@ -135,58 +136,5 @@ Style/ReturnNilInPredicateMethodDefinition: Enabled: true # Enable pending rubocop-rspec cops. - -RSpec/BeEmpty: - Enabled: true -RSpec/BeEq: - Enabled: true -RSpec/BeNil: - Enabled: true -RSpec/ChangeByZero: - Enabled: true -RSpec/ClassCheck: - Enabled: true -RSpec/ContainExactly: - Enabled: true -RSpec/DuplicatedMetadata: - Enabled: true -RSpec/EmptyMetadata: - Enabled: true -RSpec/Eq: - Enabled: true -RSpec/ExcessiveDocstringSpacing: - Enabled: true -RSpec/IdenticalEqualityAssertion: - Enabled: true -RSpec/IndexedLet: - Enabled: true -RSpec/IsExpectedSpecify: - Enabled: true -RSpec/MatchArray: - Enabled: true -RSpec/MetadataStyle: - Enabled: true -RSpec/NoExpectationExample: - Enabled: true -RSpec/PendingWithoutReason: - Enabled: true -RSpec/ReceiveMessages: - Enabled: true -RSpec/RedundantAround: - Enabled: true -RSpec/RedundantPredicateMatcher: - Enabled: true -RSpec/RemoveConst: - Enabled: true -RSpec/RepeatedSubjectCall: - Enabled: true -RSpec/SkipBlockInsideExample: - Enabled: true -RSpec/SortMetadata: - Enabled: true -RSpec/SpecFilePathSuffix: - Enabled: true -RSpec/SubjectDeclaration: - Enabled: true -RSpec/VerifiedDoubleReference: - Enabled: true +# +# No pending cops yet. diff --git a/Gemfile b/Gemfile index 57396ba7..d2cfe04b 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'simplecov', '>= 0.19' gem 'yard' # TODO: Move to gemspec when RuboCop RSpec v3 is released. -gem 'rubocop-rspec', '~> 2.27' +gem 'rubocop-rspec', '>= 3.0.0.pre' local_gemfile = 'Gemfile.local' eval_gemfile(local_gemfile) if File.exist?(local_gemfile) diff --git a/lib/rubocop-rspec_rails.rb b/lib/rubocop-rspec_rails.rb index 6b56a9f0..a818fc9f 100644 --- a/lib/rubocop-rspec_rails.rb +++ b/lib/rubocop-rspec_rails.rb @@ -4,9 +4,6 @@ require 'yaml' require 'rubocop' - -require 'rubocop/rspec/language/node_pattern' - require 'rubocop/rspec/language' require_relative 'rubocop/rspec_rails/version'