rubocop-minitest 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda17cda5caf90c2cf74b9f760a0ba38d1cf1c9e5d73c16c450dc4b905bb0105
-  data.tar.gz: a623715c3491d9eaa408842b98f790cc95c761d75fe5c42e0a9bb8b32c0730bf
+  metadata.gz: ecf18d07d25d4f364c0b5ea4292bbb07f3f06edb4b72f87771db2377ff86ef15
+  data.tar.gz: b5ae1ab24935cddcc5e42d1e69b0a2d67b711d23dca1fc4fd7694c7a8dd857a0
 SHA512:
-  metadata.gz: ea451f9315708de691d4fec8a1190f7c3ad20c1f601ea784f05d20289d43cbec4f6471ef257ed0ef63341c20c8abac9f990db749a7faa1b12af6c5fe6725904d
-  data.tar.gz: e8404442a84c387f85c38d270a8312d2f0e0b37105cabf9bd0b5a25d3ac9bf3d48267659b25c4432f7ef335315f1fc3df585c1223ec9acc16c35e541fdc858fb
+  metadata.gz: dd0ae54e3f23f3263904b4911312e73baefb19544dd8ece51949d933b5d97dc39774d82987c990ae9accbbfb98815938b38f85fa01790aefa8fa7478d7ef5ab9
+  data.tar.gz: b4896422846188b55f119070d4a618640f19e36caa3f8382c3cc809d09597c913f33ddb622f361e3c9cc0f728ce7435e7ab8d88ddb670528984ea702c1e31c07

data/lib/rubocop/cop/minitest/assert_equal.rb

@@ -28,7 +28,7 @@ module RuboCop
           }
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           assert_equal(node) do |expected, actual, rest_args|
             basic_arguments = "#{expected.source}, #{actual.source}"
@@ -48,7 +48,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/rubocop/cop/minitest/assert_match.rb

@@ -32,7 +32,7 @@ module RuboCop
           }
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           assert_match(node) do |expected, actual, rest_args|
             basic_arguments = order_expected_and_actual(expected, actual)
@@ -52,7 +52,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

data/lib/rubocop/cop/minitest/assert_same.rb

@@ -36,7 +36,7 @@ module RuboCop
             $_?)
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           if (equal_node, expected_node, actual_node, message_node = assert_with_equal?(node))
             add_offense(node, message: message(expected_node, actual_node, message_node.first)) do |corrector|
@@ -51,7 +51,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

data/lib/rubocop/cop/minitest/empty_line_before_assertion_methods.rb

@@ -23,7 +23,7 @@ module RuboCop
 
         MSG = 'Add empty line before assertion.'
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable-next Metrics/CyclomaticComplexity
         def on_send(node)
           return unless (assertion_method = assertion_method(node))
           return unless (previous_line_node = assertion_method.left_sibling)
@@ -36,7 +36,6 @@ module RuboCop
 
           register_offense(assertion_method, previous_line_node)
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
 
         private
 

data/lib/rubocop/cop/minitest/global_expectations.rb

@@ -136,19 +136,36 @@ module RuboCop
 
         def register_offense(node, method)
           receiver = node.receiver
+          preferred = method ? preferred_method : preferred_receiver(node)
+          message = format(MSG, preferred: preferred)
+
+          add_offense(receiver, message: message) do |corrector|
+            autocorrect(corrector, node, receiver, method)
+          end
+        end
 
+        # Replacing the whole receiver would overlap the correction of a matcher call nested
+        # in that receiver (`a.must_equal(b).must_equal(c)`), so only the DSL method selector
+        # is replaced and new DSL calls are wrapped around the receiver instead.
+        def autocorrect(corrector, node, receiver, method)
           if method
-            preferred = preferred_method
-            replacement = receiver.source.sub(method.to_s, preferred_method.to_s)
+            corrector.replace(dsl_method_selector(receiver), preferred_method.to_s)
+          elsif BLOCK_MATCHERS.include?(node.method_name)
+            autocorrect_block_matcher(corrector, receiver)
           else
-            preferred = preferred_receiver(node)
-            replacement = preferred
+            corrector.wrap(receiver, "#{preferred_method}(", ')')
           end
+        end
 
-          message = format(MSG, preferred: preferred)
+        def dsl_method_selector(receiver)
+          receiver.block_type? ? receiver.send_node.loc.selector : receiver.loc.selector
+        end
 
-          add_offense(receiver, message: message) do |corrector|
-            corrector.replace(receiver, replacement)
+        def autocorrect_block_matcher(corrector, receiver)
+          if receiver.block_type? && receiver.lambda?
+            corrector.replace(receiver, "#{preferred_method} { #{receiver.body.source} }")
+          else
+            corrector.wrap(receiver, "#{preferred_method} { ", ' }')
           end
         end
       end

data/lib/rubocop/cop/minitest/lifecycle_hooks_order.rb

@@ -56,7 +56,7 @@ module RuboCop
           hash[hook] = LIFECYCLE_HOOK_METHODS_IN_ORDER.index(hook) || REGULAR_METHOD_POSITION
         end
 
-        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable-next Metrics/MethodLength
         def on_class(class_node)
           return unless test_class?(class_node)
 
@@ -77,7 +77,6 @@ module RuboCop
             previous_hook_node = node
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         private
 

data/lib/rubocop/cop/minitest/multiple_assertions.rb

@@ -67,10 +67,15 @@ module RuboCop
             assertions_count(node.body) + assertions_count_in_branches(node.branches)
           when :block, :numblock, :itblock
             assertions_count(node.body)
-          when *RuboCop::AST::Node::ASSIGNMENTS
-            assertions_count_in_assignment(node)
           else
-            node.each_child_node.sum { |child| assertions_count(child) }
+            # Splatting the `ASSIGNMENTS` Set into a `when` makes every other node pay a linear scan.
+            # Collapse it into the `case` once the gemspec floor is Ruby 3.1+, which supports `Set#===`.
+            return assertions_count_in_assignment(node) if RuboCop::AST::Node::ASSIGNMENTS.include?(node.type)
+
+            # `each_child_node` without a block allocates an Enumerator per node.
+            total = 0
+            node.each_child_node { |child| total += assertions_count(child) }
+            total
           end
         end
 

data/lib/rubocop/cop/minitest/refute_equal.rb

@@ -32,7 +32,7 @@ module RuboCop
           }
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           refute_equal(node) do |expected, actual, rest_args|
             basic_arguments = "#{expected.source}, #{actual.source}"
@@ -52,7 +52,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/rubocop/cop/minitest/refute_match.rb

@@ -34,7 +34,7 @@ module RuboCop
           }
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           refute_match(node) do |expected, actual, rest_args|
             basic_arguments = order_expected_and_actual(expected, actual)
@@ -54,7 +54,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

data/lib/rubocop/cop/minitest/refute_same.rb

@@ -36,7 +36,7 @@ module RuboCop
             $_?)
         PATTERN
 
-        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable-next Metrics/AbcSize
         def on_send(node)
           if (equal_node, expected_node, actual_node, message_node = refute_with_equal?(node))
             add_offense(node, message: message(expected_node, actual_node, message_node.first)) do |corrector|
@@ -51,7 +51,6 @@ module RuboCop
             end
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

data/lib/rubocop/cop/minitest/useless_assertion.rb

@@ -40,7 +40,7 @@ module RuboCop
 
         private
 
-        # rubocop:disable Metrics
+        # rubocop:disable-next Metrics
         def offense?(node)
           expected, actual, = node.arguments
 
@@ -62,7 +62,6 @@ module RuboCop
             false
           end
         end
-        # rubocop:enable Metrics
 
         def empty_composite?(node)
           return true if node.str_type? && node.value.empty?

data/lib/rubocop/cop/minitest.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Mixins are autoloaded because they're used only when the relevant cop class is loaded.
+    autoload :ArgumentRangeHelper, "#{__dir__}/mixin/argument_range_helper"
+    autoload :InDeltaMixin, "#{__dir__}/mixin/in_delta_mixin"
+    autoload :MinitestCopRule, "#{__dir__}/mixin/minitest_cop_rule"
+    autoload :MinitestExplorationHelpers, "#{__dir__}/mixin/minitest_exploration_helpers"
+
+    # Cops for the `Minitest` department. The department's cops are registered for lazy loading and their files,
+    # along with the mixins they use, are loaded on demand.
+    module Minitest
+      autoload :InstanceOfAssertionHandleable, "#{__dir__}/mixin/instance_of_assertion_handleable"
+      autoload :NilAssertionHandleable, "#{__dir__}/mixin/nil_assertion_handleable"
+      autoload :PredicateAssertionHandleable, "#{__dir__}/mixin/predicate_assertion_handleable"
+
+      extend LazyLoader
+
+      register_cop :AssertEmpty, "#{__dir__}/minitest/assert_empty"
+      register_cop :AssertEmptyLiteral, "#{__dir__}/minitest/assert_empty_literal"
+      register_cop :AssertEqual, "#{__dir__}/minitest/assert_equal"
+      register_cop :AssertInDelta, "#{__dir__}/minitest/assert_in_delta"
+      register_cop :AssertOperator, "#{__dir__}/minitest/assert_operator"
+      register_cop :AssertPredicate, "#{__dir__}/minitest/assert_predicate"
+      register_cop :AssertRaisesCompoundBody, "#{__dir__}/minitest/assert_raises_compound_body"
+      register_cop :AssertRaisesWithRegexpArgument, "#{__dir__}/minitest/assert_raises_with_regexp_argument"
+      register_cop :AssertWithExpectedArgument, "#{__dir__}/minitest/assert_with_expected_argument"
+      register_cop :AssertionInLifecycleHook, "#{__dir__}/minitest/assertion_in_lifecycle_hook"
+      register_cop :AssertKindOf, "#{__dir__}/minitest/assert_kind_of"
+      register_cop :AssertNil, "#{__dir__}/minitest/assert_nil"
+      register_cop :AssertIncludes, "#{__dir__}/minitest/assert_includes"
+      register_cop :AssertInstanceOf, "#{__dir__}/minitest/assert_instance_of"
+      register_cop :AssertMatch, "#{__dir__}/minitest/assert_match"
+      register_cop :AssertOutput, "#{__dir__}/minitest/assert_output"
+      register_cop :AssertPathExists, "#{__dir__}/minitest/assert_path_exists"
+      register_cop :AssertRespondTo, "#{__dir__}/minitest/assert_respond_to"
+      register_cop :AssertSame, "#{__dir__}/minitest/assert_same"
+      register_cop :AssertSilent, "#{__dir__}/minitest/assert_silent"
+      register_cop :AssertTruthy, "#{__dir__}/minitest/assert_truthy"
+      register_cop :DuplicateTestRun, "#{__dir__}/minitest/duplicate_test_run"
+      register_cop :EmptyLineBeforeAssertionMethods, "#{__dir__}/minitest/empty_line_before_assertion_methods"
+      register_cop :Focus, "#{__dir__}/minitest/focus"
+      register_cop :NonExecutableTestMethod, "#{__dir__}/minitest/non_executable_test_method"
+      register_cop :RedundantMessageArgument, "#{__dir__}/minitest/redundant_message_argument"
+      register_cop :ReturnInTestMethod, "#{__dir__}/minitest/return_in_test_method"
+      register_cop :TestFileName, "#{__dir__}/minitest/test_file_name"
+      register_cop :GlobalExpectations, "#{__dir__}/minitest/global_expectations"
+      register_cop :LifecycleHooksOrder, "#{__dir__}/minitest/lifecycle_hooks_order"
+      register_cop :LiteralAsActualArgument, "#{__dir__}/minitest/literal_as_actual_argument"
+      register_cop :MultipleAssertions, "#{__dir__}/minitest/multiple_assertions"
+      register_cop :NoAssertions, "#{__dir__}/minitest/no_assertions"
+      register_cop :NoTestCases, "#{__dir__}/minitest/no_test_cases"
+      register_cop :NonPublicTestMethod, "#{__dir__}/minitest/non_public_test_method"
+      register_cop :RefuteEmpty, "#{__dir__}/minitest/refute_empty"
+      register_cop :RefuteFalse, "#{__dir__}/minitest/refute_false"
+      register_cop :RefuteEqual, "#{__dir__}/minitest/refute_equal"
+      register_cop :RefuteInDelta, "#{__dir__}/minitest/refute_in_delta"
+      register_cop :RefuteIncludes, "#{__dir__}/minitest/refute_includes"
+      register_cop :RefuteInstanceOf, "#{__dir__}/minitest/refute_instance_of"
+      register_cop :RefuteKindOf, "#{__dir__}/minitest/refute_kind_of"
+      register_cop :RefuteMatch, "#{__dir__}/minitest/refute_match"
+      register_cop :RefuteNil, "#{__dir__}/minitest/refute_nil"
+      register_cop :RefuteOperator, "#{__dir__}/minitest/refute_operator"
+      register_cop :RefutePathExists, "#{__dir__}/minitest/refute_path_exists"
+      register_cop :RefutePredicate, "#{__dir__}/minitest/refute_predicate"
+      register_cop :RefuteRespondTo, "#{__dir__}/minitest/refute_respond_to"
+      register_cop :RefuteSame, "#{__dir__}/minitest/refute_same"
+      register_cop :SkipEnsure, "#{__dir__}/minitest/skip_ensure"
+      register_cop :SkipWithoutReason, "#{__dir__}/minitest/skip_without_reason"
+      register_cop :TestMethodName, "#{__dir__}/minitest/test_method_name"
+      register_cop :UnreachableAssertion, "#{__dir__}/minitest/unreachable_assertion"
+      register_cop :UnspecifiedException, "#{__dir__}/minitest/unspecified_exception"
+      register_cop :UselessAssertion, "#{__dir__}/minitest/useless_assertion"
+    end
+  end
+end

data/lib/rubocop/cop/minitest_cops.rb

@@ -1,64 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'mixin/argument_range_helper'
-require_relative 'mixin/in_delta_mixin'
-require_relative 'mixin/instance_of_assertion_handleable'
-require_relative 'mixin/minitest_cop_rule'
-require_relative 'mixin/minitest_exploration_helpers'
-require_relative 'mixin/nil_assertion_handleable'
-require_relative 'mixin/predicate_assertion_handleable'
-require_relative 'minitest/assert_empty'
-require_relative 'minitest/assert_empty_literal'
-require_relative 'minitest/assert_equal'
-require_relative 'minitest/assert_in_delta'
-require_relative 'minitest/assert_operator'
-require_relative 'minitest/assert_predicate'
-require_relative 'minitest/assert_raises_compound_body'
-require_relative 'minitest/assert_raises_with_regexp_argument'
-require_relative 'minitest/assert_with_expected_argument'
-require_relative 'minitest/assertion_in_lifecycle_hook'
-require_relative 'minitest/assert_kind_of'
-require_relative 'minitest/assert_nil'
-require_relative 'minitest/assert_includes'
-require_relative 'minitest/assert_instance_of'
-require_relative 'minitest/assert_match'
-require_relative 'minitest/assert_output'
-require_relative 'minitest/assert_path_exists'
-require_relative 'minitest/assert_respond_to'
-require_relative 'minitest/assert_same'
-require_relative 'minitest/assert_silent'
-require_relative 'minitest/assert_truthy'
-require_relative 'minitest/duplicate_test_run'
-require_relative 'minitest/empty_line_before_assertion_methods'
-require_relative 'minitest/focus'
-require_relative 'minitest/non_executable_test_method'
-require_relative 'minitest/redundant_message_argument'
-require_relative 'minitest/return_in_test_method'
-require_relative 'minitest/test_file_name'
-require_relative 'minitest/global_expectations'
-require_relative 'minitest/lifecycle_hooks_order'
-require_relative 'minitest/literal_as_actual_argument'
-require_relative 'minitest/multiple_assertions'
-require_relative 'minitest/no_assertions'
-require_relative 'minitest/no_test_cases'
-require_relative 'minitest/non_public_test_method'
-require_relative 'minitest/refute_empty'
-require_relative 'minitest/refute_false'
-require_relative 'minitest/refute_equal'
-require_relative 'minitest/refute_in_delta'
-require_relative 'minitest/refute_includes'
-require_relative 'minitest/refute_instance_of'
-require_relative 'minitest/refute_kind_of'
-require_relative 'minitest/refute_match'
-require_relative 'minitest/refute_nil'
-require_relative 'minitest/refute_operator'
-require_relative 'minitest/refute_path_exists'
-require_relative 'minitest/refute_predicate'
-require_relative 'minitest/refute_respond_to'
-require_relative 'minitest/refute_same'
-require_relative 'minitest/skip_ensure'
-require_relative 'minitest/skip_without_reason'
-require_relative 'minitest/test_method_name'
-require_relative 'minitest/unreachable_assertion'
-require_relative 'minitest/unspecified_exception'
-require_relative 'minitest/useless_assertion'
+# @deprecated This file is deprecated. Cops are registered for lazy loading in
+#   `rubocop/cop/minitest`; this file is kept for compatibility with code that
+#   requires it directly.
+require_relative 'minitest'

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

@@ -23,7 +23,7 @@ module RuboCop
         must_output must_pattern_match must_raise must_be_silent must_throw wont_pattern_match
       ].freeze
 
-      MATCHER_METHODS = VALUE_MATCHERS + BLOCK_MATCHERS
+      MATCHER_METHODS = (VALUE_MATCHERS + BLOCK_MATCHERS).to_set.freeze
 
       ASSERTION_PREFIXES = %i[assert refute].freeze
 
@@ -59,9 +59,16 @@ module RuboCop
 
         # Support Active Support's `test 'example' { ... }` method.
         # https://api.rubyonrails.org/classes/ActiveSupport/Testing/Declarative.html
-        test_blocks = class_node.each_descendant(:block).select { |block_node| test_block?(block_node) }
+        test_methods + test_blocks(class_node)
+      end
+
+      def test_blocks(node, found = [])
+        return found if node.type?(:any_def)
+
+        found << node if node.block_type? && test_block?(node)
+        node.each_child_node { |child| test_blocks(child, found) }
 
-        test_methods + test_blocks
+        found
       end
 
       def test_method?(def_node, visibility_check: true)

data/lib/rubocop/minitest/assert_offense.rb

@@ -123,8 +123,11 @@ module RuboCop
     #     end
     #   end
     #
-    # rubocop:disable Metrics/ModuleLength
+    # rubocop:disable-next Metrics/ModuleLength
     module AssertOffense
+      VALID_CONSTANT_NAME = /\A[A-Z]\w*(::[A-Z]\w*)*\z/.freeze
+      private_constant :VALID_CONSTANT_NAME
+
       PLUGIN_INTEGRATION_MUTEX = Mutex.new
       private_constant :PLUGIN_INTEGRATION_MUTEX
 
@@ -192,7 +195,7 @@ module RuboCop
         return unless test_class_name
 
         cop_name = test_class_name.delete_suffix('Test')
-        return if cop_name.empty?
+        return unless cop_name.match?(VALID_CONSTANT_NAME)
 
         constant_from(Object, cop_name) || constant_from(RuboCop::Cop::Minitest, cop_name.split('::').last)
       end
@@ -404,6 +407,5 @@ module RuboCop
         ENV.fetch('PARSER_ENGINE', :parser_whitequark).to_sym
       end
     end
-    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/rubocop/minitest/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Minitest
     # This module holds the RuboCop Minitest version information.
     module Version
-      STRING = '0.40.0'
+      STRING = '0.41.0'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

data/lib/rubocop-minitest.rb

@@ -5,4 +5,4 @@ require 'rubocop'
 require_relative 'rubocop/minitest'
 require_relative 'rubocop/minitest/version'
 require_relative 'rubocop/minitest/plugin'
-require_relative 'rubocop/cop/minitest_cops'
+require_relative 'rubocop/cop/minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -31,7 +31,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.75.0
+        version: 1.89.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -41,7 +41,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.75.0
+        version: 1.89.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -76,6 +76,7 @@ files:
 - README.md
 - config/default.yml
 - lib/rubocop-minitest.rb
+- lib/rubocop/cop/minitest.rb
 - lib/rubocop/cop/minitest/assert_empty.rb
 - lib/rubocop/cop/minitest/assert_empty_literal.rb
 - lib/rubocop/cop/minitest/assert_equal.rb
@@ -152,7 +153,7 @@ metadata:
   homepage_uri: https://docs.rubocop.org/rubocop-minitest/
   changelog_uri: https://github.com/rubocop/rubocop-minitest/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop-minitest
-  documentation_uri: https://docs.rubocop.org/rubocop-minitest/0.40
+  documentation_uri: https://docs.rubocop.org/rubocop-minitest/0.41
   bug_tracker_uri: https://github.com/rubocop/rubocop-minitest/issues
   rubygems_mfa_required: 'true'
   default_lint_roller_plugin: RuboCop::Minitest::Plugin