rubocop-rails 2.31.0 → 2.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4876948bedd432dc186a3c060c26c3808f1c7126b8fe69072e056a5f160d94
-  data.tar.gz: 7f890ec180a125abe4a40ad146661e71c088596eb093eacf12d322135c7f6907
+  metadata.gz: e4946e79ccf9661248df014d69703665df3b0a72aa800e8c456afc59594ad944
+  data.tar.gz: 7575ea946eb4e6985d6c0c365a0f39345fc6d32b0634c74949526f987d1ac38d
 SHA512:
-  metadata.gz: 719fd043fd8ae7738eebb0c78abba01a23f2bc30c6d8c9825c89c7cbcc6cd48fd0077918e9bc84c9c471afecd62b69597d3f046c757606ecaec4af9daf8ef183
-  data.tar.gz: b7173eeaf159ee8673fe2f2c16a1c92bcbb55601d1202db18e5b48d09d1d1ef0207c17a182dcfb2b39c6e686d2b82871b191d5f90c4416a1af7d7b038a12c218
+  metadata.gz: 7a660eb16537b1dafe092cb100229fd9f039f8d98b51e1408b9438997176c8fc0fde61494ae462bfa8ea15e65524f5ec99e4d2efac42d0461395da65bfe8cb8b
+  data.tar.gz: ad601bb6b3296dceb196159604975b5e2efecaca5c66f715523368344f8a77e62d93cf8e22c4b3d53ce67d849a34cf9a1f4d184d6b655ecea0f12da23490bb35

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-25 Bozhidar Batsov
+Copyright (c) 2012-26 Bozhidar Batsov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/config/default.yml

@@ -6,7 +6,7 @@ inherit_mode:
 
 AllCops:
   Exclude:
-    - app/assets/**/*
+    - '**/app/assets/**/*'
     - bin/*
     # Exclude db/schema.rb and db/[CONFIGURATION_NAMESPACE]_schema.rb by default.
     # See: https://guides.rubyonrails.org/active_record_multiple_databases.html#setting-up-your-application
@@ -91,6 +91,12 @@ Lint/UselessAccessModifier:
     - concern
     - concerning
 
+Lint/UselessMethodDefinition:
+  # Avoids conflict with `Rails/LexicallyScopedActionFilter` cop.
+  Exclude:
+    - '**/app/controllers/**/*.rb'
+    - '**/app/mailers/**/*.rb'
+
 Rails:
   Enabled: true
   DocumentationBaseURL: https://docs.rubocop.org/rubocop-rails
@@ -121,8 +127,8 @@ Rails/ActionFilter:
     - action
     - filter
   Include:
-    - app/controllers/**/*.rb
-    - app/mailers/**/*.rb
+    - '**/app/controllers/**/*.rb'
+    - '**/app/mailers/**/*.rb'
 
 Rails/ActionOrder:
   Description: 'Enforce consistent ordering of controller actions.'
@@ -137,7 +143,7 @@ Rails/ActionOrder:
     - update
     - destroy
   Include:
-    - app/controllers/**/*.rb
+    - '**/app/controllers/**/*.rb'
 
 Rails/ActiveRecordAliases:
   Description: >-
@@ -154,7 +160,7 @@ Rails/ActiveRecordCallbacksOrder:
   Enabled: 'pending'
   VersionAdded: '2.7'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/ActiveRecordOverride:
   Description: >-
@@ -165,7 +171,7 @@ Rails/ActiveRecordOverride:
   VersionAdded: '0.67'
   VersionChanged: '2.18'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/ActiveSupportAliases:
   Description: >-
@@ -252,7 +258,7 @@ Rails/AttributeDefaultBlockValue:
   Enabled: pending
   VersionAdded: '2.9'
   Include:
-    - 'app/models/**/*'
+    - '**/app/models/**/*'
 
 Rails/BelongsTo:
   Description: >-
@@ -311,8 +317,8 @@ Rails/ContentTag:
   # https://puma.io/puma/Puma/DSL.html#tag-instance_method
   # No helpers are used in normal models and configs.
   Exclude:
-    - app/models/**/*.rb
-    - config/**/*.rb
+    - '**/app/models/**/*.rb'
+    - '**/config/**/*.rb'
 
 Rails/CreateTableWithTimestamps:
   Description: >-
@@ -373,7 +379,7 @@ Rails/Delegate:
   # violation. When set to false, this case is legal.
   EnforceForPrefixed: true
   Exclude:
-    - app/controllers/**/*.rb
+    - '**/app/controllers/**/*.rb'
 
 Rails/DelegateAllowBlank:
   Description: 'Do not use allow_blank as an option to delegate.'
@@ -402,7 +408,7 @@ Rails/DuplicateAssociation:
   VersionChanged: '2.18'
 
 Rails/DuplicateScope:
-  Description: 'Multiple scopes share this same where clause.'
+  Description: 'Multiple scopes share this same expression.'
   Enabled: pending
   Severity: warning
   VersionAdded: '2.14'
@@ -444,7 +450,7 @@ Rails/EnumHash:
   Enabled: true
   VersionAdded: '2.3'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/EnumSyntax:
   Description: 'Use positional arguments over keyword arguments when defining enums.'
@@ -452,14 +458,20 @@ Rails/EnumSyntax:
   Severity: warning
   VersionAdded: '2.26'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
+    - '**/lib/**/*.rb'
 
 Rails/EnumUniqueness:
   Description: 'Avoid duplicate integers in hash-syntax `enum` declaration.'
   Enabled: true
   VersionAdded: '0.46'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
+
+Rails/Env:
+  Description: 'Use Feature Flags or config instead of `Rails.env`.'
+  Enabled: false
+  VersionAdded: '2.34'
 
 Rails/EnvLocal:
   Description: 'Use `Rails.env.local?` instead of `Rails.env.development? || Rails.env.test?`.'
@@ -478,11 +490,11 @@ Rails/EnvironmentVariableAccess:
   VersionAdded: '2.10'
   VersionChanged: '2.24'
   Include:
-    - app/**/*.rb
-    - config/initializers/**/*.rb
-    - lib/**/*.rb
+    - '**/app/**/*.rb'
+    - '**/config/initializers/**/*.rb'
+    - '**/lib/**/*.rb'
   Exclude:
-    - lib/**/*.rake
+    - '**/lib/**/*.rake'
   AllowReads: false
   AllowWrites: false
 
@@ -494,11 +506,11 @@ Rails/Exit:
   Enabled: true
   VersionAdded: '0.41'
   Include:
-    - app/**/*.rb
-    - config/**/*.rb
-    - lib/**/*.rb
+    - '**/app/**/*.rb'
+    - '**/config/**/*.rb'
+    - '**/lib/**/*.rb'
   Exclude:
-    - lib/**/*.rake
+    - '**/lib/**/*.rake'
 
 Rails/ExpandedDateRange:
   Description: 'Checks for expanded date range.'
@@ -532,6 +544,13 @@ Rails/FindById:
   Enabled: 'pending'
   VersionAdded: '2.7'
 
+Rails/FindByOrAssignmentMemoization:
+  Description: 'Avoid memoizing `find_by` results with `||=`.'
+  StyleGuide: 'https://rails.rubystyle.guide/#find-by-memoization'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '2.33'
+
 Rails/FindEach:
   Description: 'Prefer all.find_each over all.each.'
   StyleGuide: 'https://rails.rubystyle.guide#find-each'
@@ -560,7 +579,7 @@ Rails/HasAndBelongsToMany:
   Enabled: true
   VersionAdded: '0.12'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/HasManyOrHasOneDependent:
   Description: 'Define the dependent option to the has_many and has_one associations.'
@@ -568,22 +587,22 @@ Rails/HasManyOrHasOneDependent:
   Enabled: true
   VersionAdded: '0.50'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/HelperInstanceVariable:
   Description: 'Do not use instance variables in helpers.'
   Enabled: true
   VersionAdded: '2.0'
   Include:
-    - app/helpers/**/*.rb
+    - '**/app/helpers/**/*.rb'
 
 Rails/HttpPositionalArguments:
   Description: 'Use keyword arguments instead of positional arguments in http method calls.'
   Enabled: true
   VersionAdded: '0.44'
   Include:
-    - 'spec/**/*'
-    - 'test/**/*'
+    - '**/spec/**/*'
+    - '**/test/**/*'
 
 Rails/HttpStatus:
   Description: 'Enforces use of symbolic or numeric value to define HTTP status.'
@@ -595,6 +614,14 @@ Rails/HttpStatus:
     - numeric
     - symbolic
 
+Rails/HttpStatusNameConsistency:
+  Description: 'Enforces consistency by using the current HTTP status names.'
+  Enabled: pending
+  Severity: warning
+  VersionAdded: '2.34'
+  Include:
+    - '**/app/controllers/**/*.rb'
+
 Rails/I18nLazyLookup:
   Description: 'Checks for places where I18n "lazy" lookup can be used.'
   StyleGuide: 'https://rails.rubystyle.guide/#lazy-lookup'
@@ -606,15 +633,15 @@ Rails/I18nLazyLookup:
     - lazy
     - explicit
   Include:
-    - 'app/controllers/**/*.rb'
+    - '**/app/controllers/**/*.rb'
 
 Rails/I18nLocaleAssignment:
   Description: 'Prefer the usage of `I18n.with_locale` instead of manually updating `I18n.locale` value.'
   Enabled: 'pending'
   VersionAdded: '2.11'
   Include:
-    - spec/**/*.rb
-    - test/**/*.rb
+    - '**/spec/**/*.rb'
+    - '**/test/**/*.rb'
 
 Rails/I18nLocaleTexts:
   Description: 'Enforces use of I18n and locale files instead of locale specific strings.'
@@ -635,8 +662,8 @@ Rails/IgnoredSkipActionFilterOption:
   Enabled: true
   VersionAdded: '0.63'
   Include:
-    - app/controllers/**/*.rb
-    - app/mailers/**/*.rb
+    - '**/app/controllers/**/*.rb'
+    - '**/app/mailers/**/*.rb'
 
 Rails/IndexBy:
   Description: 'Prefer `index_by` over `each_with_object`, `to_h`, or `map`.'
@@ -647,8 +674,9 @@ Rails/IndexBy:
 Rails/IndexWith:
   Description: 'Prefer `index_with` over `each_with_object`, `to_h`, or `map`.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '2.5'
-  VersionChanged: '2.8'
+  VersionChanged: '2.33'
 
 Rails/Inquiry:
   Description: "Prefer Ruby's comparison operators over Active Support's `Array#inquiry` and `String#inquiry`."
@@ -665,7 +693,7 @@ Rails/InverseOf:
   VersionAdded: '0.52'
   IgnoreScopes: false
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/LexicallyScopedActionFilter:
   Description: "Checks that methods specified in the filter's `only` or `except` options are explicitly defined in the class."
@@ -674,8 +702,8 @@ Rails/LexicallyScopedActionFilter:
   Safe: false
   VersionAdded: '0.52'
   Include:
-    - app/controllers/**/*.rb
-    - app/mailers/**/*.rb
+    - '**/app/controllers/**/*.rb'
+    - '**/app/mailers/**/*.rb'
 
 Rails/LinkToBlank:
   Description: 'Checks that `link_to` with a `target: "_blank"` have a `rel: "noopener"` option passed to them.'
@@ -693,7 +721,7 @@ Rails/MailerName:
   SafeAutoCorrect: false
   VersionAdded: '2.7'
   Include:
-    - app/mailers/**/*.rb
+    - '**/app/mailers/**/*.rb'
 
 Rails/MatchRoute:
   Description: >-
@@ -703,8 +731,8 @@ Rails/MatchRoute:
   Enabled: 'pending'
   VersionAdded: '2.7'
   Include:
-    - config/routes.rb
-    - config/routes/**/*.rb
+    - '**/config/routes.rb'
+    - '**/config/routes/**/*.rb'
 
 Rails/MigrationClassName:
   Description: 'The class name of the migration should match its file name.'
@@ -720,8 +748,8 @@ Rails/MultipleRoutePaths:
   Severity: warning
   VersionAdded: '2.29'
   Include:
-    - config/routes.rb
-    - config/routes/**/*.rb
+    - '**/config/routes.rb'
+    - '**/config/routes/**/*.rb'
 
 Rails/NegateInclude:
   Description: 'Prefer `collection.exclude?(obj)` over `!collection.include?(obj)`.'
@@ -742,6 +770,13 @@ Rails/NotNullColumn:
   Include:
     - db/**/*.rb
 
+Rails/OrderArguments:
+  Description: 'Prefer symbol arguments over strings in `order` method.'
+  StyleGuide: 'https://rails.rubystyle.guide/#order-arguments'
+  Enabled: pending
+  VersionAdded: '2.33'
+  Safe: false
+
 Rails/OrderById:
   Description: >-
                   Do not use the `id` column for ordering.
@@ -757,10 +792,10 @@ Rails/Output:
   VersionAdded: '0.15'
   VersionChanged: '0.19'
   Include:
-    - app/**/*.rb
-    - config/**/*.rb
+    - '**/app/**/*.rb'
+    - '**/config/**/*.rb'
     - db/**/*.rb
-    - lib/**/*.rb
+    - '**/lib/**/*.rb'
 
 Rails/OutputSafety:
   Description: 'The use of `html_safe` or `raw` may be a security risk.'
@@ -809,6 +844,7 @@ Rails/Presence:
   Description: 'Checks code that can be written more easily using `Object#presence` defined by Active Support.'
   Enabled: true
   VersionAdded: '0.52'
+  VersionChanged: '2.34'
 
 Rails/Present:
   Description: 'Enforces use of `present?`.'
@@ -832,7 +868,7 @@ Rails/RakeEnvironment:
     - '**/Rakefile'
     - '**/*.rake'
   Exclude:
-    - 'lib/capistrano/tasks/**/*.rake'
+    - '**/lib/capistrano/tasks/**/*.rake'
 
 Rails/ReadWriteAttribute:
   Description: >-
@@ -843,7 +879,15 @@ Rails/ReadWriteAttribute:
   VersionAdded: '0.20'
   VersionChanged: '0.29'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
+
+Rails/RedirectBackOrTo:
+  Description: >-
+                  Use `redirect_back_or_to` instead of `redirect_back` with
+                  `fallback_location` option.
+  Enabled: pending
+  Severity: warning
+  VersionAdded: '2.34'
 
 Rails/RedundantActiveRecordAllMethod:
   Description: Detect redundant `all` used as a receiver for Active Record query methods.
@@ -862,7 +906,7 @@ Rails/RedundantAllowNil:
   Enabled: true
   VersionAdded: '0.67'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/RedundantForeignKey:
   Description: 'Checks for associations where the `:foreign_key` option is redundant.'
@@ -885,8 +929,8 @@ Rails/RedundantTravelBack:
   Enabled: pending
   VersionAdded: '2.12'
   Include:
-    - spec/**/*.rb
-    - test/**/*.rb
+    - '**/spec/**/*.rb'
+    - '**/test/**/*.rb'
 
 Rails/ReflectionClassName:
   Description: 'Use a string for `class_name` option value in the definition of a reflection.'
@@ -949,10 +993,10 @@ Rails/ResponseParsedBody:
   VersionAdded: '2.18'
   VersionChanged: '2.19'
   Include:
-    - spec/controllers/**/*.rb
-    - spec/requests/**/*.rb
-    - test/controllers/**/*.rb
-    - test/integration/**/*.rb
+    - '**/spec/controllers/**/*.rb'
+    - '**/spec/requests/**/*.rb'
+    - '**/test/controllers/**/*.rb'
+    - '**/test/integration/**/*.rb'
 
 Rails/ReversibleMigration:
   Description: 'Checks whether the change method of the migration file is reversible.'
@@ -1033,7 +1077,7 @@ Rails/ScopeArgs:
   VersionAdded: '0.19'
   VersionChanged: '2.12'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/SelectMap:
   Description: 'Checks for uses of `select(:column_name)` with `map(&:column_name)`.'
@@ -1102,7 +1146,7 @@ Rails/StrongParametersExpect:
   Reference: 'https://api.rubyonrails.org/classes/ActionController/Parameters.html#method-i-expect'
   Enabled: pending
   Include:
-    - app/controllers/**/*.rb
+    - '**/app/controllers/**/*.rb'
   SafeAutoCorrect: false
   VersionAdded: '2.29'
 
@@ -1113,7 +1157,7 @@ Rails/TableNameAssignment:
   Enabled: false
   VersionAdded: '2.14'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/ThreeStateBooleanColumn:
   Description: 'Add a default value and a `NOT NULL` constraint to boolean columns.'
@@ -1126,7 +1170,7 @@ Rails/ThreeStateBooleanColumn:
 Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
   StyleGuide: 'https://rails.rubystyle.guide#time'
-  Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
+  Reference: 'https://danilenko.org/2012/7/6/rails_timezones'
   Enabled: true
   SafeAutoCorrect: false
   VersionAdded: '0.30'
@@ -1146,8 +1190,8 @@ Rails/TimeZoneAssignment:
   Enabled: 'pending'
   VersionAdded: '2.10'
   Include:
-    - spec/**/*.rb
-    - test/**/*.rb
+    - '**/spec/**/*.rb'
+    - '**/test/**/*.rb'
 
 Rails/ToFormattedS:
   Description: 'Checks for consistent uses of `to_fs` or `to_formatted_s`.'
@@ -1197,7 +1241,7 @@ Rails/UniqueValidationWithoutIndex:
   Enabled: true
   VersionAdded: '2.5'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/UnknownEnv:
   Description: 'Use correct environment name.'
@@ -1216,7 +1260,7 @@ Rails/UnusedIgnoredColumns:
   VersionAdded: '2.11'
   VersionChanged: '2.25'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/UnusedRenderContent:
   Description: 'Do not specify body content for a response with a non-content status code.'
@@ -1230,7 +1274,7 @@ Rails/Validation:
   VersionAdded: '0.9'
   VersionChanged: '0.41'
   Include:
-    - app/models/**/*.rb
+    - '**/app/models/**/*.rb'
 
 Rails/WhereEquals:
   Description: 'Pass conditions to `where` and `where.not` as a hash instead of manually constructing SQL.'

data/lib/rubocop/cop/mixin/active_record_helper.rb

@@ -106,7 +106,7 @@ module RuboCop
         send_node = node.each_ancestor(:call).first
         return false unless send_node
 
-        return true if WHERE_METHODS.include?(send_node.method_name)
+        return true if WHERE_METHODS.include?(send_node.method_name) && send_node.receiver != node
 
         receiver = send_node.receiver
         return false unless receiver&.send_type?

data/lib/rubocop/cop/mixin/database_type_resolvable.rb

@@ -40,7 +40,7 @@ module RuboCop
         end
       end
 
-      def database_yaml
+      def database_yaml(environment = 'development')
         return unless File.exist?('config/database.yml')
 
         yaml = if YAML.respond_to?(:unsafe_load_file)
@@ -50,7 +50,7 @@ module RuboCop
                end
         return unless yaml.is_a? Hash
 
-        config = yaml['development']
+        config = yaml[environment]
         return unless config.is_a?(Hash)
 
         config
@@ -59,7 +59,7 @@ module RuboCop
       end
 
       def database_adapter
-        database_yaml['adapter'] || database_yaml.first.last['adapter']
+        database_yaml['adapter'] || database_yaml('shared')&.dig('adapter') || database_yaml.first.last['adapter']
       end
     end
   end

data/lib/rubocop/cop/mixin/index_method.rb

@@ -132,9 +132,13 @@ module RuboCop
         add_offense(
           node, message: "Prefer `#{new_method_name}` over `#{match_desc}`."
         ) do |corrector|
+          next if part_of_ignored_node?(node)
+
           correction = prepare_correction(node)
           execute_correction(corrector, node, correction)
         end
+
+        ignore_node(node)
       end
 
       def extract_captures(match)

data/lib/rubocop/cop/mixin/target_rails_version.rb

@@ -12,29 +12,19 @@ module RuboCop
       TARGET_GEM_NAME = 'railties' # :nodoc:
 
       def minimum_target_rails_version(version)
-        if respond_to?(:requires_gem)
-          case version
-          when Integer, Float then requires_gem(TARGET_GEM_NAME, ">= #{version}")
-          when String then requires_gem(TARGET_GEM_NAME, version)
-          end
-        else
-          # Fallback path for previous versions of RuboCop which don't support the `requires_gem` API yet.
-          @minimum_target_rails_version = version
+        case version
+        when Integer, Float then requires_gem(TARGET_GEM_NAME, ">= #{version}")
+        when String then requires_gem(TARGET_GEM_NAME, version)
         end
       end
 
       def support_target_rails_version?(version)
-        if respond_to?(:requires_gem)
-          return false unless gem_requirements
+        return false unless gem_requirements
 
-          gem_requirement = gem_requirements[TARGET_GEM_NAME]
-          return true unless gem_requirement # If we have no requirement, then we support all versions
+        gem_requirement = gem_requirements[TARGET_GEM_NAME]
+        return true unless gem_requirement # If we have no requirement, then we support all versions
 
-          gem_requirement.satisfied_by?(Gem::Version.new(version))
-        else
-          # Fallback path for previous versions of RuboCop which don't support the `requires_gem` API yet.
-          @minimum_target_rails_version <= version
-        end
+        gem_requirement.satisfied_by?(Gem::Version.new(version))
       end
     end
   end

data/lib/rubocop/cop/rails/action_controller_flash_before_render.rb

@@ -73,7 +73,7 @@ module RuboCop
             return false if use_redirect_to?(context)
 
             context = node
-          elsif context.right_siblings.empty?
+          elsif context.right_siblings.empty? && !use_redirect_to?(context.parent)
             return true
           end
           context = context.right_siblings
@@ -98,7 +98,9 @@ module RuboCop
         end
 
         def use_redirect_to?(context)
-          context.right_siblings.compact.any? do |sibling|
+          context.right_siblings.any? do |sibling|
+            next unless sibling.is_a?(AST::Node)
+
             # Unwrap `return redirect_to :index`
             sibling = sibling.children.first if sibling.return_type? && sibling.children.one?
             sibling.send_type? && sibling.method?(:redirect_to)

data/lib/rubocop/cop/rails/action_filter.rb

@@ -72,7 +72,7 @@ module RuboCop
 
         RESTRICT_ON_SEND = FILTER_METHODS + ACTION_METHODS
 
-        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
+        def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler, InternalAffairs/ItblockHandler
           check_method_node(node.send_node)
         end
 

data/lib/rubocop/cop/rails/delegate.rb

@@ -76,7 +76,7 @@ module RuboCop
 
         def on_def(node)
           return unless trivial_delegate?(node)
-          return if private_or_protected_delegation(node)
+          return if private_or_protected_delegation?(node)
           return if module_function_declared?(node)
 
           register_offense(node)
@@ -163,8 +163,8 @@ module RuboCop
           end
         end
 
-        def private_or_protected_delegation(node)
-          private_or_protected_inline(node) || node_visibility(node) != :public
+        def private_or_protected_delegation?(node)
+          private_or_protected_inline?(node) || node_visibility(node) != :public
         end
 
         def module_function_declared?(node)
@@ -173,7 +173,7 @@ module RuboCop
           end
         end
 
-        def private_or_protected_inline(node)
+        def private_or_protected_inline?(node)
           processed_source[node.first_line - 1].strip.match?(/\A(private )|(protected )/)
         end
       end

data/lib/rubocop/cop/rails/duplicate_association.rb

@@ -94,7 +94,7 @@ module RuboCop
           filtered_nodes = association_nodes.reject { |node| node.method?(:belongs_to) }
           grouped_associations = filtered_nodes.group_by do |node|
             arguments = association(node).last
-            next unless arguments.count == 1
+            next unless arguments.one?
 
             if (class_name = class_name(arguments.first))
               class_name.source

data/lib/rubocop/cop/rails/duplicate_scope.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Rails
-      # Checks for multiple scopes in a model that have the same `where` clause. This
+      # Checks for multiple scopes in a model that have the same expression. This
       # often means you copy/pasted a scope, updated the name, and forgot to change the condition.
       #
       # @example
@@ -19,7 +19,7 @@ module RuboCop
       class DuplicateScope < Base
         include ClassSendNodeHelper
 
-        MSG = 'Multiple scopes share this same where clause.'
+        MSG = 'Multiple scopes share this same expression.'
 
         def_node_matcher :scope, <<~PATTERN
           (send nil? :scope _ $...)