diff --git a/.rubocop.yml b/.rubocop.yml index a2791b457..e3306ee3d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ require: rubocop-rails AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 NewCops: enable Exclude: - "bin/**/*" @@ -39,7 +39,7 @@ Metrics/PerceivedComplexity: # Some blocks are longer. Metrics/BlockLength: - ExcludedMethods: + AllowedMethods: - "namespace" - "create_table" Exclude: @@ -168,6 +168,11 @@ Style/Documentation: Naming/BinaryOperatorParameterName: Enabled: false +# Defining constants in tests is fine, and it's good to have them close to the test where they are used. +Lint/ConstantDefinitionInBlock: + Exclude: + - "spec/**/*" + # There are valid cases, for example debugging Cucumber steps, # also they'll fail CI anyway Lint/Debugger: diff --git a/Gemfile b/Gemfile index 2ac7c5ea8..8e8726197 100644 --- a/Gemfile +++ b/Gemfile @@ -204,8 +204,8 @@ group :development do gem "pronto-haml", "0.11.1", require: false gem "pronto-rubocop", "0.11.5", require: false gem "pronto-scss", "0.11.0", require: false - gem "rubocop", "0.93.1", require: false - gem "rubocop-rails", "2.9.1", require: false + gem "rubocop", "1.53.1", require: false + gem "rubocop-rails", "2.20.2", require: false # Debugging gem "pry" diff --git a/Gemfile.lock b/Gemfile.lock index a525ee721..d0d4a17bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,6 +396,7 @@ GEM multi_json jwt (2.7.1) kostya-sigar (2.0.10) + language_server-protocol (3.17.0.3) leaflet-rails (1.9.3) rails (>= 4.2.0) listen (3.7.1) @@ -635,21 +636,23 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.11.0) - rubocop (0.93.1) + rubocop (1.53.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) + unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-rails (2.9.1) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) ruby-oembed (0.16.1) ruby-progressbar (1.13.0) ruby-vips (2.1.4) @@ -751,7 +754,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.4.2) uuid (2.3.9) macaddr (~> 1.0) valid (1.2.0) @@ -878,8 +881,8 @@ DEPENDENCIES rqrcode (= 2.2.0) rspec-json_expectations (~> 2.1) rspec-rails (= 5.1.2) - rubocop (= 0.93.1) - rubocop-rails (= 2.9.1) + rubocop (= 1.53.1) + rubocop-rails (= 2.20.2) ruby-oembed (= 0.16.1) rubyzip (= 2.3.2) sassc-rails (= 2.1.2)