diff options
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index f4bd7913b47..f42d7c7b076 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,12 +13,6 @@ inherit_from: <% end %> - '.rubocop_todo.yml' <% end %> - <% if RUBY_VERSION[/^\d+\.\d+/, 0] == '2.7' %> - - ./rubocop/rubocop-ruby27.yml - <% end %> - <% if RUBY_VERSION[/^\d+\.\d+/, 0] == '3.0' %> - - ./rubocop/rubocop-ruby30.yml - <% end %> <% if RUBY_VERSION[/^\d+\.\d+/, 0] == '3.1' %> - ./rubocop/rubocop-ruby31.yml <% end %> @@ -36,9 +30,9 @@ inherit_mode: - AllowedPatterns AllCops: - # Target the current Ruby version. For example, "2.7" or "3.0". + # Target the current Ruby version. For example, "3.0" or "3.1". TargetRubyVersion: <%= RUBY_VERSION[/^\d+\.\d+/, 0] %> - TargetRailsVersion: 6.0 + TargetRailsVersion: 7.0 Exclude: - 'gems/**/*' - 'vendor/**/*' @@ -112,9 +106,6 @@ Layout/LineLength: - 'ee/spec/controllers/concerns/routable_actions_spec.rb' - 'ee/spec/lib/gitlab/auth/group_saml/sso_enforcer_spec.rb' -Lint/LastKeywordArgument: - Safe: false - Lint/Debugger: DebuggerMethods: PryShell: @@ -166,6 +157,11 @@ RSpec/MultipleMemoizedHelpers: Max: 25 AllowSubject: true +Capybara/TestidFinders: + Include: + - 'spec/features/**/*' + - 'ee/spec/features/**/*' + Naming/FileName: ExpectMatchingDefinition: true CheckDefinitionPathHierarchy: false @@ -527,6 +523,8 @@ Naming/RescuedExceptionsVariableName: RSpec/AvoidTestProf: Include: + - 'spec/tasks/**/*.rb' + - 'ee/spec/tasks/**/*.rb' - 'spec/migrations/**/*.rb' - 'ee/spec/migrations/**/*.rb' - 'spec/lib/gitlab/background_migration/**/*.rb' @@ -581,6 +579,8 @@ RSpec/BeforeAll: - 'ee/spec/**/*.rb' # Conflict with RSpec/AvoidTestProf Exclude: + - 'spec/tasks/**/*.rb' + - 'ee/spec/tasks/**/*.rb' - 'spec/migrations/**/*.rb' - 'ee/spec/migrations/**/*.rb' - 'spec/lib/gitlab/background_migration/**/*.rb' |