diff --git a/.rubocop.yml b/.rubocop.yml index 8dfa0311a9..9e4cc8bd49 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -57,21 +57,18 @@ Metrics/ModuleLength: Metrics/PerceivedComplexity: Max: 15 -RSpec/Capybara/FeatureMethods: - Enabled: false - RSpec/ExampleLength: Max: 60 RSpec/NestedGroups: Max: 6 -RSpec/FilePath: - SpecSuffixOnly: true - RSpec/SpecFilePathFormat: Enabled: false +RSpec/SpecFilePathSuffix: + Enabled: true + RSpec/MultipleExpectations: Enabled: false @@ -83,6 +80,3 @@ RSpec/MultipleMemoizedHelpers: RSpec/ContextWording: Enabled: false - -RSpecRails/HaveHttpStatus: - Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 74dd51f3c9..a3956b5bce 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2024-05-20 14:55:33 UTC using RuboCop version 1.63.2. +# on 2024-06-15 15:12:21 UTC using RuboCop version 1.64.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -197,6 +197,7 @@ RSpec/RepeatedExampleGroupDescription: # Offense count: 2 # This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AutoCorrect. RSpec/ScatteredSetup: Exclude: - 'spec/grape/util/inheritable_setting_spec.rb' @@ -296,6 +297,22 @@ Style/Semicolon: Exclude: - 'spec/grape/api_spec.rb' +# Offense count: 2 +# This cop supports safe autocorrection (--autocorrect). +Style/SuperArguments: + Exclude: + - 'lib/grape/api.rb' + - 'spec/support/deprecated_warning_handlers.rb' + +# Offense count: 2 +# This cop supports unsafe autocorrection (--autocorrect-all). +# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments. +# AllowedMethods: define_method +Style/SymbolProc: + Exclude: + - 'benchmark/large_model.rb' + - 'spec/grape/validations/params_scope_spec.rb' + # Offense count: 1 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b27d60b40..114d5762e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ #### Features +* [#2450](/~https://github.com/ruby-grape/grape/pull/2450): Update RuboCop to 1.64.1 - [@ericproulx](/~https://github.com/ericproulx). * Your contribution here. #### Fixes diff --git a/Gemfile b/Gemfile index 120567b698..eaf603c1d2 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,9 @@ group :development, :test do gem 'builder', require: false gem 'bundler' gem 'rake' - gem 'rubocop', '1.63.2', require: false + gem 'rubocop', '1.64.1', require: false gem 'rubocop-performance', '1.21.0', require: false - gem 'rubocop-rspec', '2.29.1', require: false + gem 'rubocop-rspec', '3.0.1', require: false end group :development do