rubocop-rspec 2.20.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebfcc955ecfa8b3437defde668d955020f03a2dbba2c9337f0b75a8fb9a3c26
-  data.tar.gz: 7a547b1e24c278de072b2c912be27e1dc5fb1450b6fa65d563278d0f054d6d1d
+  metadata.gz: e786386e218833ac7f78af9ffcadadb6bf6c822a31b455cac1567152fd3bc9c0
+  data.tar.gz: 384170b4ae3a06c05b30855ae9361057c53226b40b924d4ec1d49c0d15195658
 SHA512:
-  metadata.gz: f8942cdf262718de32bfbc765e3f2aac9eae49e364d7a2d866300b77e0bd39fd24b168d513577a1a95a82ce10a0f325a66c6b2914da71dd3951011c2399b0b3e
-  data.tar.gz: 89c8fce01b42c53c50460b9411cd44f96b99663ce3a2e7735e6cb0f260c1cc3a86ba0daba553b4ebeba25625dde25f41d8b2129929cf92514e06e0f0f8191ec5
+  metadata.gz: 554345811f404b27a39fd522e0085022c39147e0487f04ea77ed7887002451af112e2ddc45ad94841c0a4201a76f37fbfb7a2e64aed3c7efa91cddf1a30843bc
+  data.tar.gz: 22882a56ddf03c55d6eaf299fb05197c835049054231e6d7798e2ca3eac5cbd9840eeada823a12431b00efd37289a8353792dfe3c8f653b2606f9ccda480615a

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Master (Unreleased)
 
+## 2.22.0 (2023-05-06)
+
+- Extract factory_bot cops to a separate repository, [`rubocop-factory_bot`](https://github.com/rubocop/rubocop-factory_bot). The `rubocop-factory_bot` repository is a dependency of `rubocop-rspec` and the factory_bot cops are aliased (`RSpec/FactoryBot/Foo` == `FactoryBot/Foo`) until v3.0 is released, so the change will be invisible to users until then. ([@ydah])
+
+## 2.21.0 (2023-05-05)
+
+- Fix a false positive in `RSpec/IndexedLet` with suffixes after index-like numbers. ([@pirj])
+- Fix an error for `RSpec/Rails/HaveHttpStatus` with comparison with strings containing non-numeric characters. ([@ydah])
+- Fix an error for `RSpec/MatchArray` when `match_array` with no argument. ([@ydah])
+- Add support `a_block_changing` and `changing` for `RSpec/ChangeByZero`. ([@ydah])
+- Drop Ruby 2.6 support. ([@ydah])
+
 ## 2.20.0 (2023-04-18)
 
 - Add new `RSpec/IndexedLet` cop. ([@dmitrytsepelev])

data/config/obsoletion.yml

@@ -21,3 +21,9 @@ renamed:
   RSpec/Capybara/SpecificFinders: Capybara/SpecificFinders
   RSpec/Capybara/SpecificMatcher: Capybara/SpecificMatcher
   RSpec/Capybara/VisibilityMatcher: Capybara/VisibilityMatcher
+  RSpec/FactoryBot/AttributeDefinedStatically: FactoryBot/AttributeDefinedStatically
+  RSpec/FactoryBot/ConsistentParenthesesStyle: FactoryBot/ConsistentParenthesesStyle
+  RSpec/FactoryBot/CreateList: FactoryBot/CreateList
+  RSpec/FactoryBot/FactoryClassName: FactoryBot/FactoryClassName
+  RSpec/FactoryBot/FactoryNameStyle: FactoryBot/FactoryNameStyle
+  RSpec/FactoryBot/SyntaxMethods: FactoryBot/SyntaxMethods

data/lib/rubocop/cop/rspec/change_by_zero.rb

@@ -59,15 +59,16 @@ module RuboCop
       #
       class ChangeByZero < Base
         extend AutoCorrector
-        MSG = 'Prefer `not_to change` over `to change.by(0)`.'
+        MSG = 'Prefer `not_to change` over `to %<method>s.by(0)`.'
         MSG_COMPOUND = 'Prefer %<preferred>s with compound expectations ' \
-                       'over `change.by(0)`.'
-        RESTRICT_ON_SEND = %i[change].freeze
+                       'over `%<method>s.by(0)`.'
+        CHANGE_METHODS = Set[:change, :a_block_changing, :changing].freeze
+        RESTRICT_ON_SEND = CHANGE_METHODS.freeze
 
         # @!method expect_change_with_arguments(node)
         def_node_matcher :expect_change_with_arguments, <<-PATTERN
           (send
-            (send nil? :change ...) :by
+            $(send nil? CHANGE_METHODS ...) :by
             (int 0))
         PATTERN
 
@@ -75,48 +76,61 @@ module RuboCop
         def_node_matcher :expect_change_with_block, <<-PATTERN
           (send
             (block
-              (send nil? :change)
+              $(send nil? CHANGE_METHODS)
               (args)
-              (send (...) $_)) :by
+              (send (...) _)) :by
             (int 0))
         PATTERN
 
         # @!method change_nodes(node)
         def_node_search :change_nodes, <<-PATTERN
-          $(send nil? :change ...)
+          $(send nil? CHANGE_METHODS ...)
         PATTERN
 
         def on_send(node)
-          expect_change_with_arguments(node.parent) do
-            check_offense(node.parent)
+          expect_change_with_arguments(node.parent) do |change|
+            register_offense(node.parent, change)
           end
 
-          expect_change_with_block(node.parent.parent) do
-            check_offense(node.parent.parent)
+          expect_change_with_block(node.parent.parent) do |change|
+            register_offense(node.parent.parent, change)
           end
         end
 
         private
 
-        def check_offense(node)
-          expression = node.source_range
+        # rubocop:disable Metrics/MethodLength
+        def register_offense(node, change_node)
           if compound_expectations?(node)
-            add_offense(expression, message: message_compound) do |corrector|
+            add_offense(node.source_range,
+                        message: message_compound(change_node)) do |corrector|
               autocorrect_compound(corrector, node)
             end
           else
-            add_offense(expression) do |corrector|
-              autocorrect(corrector, node)
+            add_offense(node.source_range,
+                        message: message(change_node)) do |corrector|
+              autocorrect(corrector, node, change_node)
             end
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def compound_expectations?(node)
           %i[and or & |].include?(node.parent.method_name)
         end
 
-        def autocorrect(corrector, node)
+        def message(change_node)
+          format(MSG, method: change_node.method_name)
+        end
+
+        def message_compound(change_node)
+          format(MSG_COMPOUND, preferred: preferred_method,
+                               method: change_node.method_name)
+        end
+
+        def autocorrect(corrector, node, change_node)
           corrector.replace(node.parent.loc.selector, 'not_to')
+          corrector.replace(change_node.loc.selector, 'change')
           range = node.loc.dot.with(end_pos: node.source_range.end_pos)
           corrector.remove(range)
         end
@@ -135,10 +149,6 @@ module RuboCop
           cop_config['NegatedMatcher']
         end
 
-        def message_compound
-          format(MSG_COMPOUND, preferred: preferred_method)
-        end
-
         def preferred_method
           negated_matcher ? "`#{negated_matcher}`" : 'negated matchers'
         end

data/lib/rubocop/cop/rspec/factory_bot/attribute_defined_statically.rb

@@ -4,124 +4,31 @@ module RuboCop
   module Cop
     module RSpec
       module FactoryBot
-        # Always declare attribute values as blocks.
-        #
-        # @example
-        #   # bad
-        #   kind [:active, :rejected].sample
-        #
-        #   # good
-        #   kind { [:active, :rejected].sample }
-        #
-        #   # bad
-        #   closed_at 1.day.from_now
-        #
-        #   # good
-        #   closed_at { 1.day.from_now }
-        #
-        #   # bad
-        #   count 1
-        #
-        #   # good
-        #   count { 1 }
-        #
-        class AttributeDefinedStatically < ::RuboCop::Cop::Base
-          extend AutoCorrector
-
-          MSG = 'Use a block to declare attribute values.'
-
-          # @!method value_matcher(node)
-          def_node_matcher :value_matcher, <<-PATTERN
-            (send _ !#reserved_method? $...)
-          PATTERN
-
-          # @!method factory_attributes(node)
-          def_node_matcher :factory_attributes, <<-PATTERN
-            (block (send _ #attribute_defining_method? ...) _ { (begin $...) $(send ...) } )
-          PATTERN
-
-          def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
-            attributes = factory_attributes(node) || []
-            attributes = [attributes] unless attributes.is_a?(Array) # rubocop:disable Style/ArrayCoercion, Lint/RedundantCopDisableDirective
-
-            attributes.each do |attribute|
-              next unless offensive_receiver?(attribute.receiver, node)
-              next if proc?(attribute) || association?(attribute.first_argument)
-
-              add_offense(attribute) do |corrector|
-                autocorrect(corrector, attribute)
-              end
-            end
-          end
-
-          private
-
-          def autocorrect(corrector, node)
-            if node.parenthesized?
-              autocorrect_replacing_parens(corrector, node)
-            else
-              autocorrect_without_parens(corrector, node)
-            end
-          end
-
-          def offensive_receiver?(receiver, node)
-            receiver.nil? ||
-              receiver.self_type? ||
-              receiver_matches_first_block_argument?(receiver, node)
-          end
-
-          def receiver_matches_first_block_argument?(receiver, node)
-            first_block_argument = node.arguments.first
-
-            !first_block_argument.nil? &&
-              receiver.lvar_type? &&
-              receiver.node_parts == first_block_argument.node_parts
-          end
-
-          def proc?(attribute)
-            value_matcher(attribute).to_a.all?(&:block_pass_type?)
-          end
-
-          # @!method association?(node)
-          def_node_matcher :association?, '(hash <(pair (sym :factory) _) ...>)'
-
-          def autocorrect_replacing_parens(corrector, node)
-            left_braces, right_braces = braces(node)
-
-            corrector.replace(node.location.begin, " #{left_braces}")
-            corrector.replace(node.location.end, right_braces)
-          end
-
-          def autocorrect_without_parens(corrector, node)
-            left_braces, right_braces = braces(node)
-
-            argument = node.first_argument
-            expression = argument.source_range
-            corrector.insert_before(expression, left_braces)
-            corrector.insert_after(expression, right_braces)
-          end
-
-          def braces(node)
-            if value_hash_without_braces?(node.first_argument)
-              ['{ { ', ' } }']
-            else
-              ['{ ', ' }']
-            end
-          end
-
-          def value_hash_without_braces?(node)
-            node.hash_type? && !node.braces?
-          end
-
-          def reserved_method?(method_name)
-            RuboCop::RSpec::FactoryBot.reserved_methods.include?(method_name)
-          end
-
-          def attribute_defining_method?(method_name)
-            RuboCop::RSpec::FactoryBot.attribute_defining_methods
-              .include?(method_name)
-          end
-        end
+        # @!parse
+        #   # Always declare attribute values as blocks.
+        #   #
+        #   # @example
+        #   #   # bad
+        #   #   kind [:active, :rejected].sample
+        #   #
+        #   #   # good
+        #   #   kind { [:active, :rejected].sample }
+        #   #
+        #   #   # bad
+        #   #   closed_at 1.day.from_now
+        #   #
+        #   #   # good
+        #   #   closed_at { 1.day.from_now }
+        #   #
+        #   #   # bad
+        #   #   count 1
+        #   #
+        #   #   # good
+        #   #   count { 1 }
+        #   #
+        #   class AttributeDefinedStatically < ::RuboCop::Cop::Base; end
+        AttributeDefinedStatically =
+          ::RuboCop::Cop::FactoryBot::AttributeDefinedStatically
       end
     end
   end

data/lib/rubocop/cop/rspec/factory_bot/consistent_parentheses_style.rb

@@ -4,113 +4,46 @@ module RuboCop
   module Cop
     module RSpec
       module FactoryBot
-        # Use a consistent style for parentheses in factory bot calls.
-        #
-        # @example
-        #
-        #   # bad
-        #   create :user
-        #   build(:user)
-        #   create(:login)
-        #   create :login
-        #
-        # @example `EnforcedStyle: require_parentheses` (default)
-        #
-        #   # good
-        #   create(:user)
-        #   create(:user)
-        #   create(:login)
-        #   build(:login)
-        #
-        # @example `EnforcedStyle: omit_parentheses`
-        #
-        #   # good
-        #   create :user
-        #   build :user
-        #   create :login
-        #   create :login
-        #
-        #   # also good
-        #   # when method name and first argument are not on same line
-        #   create(
-        #     :user
-        #   )
-        #   build(
-        #     :user,
-        #     name: 'foo'
-        #   )
-        #
-        class ConsistentParenthesesStyle < ::RuboCop::Cop::Base
-          extend AutoCorrector
-          include ConfigurableEnforcedStyle
-          include RuboCop::RSpec::FactoryBot::Language
-          include RuboCop::Cop::Util
-
-          def self.autocorrect_incompatible_with
-            [Style::MethodCallWithArgsParentheses]
-          end
-
-          MSG_REQUIRE_PARENS = 'Prefer method call with parentheses'
-          MSG_OMIT_PARENS = 'Prefer method call without parentheses'
-
-          FACTORY_CALLS = RuboCop::RSpec::FactoryBot::Language::METHODS
-
-          RESTRICT_ON_SEND = FACTORY_CALLS
-
-          # @!method factory_call(node)
-          def_node_matcher :factory_call, <<-PATTERN
-            (send
-              {#factory_bot? nil?} %FACTORY_CALLS
-              {sym str send lvar} _*
-            )
-          PATTERN
-
-          def on_send(node)
-            return if ambiguous_without_parentheses?(node)
-
-            factory_call(node) do
-              return if node.method?(:generate) && node.arguments.count > 1
-
-              if node.parenthesized?
-                process_with_parentheses(node)
-              else
-                process_without_parentheses(node)
-              end
-            end
-          end
-
-          private
-
-          def process_with_parentheses(node)
-            return unless style == :omit_parentheses
-            return unless same_line?(node, node.first_argument)
-
-            add_offense(node.loc.selector,
-                        message: MSG_OMIT_PARENS) do |corrector|
-              remove_parentheses(corrector, node)
-            end
-          end
-
-          def process_without_parentheses(node)
-            return unless style == :require_parentheses
-
-            add_offense(node.loc.selector,
-                        message: MSG_REQUIRE_PARENS) do |corrector|
-              add_parentheses(node, corrector)
-            end
-          end
-
-          AMBIGUOUS_TYPES = %i[send pair array and or if].freeze
-
-          def ambiguous_without_parentheses?(node)
-            node.parent && AMBIGUOUS_TYPES.include?(node.parent.type)
-          end
-
-          def remove_parentheses(corrector, node)
-            corrector.replace(node.location.begin, ' ')
-            corrector.remove(node.location.end)
-          end
-        end
+        # @!parse
+        #   # Use a consistent style for parentheses in factory bot calls.
+        #   #
+        #   # @example
+        #   #
+        #   #   # bad
+        #   #   create :user
+        #   #   build(:user)
+        #   #   create(:login)
+        #   #   create :login
+        #   #
+        #   # @example `EnforcedStyle: require_parentheses` (default)
+        #   #
+        #   #   # good
+        #   #   create(:user)
+        #   #   create(:user)
+        #   #   create(:login)
+        #   #   build(:login)
+        #   #
+        #   # @example `EnforcedStyle: omit_parentheses`
+        #   #
+        #   #   # good
+        #   #   create :user
+        #   #   build :user
+        #   #   create :login
+        #   #   create :login
+        #   #
+        #   #   # also good
+        #   #   # when method name and first argument are not on same line
+        #   #   create(
+        #   #     :user
+        #   #   )
+        #   #   build(
+        #   #     :user,
+        #   #     name: 'foo'
+        #   #   )
+        #   #
+        #   class ConsistentParenthesesStyle < ::RuboCop::Cop::Base; end
+        ConsistentParenthesesStyle =
+          ::RuboCop::Cop::FactoryBot::ConsistentParenthesesStyle
       end
     end
   end

data/lib/rubocop/cop/rspec/factory_bot/create_list.rb

@@ -4,256 +4,36 @@ module RuboCop
   module Cop
     module RSpec
       module FactoryBot
-        # Checks for create_list usage.
-        #
-        # This cop can be configured using the `EnforcedStyle` option
-        #
-        # @example `EnforcedStyle: create_list` (default)
-        #   # bad
-        #   3.times { create :user }
-        #
-        #   # good
-        #   create_list :user, 3
-        #
-        #   # bad
-        #   3.times { create :user, age: 18 }
-        #
-        #   # good - index is used to alter the created models attributes
-        #   3.times { |n| create :user, age: n }
-        #
-        #   # good - contains a method call, may return different values
-        #   3.times { create :user, age: rand }
-        #
-        # @example `EnforcedStyle: n_times`
-        #   # bad
-        #   create_list :user, 3
-        #
-        #   # good
-        #   3.times { create :user }
-        #
-        class CreateList < ::RuboCop::Cop::Base
-          extend AutoCorrector
-          include ConfigurableEnforcedStyle
-          include RuboCop::RSpec::FactoryBot::Language
-
-          MSG_CREATE_LIST = 'Prefer create_list.'
-          MSG_N_TIMES = 'Prefer %<number>s.times.'
-          RESTRICT_ON_SEND = %i[create_list].freeze
-
-          # @!method array_new_or_n_times_block?(node)
-          def_node_matcher :array_new_or_n_times_block?, <<-PATTERN
-            (block
-              {
-                (send (const {nil? | cbase} :Array) :new (int _)) |
-                (send (int _) :times)
-              }
-              ...
-            )
-          PATTERN
-
-          # @!method block_with_arg_and_used?(node)
-          def_node_matcher :block_with_arg_and_used?, <<-PATTERN
-            (block
-              _
-              (args (arg _value))
-              `_value
-            )
-          PATTERN
-
-          # @!method arguments_include_method_call?(node)
-          def_node_matcher :arguments_include_method_call?, <<-PATTERN
-            (send ${nil? #factory_bot?} :create (sym $_) `$(send ...))
-          PATTERN
-
-          # @!method factory_call(node)
-          def_node_matcher :factory_call, <<-PATTERN
-            (send ${nil? #factory_bot?} :create (sym $_) $...)
-          PATTERN
-
-          # @!method factory_list_call(node)
-          def_node_matcher :factory_list_call, <<-PATTERN
-            (send {nil? #factory_bot?} :create_list (sym _) (int $_) ...)
-          PATTERN
-
-          def on_block(node) # rubocop:todo InternalAffairs/NumblockHandler
-            return unless style == :create_list
-
-            return unless array_new_or_n_times_block?(node)
-            return if block_with_arg_and_used?(node)
-            return unless node.body
-            return if arguments_include_method_call?(node.body)
-            return unless contains_only_factory?(node.body)
-
-            add_offense(node.send_node, message: MSG_CREATE_LIST) do |corrector|
-              CreateListCorrector.new(node.send_node).call(corrector)
-            end
-          end
-
-          def on_send(node)
-            return unless style == :n_times
-
-            factory_list_call(node) do |count|
-              message = format(MSG_N_TIMES, number: count)
-              add_offense(node.loc.selector, message: message) do |corrector|
-                TimesCorrector.new(node).call(corrector)
-              end
-            end
-          end
-
-          private
-
-          def contains_only_factory?(node)
-            if node.block_type?
-              factory_call(node.send_node)
-            else
-              factory_call(node)
-            end
-          end
-
-          # :nodoc
-          module Corrector
-            private
-
-            def build_options_string(options)
-              options.map(&:source).join(', ')
-            end
-
-            def format_method_call(node, method, arguments)
-              if node.block_type? || node.parenthesized?
-                "#{method}(#{arguments})"
-              else
-                "#{method} #{arguments}"
-              end
-            end
-
-            def format_receiver(receiver)
-              return '' unless receiver
-
-              "#{receiver.source}."
-            end
-          end
-
-          # :nodoc
-          class TimesCorrector
-            include Corrector
-
-            def initialize(node)
-              @node = node
-            end
-
-            def call(corrector)
-              replacement = generate_n_times_block(node)
-              corrector.replace(node.block_node || node, replacement)
-            end
-
-            private
-
-            attr_reader :node
-
-            def generate_n_times_block(node)
-              factory, count, *options = node.arguments
-
-              arguments = factory.source
-              options = build_options_string(options)
-              arguments += ", #{options}" unless options.empty?
-
-              replacement = format_receiver(node.receiver)
-              replacement += format_method_call(node, 'create', arguments)
-              replacement += " #{factory_call_block_source}" if node.block_node
-              "#{count.source}.times { #{replacement} }"
-            end
-
-            def factory_call_block_source
-              node.block_node.location.begin.with(
-                end_pos: node.block_node.location.end.end_pos
-              ).source
-            end
-          end
-
-          # :nodoc:
-          class CreateListCorrector
-            include Corrector
-
-            def initialize(node)
-              @node = node.parent
-            end
-
-            def call(corrector)
-              replacement = if node.body.block_type?
-                              call_with_block_replacement(node)
-                            else
-                              call_replacement(node)
-                            end
-
-              corrector.replace(node, replacement)
-            end
-
-            private
-
-            attr_reader :node
-
-            def call_with_block_replacement(node)
-              block = node.body
-              arguments = build_arguments(block, count_from(node))
-              replacement = format_receiver(block.receiver)
-              replacement += format_method_call(block, 'create_list', arguments)
-              replacement += format_block(block)
-              replacement
-            end
-
-            def build_arguments(node, count)
-              factory, *options = *node.send_node.arguments
-
-              arguments = ":#{factory.value}, #{count}"
-              options = build_options_string(options)
-              arguments += ", #{options}" unless options.empty?
-              arguments
-            end
-
-            def call_replacement(node)
-              block = node.body
-              factory, *options = *block.arguments
-
-              arguments = "#{factory.source}, #{count_from(node)}"
-              options = build_options_string(options)
-              arguments += ", #{options}" unless options.empty?
-
-              replacement = format_receiver(block.receiver)
-              replacement += format_method_call(block, 'create_list', arguments)
-              replacement
-            end
-
-            def count_from(node)
-              count_node =
-                if node.receiver.int_type?
-                  node.receiver
-                else
-                  node.send_node.first_argument
-                end
-              count_node.source
-            end
-
-            def format_block(node)
-              if node.body.begin_type?
-                format_multiline_block(node)
-              else
-                format_singleline_block(node)
-              end
-            end
-
-            def format_multiline_block(node)
-              indent = ' ' * node.body.loc.column
-              indent_end = ' ' * node.parent.loc.column
-              " do #{node.arguments.source}\n" \
-                "#{indent}#{node.body.source}\n" \
-                "#{indent_end}end"
-            end
-
-            def format_singleline_block(node)
-              " { #{node.arguments.source} #{node.body.source} }"
-            end
-          end
-        end
+        # @!parse
+        #   # Checks for create_list usage.
+        #   #
+        #   # This cop can be configured using the `EnforcedStyle` option
+        #   #
+        #   # @example `EnforcedStyle: create_list` (default)
+        #   #   # bad
+        #   #   3.times { create :user }
+        #   #
+        #   #   # good
+        #   #   create_list :user, 3
+        #   #
+        #   #   # bad
+        #   #   3.times { create :user, age: 18 }
+        #   #
+        #   #   # good - index is used to alter the created models attributes
+        #   #   3.times { |n| create :user, age: n }
+        #   #
+        #   #   # good - contains a method call, may return different values
+        #   #   3.times { create :user, age: rand }
+        #   #
+        #   # @example `EnforcedStyle: n_times`
+        #   #   # bad
+        #   #   create_list :user, 3
+        #   #
+        #   #   # good
+        #   #   3.times { create :user }
+        #   #
+        #   class CreateList < ::RuboCop::Cop::Base; end
+        CreateList = ::RuboCop::Cop::FactoryBot::CreateList
       end
     end
   end

data/lib/rubocop/cop/rspec/factory_bot/factory_class_name.rb

@@ -4,52 +4,25 @@ module RuboCop
   module Cop
     module RSpec
       module FactoryBot
-        # Use string value when setting the class attribute explicitly.
-        #
-        # This cop would promote faster tests by lazy-loading of
-        # application files. Also, this could help you suppress potential bugs
-        # in combination with external libraries by avoiding a preload of
-        # application files from the factory files.
-        #
-        # @example
-        #   # bad
-        #   factory :foo, class: Foo do
-        #   end
-        #
-        #   # good
-        #   factory :foo, class: 'Foo' do
-        #   end
-        #
-        class FactoryClassName < ::RuboCop::Cop::Base
-          extend AutoCorrector
-
-          MSG = "Pass '%<class_name>s' string instead of `%<class_name>s` " \
-                'constant.'
-          ALLOWED_CONSTANTS = %w[Hash OpenStruct].freeze
-          RESTRICT_ON_SEND = %i[factory].freeze
-
-          # @!method class_name(node)
-          def_node_matcher :class_name, <<~PATTERN
-            (send _ :factory _ (hash <(pair (sym :class) $(const ...)) ...>))
-          PATTERN
-
-          def on_send(node)
-            class_name(node) do |cn|
-              next if allowed?(cn.const_name)
-
-              msg = format(MSG, class_name: cn.const_name)
-              add_offense(cn, message: msg) do |corrector|
-                corrector.replace(cn, "'#{cn.source}'")
-              end
-            end
-          end
-
-          private
-
-          def allowed?(const_name)
-            ALLOWED_CONSTANTS.include?(const_name)
-          end
-        end
+        # @!parse
+        #   # Use string value when setting the class attribute explicitly.
+        #   #
+        #   # This cop would promote faster tests by lazy-loading of
+        #   # application files. Also, this could help you suppress potential
+        #   # bugs in combination with external libraries by avoiding a preload
+        #   # of application files from the factory files.
+        #   #
+        #   # @example
+        #   #   # bad
+        #   #   factory :foo, class: Foo do
+        #   #   end
+        #   #
+        #   #   # good
+        #   #   factory :foo, class: 'Foo' do
+        #   #   end
+        #   #
+        #   class FactoryClassName < ::RuboCop::Cop::Base; end
+        FactoryClassName = ::RuboCop::Cop::FactoryBot::FactoryClassName
       end
     end
   end

data/lib/rubocop/cop/rspec/factory_bot/factory_name_style.rb

@@ -4,70 +4,29 @@ module RuboCop
   module Cop
     module RSpec
       module FactoryBot
-        # Checks for name style for argument of FactoryBot::Syntax::Methods.
-        #
-        # @example EnforcedStyle: symbol (default)
-        #   # bad
-        #   create('user')
-        #   build "user", username: "NAME"
-        #
-        #   # good
-        #   create(:user)
-        #   build :user, username: "NAME"
-        #
-        # @example EnforcedStyle: string
-        #   # bad
-        #   create(:user)
-        #   build :user, username: "NAME"
-        #
-        #   # good
-        #   create('user')
-        #   build "user", username: "NAME"
-        #
-        class FactoryNameStyle < ::RuboCop::Cop::Base
-          extend AutoCorrector
-          include ConfigurableEnforcedStyle
-          include RuboCop::RSpec::FactoryBot::Language
-
-          MSG = 'Use %<prefer>s to refer to a factory.'
-          FACTORY_CALLS = RuboCop::RSpec::FactoryBot::Language::METHODS
-          RESTRICT_ON_SEND = FACTORY_CALLS
-
-          # @!method factory_call(node)
-          def_node_matcher :factory_call, <<-PATTERN
-          (send
-            {#factory_bot? nil?} %FACTORY_CALLS
-            ${str sym} ...
-          )
-          PATTERN
-
-          def on_send(node)
-            factory_call(node) do |name|
-              if offense_for_symbol_style?(name)
-                register_offense(name, name.value.to_sym.inspect)
-              elsif offense_for_string_style?(name)
-                register_offense(name, name.value.to_s.inspect)
-              end
-            end
-          end
-
-          private
-
-          def offense_for_symbol_style?(name)
-            name.str_type? && style == :symbol
-          end
-
-          def offense_for_string_style?(name)
-            name.sym_type? && style == :string
-          end
-
-          def register_offense(name, prefer)
-            add_offense(name,
-                        message: format(MSG, prefer: style.to_s)) do |corrector|
-              corrector.replace(name, prefer)
-            end
-          end
-        end
+        # @!parse
+        #   # Checks for name style for argument of FactoryBot::Syntax::Methods.
+        #   #
+        #   # @example EnforcedStyle: symbol (default)
+        #   #   # bad
+        #   #   create('user')
+        #   #   build "user", username: "NAME"
+        #   #
+        #   #   # good
+        #   #   create(:user)
+        #   #   build :user, username: "NAME"
+        #   #
+        #   # @example EnforcedStyle: string
+        #   #   # bad
+        #   #   create(:user)
+        #   #   build :user, username: "NAME"
+        #   #
+        #   #   # good
+        #   #   create('user')
+        #   #   build "user", username: "NAME"
+        #   #
+        #   class FactoryNameStyle < ::RuboCop::Cop::Base; end
+        FactoryNameStyle = ::RuboCop::Cop::FactoryBot::FactoryNameStyle
       end
     end
   end

data/lib/rubocop/cop/rspec/factory_bot/syntax_methods.rb

@@ -4,85 +4,51 @@ module RuboCop
   module Cop
     module RSpec
       module FactoryBot
-        # Use shorthands from `FactoryBot::Syntax::Methods` in your specs.
-        #
-        # @safety
-        #   The autocorrection is marked as unsafe because the cop
-        #   cannot verify whether you already include
-        #   `FactoryBot::Syntax::Methods` in your test suite.
-        #
-        #   If you're using Rails, add the following configuration to
-        #   `spec/support/factory_bot.rb` and be sure to require that file in
-        #   `rails_helper.rb`:
-        #
-        #   [source,ruby]
-        #   ----
-        #   RSpec.configure do |config|
-        #     config.include FactoryBot::Syntax::Methods
-        #   end
-        #   ----
-        #
-        #   If you're not using Rails:
-        #
-        #   [source,ruby]
-        #   ----
-        #   RSpec.configure do |config|
-        #     config.include FactoryBot::Syntax::Methods
-        #
-        #     config.before(:suite) do
-        #       FactoryBot.find_definitions
-        #     end
-        #   end
-        #   ----
-        #
-        # @example
-        #   # bad
-        #   FactoryBot.create(:bar)
-        #   FactoryBot.build(:bar)
-        #   FactoryBot.attributes_for(:bar)
-        #
-        #   # good
-        #   create(:bar)
-        #   build(:bar)
-        #   attributes_for(:bar)
-        #
-        class SyntaxMethods < Base
-          extend AutoCorrector
-          include InsideExampleGroup
-          include RangeHelp
-          include RuboCop::RSpec::FactoryBot::Language
-
-          MSG = 'Use `%<method>s` from `FactoryBot::Syntax::Methods`.'
-
-          RESTRICT_ON_SEND = RuboCop::RSpec::FactoryBot::Language::METHODS
-
-          def on_send(node)
-            return unless factory_bot?(node.receiver)
-            return unless inside_example_group?(node)
-
-            message = format(MSG, method: node.method_name)
-
-            add_offense(crime_scene(node), message: message) do |corrector|
-              corrector.remove(offense(node))
-            end
-          end
-
-          private
-
-          def crime_scene(node)
-            range_between(
-              node.source_range.begin_pos,
-              node.loc.selector.end_pos
-            )
-          end
-
-          def offense(node)
-            range_between(
-              node.source_range.begin_pos,
-              node.loc.selector.begin_pos
-            )
-          end
-        end
+        # @!parse
+        #   # Use shorthands from `FactoryBot::Syntax::Methods` in your specs.
+        #   #
+        #   # @safety
+        #   #   The autocorrection is marked as unsafe because the cop
+        #   #   cannot verify whether you already include
+        #   #   `FactoryBot::Syntax::Methods` in your test suite.
+        #   #
+        #   #   If you're using Rails, add the following configuration to
+        #   #   `spec/support/factory_bot.rb` and be sure to require that file
+        #   #   in `rails_helper.rb`:
+        #   #
+        #   #   [source,ruby]
+        #   #   ----
+        #   #   RSpec.configure do |config|
+        #   #     config.include FactoryBot::Syntax::Methods
+        #   #   end
+        #   #   ----
+        #   #
+        #   #   If you're not using Rails:
+        #   #
+        #   #   [source,ruby]
+        #   #   ----
+        #   #   RSpec.configure do |config|
+        #   #     config.include FactoryBot::Syntax::Methods
+        #   #
+        #   #     config.before(:suite) do
+        #   #       FactoryBot.find_definitions
+        #   #     end
+        #   #   end
+        #   #   ----
+        #   #
+        #   # @example
+        #   #   # bad
+        #   #   FactoryBot.create(:bar)
+        #   #   FactoryBot.build(:bar)
+        #   #   FactoryBot.attributes_for(:bar)
+        #   #
+        #   #   # good
+        #   #   create(:bar)
+        #   #   build(:bar)
+        #   #   attributes_for(:bar)
+        #   #
+        #   class SyntaxMethods < ::RuboCop::Cop::Base; end
+        SyntaxMethods = ::RuboCop::Cop::FactoryBot::SyntaxMethods
       end
     end
   end

data/lib/rubocop/cop/rspec/file_path.rb

@@ -6,7 +6,7 @@ module RuboCop
       # Checks that spec file paths are consistent and well-formed.
       #
       # By default, this checks that spec file paths are consistent with the
-      # test subject and and enforces that it reflects the described
+      # test subject and enforces that it reflects the described
       # class/module and its optionally called out method.
       #
       # With the configuration option `IgnoreMethods` the called out method will

data/lib/rubocop/cop/rspec/indexed_let.rb

@@ -56,19 +56,24 @@ module RuboCop
 
         private
 
-        INDEX_REGEX = /_?\d+/.freeze
+        SUFFIX_INDEX_REGEX = /_?\d+$/.freeze
+        INDEX_REGEX = /\d+/.freeze
 
         def filter_indexed_lets(candidates)
           candidates
             .filter { |node| indexed_let?(node) }
-            .group_by { |node| let_name(node).to_s.gsub(INDEX_REGEX, '') }
+            .group_by { |node| let_name_stripped_index(node) }
             .values
             .filter { |lets| lets.length > cop_config['Max'] }
             .flatten
         end
 
         def indexed_let?(node)
-          let?(node) && INDEX_REGEX.match?(let_name(node))
+          let?(node) && SUFFIX_INDEX_REGEX.match?(let_name(node))
+        end
+
+        def let_name_stripped_index(node)
+          let_name(node).to_s.gsub(INDEX_REGEX, '')
         end
       end
     end

data/lib/rubocop/cop/rspec/match_array.rb

@@ -34,7 +34,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return unless node.first_argument.array_type?
+          return unless node.first_argument&.array_type?
           return if match_array_with_empty_array?(node)
 
           check_populated_array(node)

data/lib/rubocop/cop/rspec/rails/have_http_status.rb

@@ -18,7 +18,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG =
-            'Prefer `expect(response).%<to>s have_http_status(%<status>i)` ' \
+            'Prefer `expect(response).%<to>s have_http_status(%<status>s)` ' \
             'over `%<bad_code>s`.'
 
           RUNNERS = %i[to to_not not_to].to_set
@@ -37,12 +37,14 @@ module RuboCop
 
           def on_send(node)
             match_status(node) do |response_status, to, match, status|
+              return unless status.to_s.match?(/\A\d+\z/)
+
               message = format(MSG, to: to, status: status,
                                     bad_code: node.source)
               add_offense(node, message: message) do |corrector|
                 corrector.replace(response_status, 'response')
                 corrector.replace(match.loc.selector, 'have_http_status')
-                corrector.replace(match.first_argument, status.to_i.to_s)
+                corrector.replace(match.first_argument, status.to_s)
               end
             end
           end

data/lib/rubocop/rspec/config_formatter.rb

@@ -16,6 +16,12 @@ module RuboCop
         RSpec/Capybara/SpecificFinders
         RSpec/Capybara/SpecificMatcher
         RSpec/Capybara/VisibilityMatcher
+        RSpec/FactoryBot/AttributeDefinedStatically
+        RSpec/FactoryBot/ConsistentParenthesesStyle
+        RSpec/FactoryBot/CreateList
+        RSpec/FactoryBot/FactoryClassName
+        RSpec/FactoryBot/FactoryNameStyle
+        RSpec/FactoryBot/SyntaxMethods
       )
       AMENDMENTS = %(Metrics/BlockLength)
       COP_DOC_BASE_URL = 'https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/'

data/lib/rubocop/rspec/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Version information for the RSpec RuboCop plugin.
     module Version
-      STRING = '2.20.0'
+      STRING = '2.22.0'
     end
   end
 end

data/lib/rubocop-rspec.rb

@@ -5,6 +5,7 @@ require 'yaml'
 
 require 'rubocop'
 require 'rubocop-capybara'
+require 'rubocop-factory_bot'
 
 require_relative 'rubocop/rspec'
 require_relative 'rubocop/rspec/inject'
@@ -16,8 +17,6 @@ require_relative 'rubocop/rspec/wording'
 # Dependent on `RuboCop::RSpec::Language::NodePattern`.
 require_relative 'rubocop/rspec/language'
 
-require_relative 'rubocop/rspec/factory_bot/language'
-
 require_relative 'rubocop/cop/rspec/mixin/final_end_location'
 require_relative 'rubocop/cop/rspec/mixin/inside_example_group'
 require_relative 'rubocop/cop/rspec/mixin/location_help'
@@ -37,7 +36,6 @@ require_relative 'rubocop/rspec/concept'
 require_relative 'rubocop/rspec/corrector/move_node'
 require_relative 'rubocop/rspec/example'
 require_relative 'rubocop/rspec/example_group'
-require_relative 'rubocop/rspec/factory_bot'
 require_relative 'rubocop/rspec/hook'
 
 RuboCop::RSpec::Inject.defaults!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.22.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.17'
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.22'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.22'
 description: |2
       Code style checking for RSpec files.
       A plugin for the RuboCop code style enforcing & linting tool.
@@ -197,8 +211,6 @@ files:
 - lib/rubocop/rspec/description_extractor.rb
 - lib/rubocop/rspec/example.rb
 - lib/rubocop/rspec/example_group.rb
-- lib/rubocop/rspec/factory_bot.rb
-- lib/rubocop/rspec/factory_bot/language.rb
 - lib/rubocop/rspec/hook.rb
 - lib/rubocop/rspec/inject.rb
 - lib/rubocop/rspec/language.rb
@@ -222,14 +234,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Code style checking for RSpec files

data/lib/rubocop/rspec/factory_bot/language.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module RSpec
-    module FactoryBot
-      # Contains node matchers for common FactoryBot DSL.
-      module Language
-        extend RuboCop::NodePattern::Macros
-
-        METHODS = %i[
-          attributes_for
-          attributes_for_list
-          attributes_for_pair
-          build
-          build_list
-          build_pair
-          build_stubbed
-          build_stubbed_list
-          build_stubbed_pair
-          create
-          create_list
-          create_pair
-          generate
-          generate_list
-          null
-          null_list
-          null_pair
-        ].to_set.freeze
-
-        # @!method factory_bot?(node)
-        def_node_matcher :factory_bot?, <<~PATTERN
-          (const {nil? cbase} {:FactoryGirl :FactoryBot})
-        PATTERN
-      end
-    end
-  end
-end

data/lib/rubocop/rspec/factory_bot.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module RSpec
-    # RuboCop FactoryBot project namespace
-    module FactoryBot
-      ATTRIBUTE_DEFINING_METHODS = %i[
-        factory
-        ignore
-        trait
-        traits_for_enum
-        transient
-      ].freeze
-
-      UNPROXIED_METHODS = %i[
-        __send__
-        __id__
-        nil?
-        send
-        object_id
-        extend
-        instance_eval
-        initialize
-        block_given?
-        raise
-        caller
-        method
-      ].freeze
-
-      DEFINITION_PROXY_METHODS = %i[
-        add_attribute
-        after
-        association
-        before
-        callback
-        ignore
-        initialize_with
-        sequence
-        skip_create
-        to_create
-      ].freeze
-
-      RESERVED_METHODS =
-        DEFINITION_PROXY_METHODS +
-        UNPROXIED_METHODS +
-        ATTRIBUTE_DEFINING_METHODS
-
-      private_constant(
-        :ATTRIBUTE_DEFINING_METHODS,
-        :UNPROXIED_METHODS,
-        :DEFINITION_PROXY_METHODS,
-        :RESERVED_METHODS
-      )
-
-      def self.attribute_defining_methods
-        ATTRIBUTE_DEFINING_METHODS
-      end
-
-      def self.reserved_methods
-        RESERVED_METHODS
-      end
-    end
-  end
-end