rubocop-minitest 0.10.3 → 0.13.0

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

@@ -15,7 +15,7 @@ module RuboCop
       #   refute_includes(collection, object)
       #   refute_includes(collection, object, 'message')
       #
-      class RefuteIncludes < Cop
+      class RefuteIncludes < Base
         extend MinitestCopRule
 
         define_rule :refute, target_method: :include?, preferred_method: :refute_includes

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

@@ -15,7 +15,7 @@ module RuboCop
       #   refute_instance_of(Class, object)
       #   refute_instance_of(Class, object, 'message')
       #
-      class RefuteInstanceOf < Cop
+      class RefuteInstanceOf < Base
         extend MinitestCopRule
 
         define_rule :refute, target_method: :instance_of?, inverse: true

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

@@ -15,7 +15,7 @@ module RuboCop
       #   refute_kind_of(Class, object)
       #   refute_kind_of(Class, object, 'message')
       #
-      class RefuteKindOf < Cop
+      class RefuteKindOf < Base
         extend MinitestCopRule
 
         define_rule :refute, target_method: :kind_of?, inverse: true

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

@@ -15,7 +15,7 @@ module RuboCop
       #   refute_match(matcher, string)
       #   refute_match(matcher, string, 'message')
       #
-      class RefuteMatch < Cop
+      class RefuteMatch < Base
         extend MinitestCopRule
 
         define_rule :refute, target_method: :match

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

@@ -15,11 +15,13 @@ module RuboCop
       #   refute_nil(actual)
       #   refute_nil(actual, 'message')
       #
-      class RefuteNil < Cop
+      class RefuteNil < Base
         include ArgumentRangeHelper
+        extend AutoCorrector
 
         MSG = 'Prefer using `refute_nil(%<arguments>s)` over ' \
               '`refute_equal(nil, %<arguments>s)`.'
+        RESTRICT_ON_SEND = %i[refute_equal].freeze
 
         def_node_matcher :refute_equal_with_nil, <<~PATTERN
           (send nil? :refute_equal nil $_ $...)
@@ -31,13 +33,7 @@ module RuboCop
 
             arguments = [actual.source, message&.source].compact.join(', ')
 
-            add_offense(node, message: format(MSG, arguments: arguments))
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            refute_equal_with_nil(node) do |actual|
+            add_offense(node, message: format(MSG, arguments: arguments)) do |corrector|
               corrector.replace(node.loc.selector, 'refute_nil')
               corrector.replace(
                 first_and_second_arguments_range(node), actual.source

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

@@ -15,8 +15,11 @@ module RuboCop
       #   refute_path_exists(path)
       #   refute_path_exists(path, 'message')
       #
-      class RefutePathExists < Cop
+      class RefutePathExists < Base
+        extend AutoCorrector
+
         MSG = 'Prefer using `%<good_method>s` over `%<bad_method>s`.'
+        RESTRICT_ON_SEND = %i[refute].freeze
 
         def_node_matcher :refute_file_exists, <<~PATTERN
           (send nil? :refute
@@ -31,17 +34,8 @@ module RuboCop
             good_method = build_good_method(path, failure_message)
             message = format(MSG, good_method: good_method, bad_method: node.source)
 
-            add_offense(node, message: message)
-          end
-        end
-
-        def autocorrect(node)
-          refute_file_exists(node) do |path, failure_message|
-            failure_message = failure_message.first
-
-            lambda do |corrector|
-              replacement = build_good_method(path, failure_message)
-              corrector.replace(node, replacement)
+            add_offense(node, message: message) do |corrector|
+              corrector.replace(node, good_method)
             end
           end
         end

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

@@ -17,7 +17,7 @@ module RuboCop
       #   refute_respond_to(object, :do_something, 'message')
       #   refute_respond_to(self, :do_something)
       #
-      class RefuteRespondTo < Cop
+      class RefuteRespondTo < Base
         extend MinitestCopRule
 
         define_rule :refute, target_method: :respond_to?

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

@@ -27,9 +27,10 @@ module RuboCop
       #     end
       #   end
       #
-      class TestMethodName < Cop
+      class TestMethodName < Base
         include MinitestExplorationHelpers
         include DefNode
+        extend AutoCorrector
 
         MSG = 'Test method name should start with `test_` prefix.'
 
@@ -37,13 +38,13 @@ module RuboCop
           return unless test_class?(class_node)
 
           class_elements(class_node).each do |node|
-            add_offense(node, location: :name) if offense?(node)
-          end
-        end
+            next unless offense?(node)
+
+            test_method_name = node.loc.name
 
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.replace(node.loc.name, "test_#{node.method_name}")
+            add_offense(test_method_name) do |corrector|
+              corrector.replace(test_method_name, "test_#{node.method_name}")
+            end
           end
         end
 
@@ -61,7 +62,7 @@ module RuboCop
         end
 
         def offense?(node)
-          return false if node.each_child_node(:send).none? { |send_node| assertion_method?(send_node.method_name) }
+          return false if assertions(node).none?
 
           public?(node) && node.arguments.empty? && !test_method_name?(node) && !lifecycle_hook_method?(node)
         end

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

@@ -14,7 +14,7 @@ module RuboCop
       #   assert_raises(FooException) { raise FooException }
       #   assert_raises(FooException, 'This should have raised') { raise FooException }
       #
-      class UnspecifiedException < Cop
+      class UnspecifiedException < Base
         MSG = 'Specify the exception being captured.'
 
         def on_block(block_node)

data/lib/rubocop/cop/minitest_cops.rb

@@ -8,6 +8,7 @@ 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_with_expected_argument'
 require_relative 'minitest/assertion_in_lifecycle_hook'
 require_relative 'minitest/assert_kind_of'
 require_relative 'minitest/assert_nil'
@@ -22,6 +23,7 @@ require_relative 'minitest/assert_truthy'
 require_relative 'minitest/global_expectations'
 require_relative 'minitest/literal_as_actual_argument'
 require_relative 'minitest/multiple_assertions'
+require_relative 'minitest/no_assertions'
 require_relative 'minitest/refute_empty'
 require_relative 'minitest/refute_false'
 require_relative 'minitest/refute_equal'

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

@@ -9,24 +9,14 @@ module RuboCop
       def on_send(node)
         equal_floats_call(node) do |expected, actual, message|
           message = message.first
+          good_method = build_good_method(expected, actual, message)
 
           if expected.float_type? || actual.float_type?
-            message = format(MSG,
-                             good_method: build_good_method(expected, actual, message),
-                             bad_method: node.source)
+            message = format(MSG, good_method: good_method, bad_method: node.source)
 
-            add_offense(node, message: message)
-          end
-        end
-      end
-
-      def autocorrect(node)
-        equal_floats_call(node) do |expected, actual, message|
-          message = message.first
-          replacement = build_good_method(expected, actual, message)
-
-          lambda do |corrector|
-            corrector.replace(node, replacement)
+            add_offense(node, message: message) do |corrector|
+              corrector.replace(node, good_method)
+            end
           end
         end
       end

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

@@ -26,32 +26,32 @@ module RuboCop
 
         class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
           include ArgumentRangeHelper
+          extend AutoCorrector
 
           MSG = 'Prefer using `#{preferred_method}(%<new_arguments>s)` over ' \
                 '`#{assertion_method}(%<original_arguments>s)`.'
+          RESTRICT_ON_SEND = %i[#{assertion_method}].freeze
 
           def on_send(node)
             return unless node.method?(:#{assertion_method})
             return unless (arguments = peel_redundant_parentheses_from(node.arguments))
             return unless arguments.first.respond_to?(:method?) && arguments.first.method?(:#{target_method})
 
-            add_offense(node, message: offense_message(arguments))
+            add_offense(node, message: offense_message(arguments)) do |corrector|
+              autocorrect(corrector, node, arguments)
+            end
           end
 
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.selector, '#{preferred_method}')
-
-              arguments = peel_redundant_parentheses_from(node.arguments)
+          def autocorrect(corrector, node, arguments)
+            corrector.replace(node.loc.selector, '#{preferred_method}')
 
-              new_arguments = new_arguments(arguments).join(', ')
+            new_arguments = new_arguments(arguments).join(', ')
 
-              if enclosed_in_redundant_parentheses?(node)
-                new_arguments = '(' + new_arguments + ')'
-              end
-
-              corrector.replace(first_argument_range(node), new_arguments)
+            if enclosed_in_redundant_parentheses?(node)
+              new_arguments = '(' + new_arguments + ')'
             end
+
+            corrector.replace(first_argument_range(node), new_arguments)
           end
 
           private

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

@@ -19,6 +19,8 @@ module RuboCop
         refute_respond_to refute_same
       ].freeze
 
+      FLUNK = 'flunk'
+
       LIFECYCLE_HOOK_METHODS = %i[
         before_setup
         setup
@@ -42,8 +44,13 @@ module RuboCop
       end
 
       def test_cases(class_node)
-        class_def_nodes(class_node)
-          .select { |def_node| test_case_name?(def_node.method_name) }
+        test_cases = class_def_nodes(class_node).select { |def_node| test_case_name?(def_node.method_name) }
+
+        # 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| block_node.method?(:test) }
+
+        test_cases + test_blocks
       end
 
       def lifecycle_hooks(class_node)
@@ -82,11 +89,14 @@ module RuboCop
 
       def assertion?(node)
         node.send_type? &&
-          ASSERTION_PREFIXES.any? { |prefix| node.method_name.to_s.start_with?(prefix) }
+          ASSERTION_PREFIXES.any? do |prefix|
+            method_name = node.method_name.to_s
+            method_name == FLUNK || method_name.start_with?(prefix)
+          end
       end
 
       def assertion_method?(method_name)
-        ASSERTION_METHODS.include?(method_name)
+        method_name == FLUNK || ASSERTION_METHODS.include?(method_name)
       end
 
       def lifecycle_hook_method?(node)

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.10.3'
+      STRING = '0.13.0'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

data/mkdocs.yml

@@ -1,5 +1,5 @@
 site_name: "A RuboCop extension focused on enforcing Minitest best practices and coding conventions."
-repo_url: https://github.com/rubocop-hq/rubocop-minitest
+repo_url: https://github.com/rubocop/rubocop-minitest
 edit_uri: edit/master/legacy-docs/
 copyright: "Copyright © 2021 Bozhidar Batsov, Jonas Arvidsson, Koichi ITO, and RuboCop contributors"
 docs_dir: legacy-docs

data/relnotes/v0.1.0.md

@@ -1,7 +1,7 @@
 ### New features
 
 * Create RuboCop Minitest gem. ([@koic][])
-* [#6](https://github.com/rubocop-hq/rubocop-minitest/pull/6): Add new `Minitest/AssertNil` cop. ([@duduribeiro ][])
+* [#6](https://github.com/rubocop/rubocop-minitest/pull/6): Add new `Minitest/AssertNil` cop. ([@duduribeiro ][])
 
 [@koic]: https://github.com/koic
 [@duduribeiro]: https://github.com/duduribeiro

data/relnotes/v0.10.0.md

@@ -1,20 +1,20 @@
 ### New features
 
-* [#92](https://github.com/rubocop-hq/rubocop-minitest/pull/92): Add new `Minitest/LiteralAsActualArgument` cop. ([@fatkodima][], [@tsmmark][])
-* [#95](https://github.com/rubocop-hq/rubocop-minitest/pull/95): Add new `Minitest/AssertionInLifecycleHook` cop. ([@fatkodima][])
-* [#91](https://github.com/rubocop-hq/rubocop-minitest/pull/91): Add new `Minitest/AssertInDelta` and `Minitest/RefuteInDelta` cops. ([@fatkodima][])
-* [#89](https://github.com/rubocop-hq/rubocop-minitest/pull/89): Add new `Minitest/TestMethodName` cop. ([@fatkodima][])
-* [#83](https://github.com/rubocop-hq/rubocop-minitest/pull/83): New cops `AssertPathExists` and `RefutePathExists` check for use of `assert_path_exists`/`refute_path_exists` instead of `assert(File.exist?(path))`/`refute(File.exist?(path))`. ([@fatkodima][])
-* [#88](https://github.com/rubocop-hq/rubocop-minitest/pull/88): Add new `Minitest/MultipleAssertions` cop. ([@fatkodima][])
-* [#87](https://github.com/rubocop-hq/rubocop-minitest/pull/87): Add new `Minitest/AssertSilent` cop. ([@fatkodima][])
-* [#96](https://github.com/rubocop-hq/rubocop-minitest/pull/96): Add new `Minitest/UnspecifiedException` cop. ([@fatkodima][])
-* [#98](https://github.com/rubocop-hq/rubocop-minitest/pull/98): Add new `Minitest/AssertOutput` cop. ([@fatkodima][])
-* [#84](https://github.com/rubocop-hq/rubocop-minitest/pull/84): New cops `AssertKindOf` and `RefuteKindOf` check for use of `assert_kind_of`/`refute_kind_of` instead of `assert(foo.kind_of?(Class))`/`refute(foo.kind_of?(Class))`. ([@fatkodima][])
-* [#85](https://github.com/rubocop-hq/rubocop-minitest/pull/85): Add autocorrect to `Rails/AssertEmptyLiteral` cop. ([@fatkodima][])
+* [#92](https://github.com/rubocop/rubocop-minitest/pull/92): Add new `Minitest/LiteralAsActualArgument` cop. ([@fatkodima][], [@tsmmark][])
+* [#95](https://github.com/rubocop/rubocop-minitest/pull/95): Add new `Minitest/AssertionInLifecycleHook` cop. ([@fatkodima][])
+* [#91](https://github.com/rubocop/rubocop-minitest/pull/91): Add new `Minitest/AssertInDelta` and `Minitest/RefuteInDelta` cops. ([@fatkodima][])
+* [#89](https://github.com/rubocop/rubocop-minitest/pull/89): Add new `Minitest/TestMethodName` cop. ([@fatkodima][])
+* [#83](https://github.com/rubocop/rubocop-minitest/pull/83): New cops `AssertPathExists` and `RefutePathExists` check for use of `assert_path_exists`/`refute_path_exists` instead of `assert(File.exist?(path))`/`refute(File.exist?(path))`. ([@fatkodima][])
+* [#88](https://github.com/rubocop/rubocop-minitest/pull/88): Add new `Minitest/MultipleAssertions` cop. ([@fatkodima][])
+* [#87](https://github.com/rubocop/rubocop-minitest/pull/87): Add new `Minitest/AssertSilent` cop. ([@fatkodima][])
+* [#96](https://github.com/rubocop/rubocop-minitest/pull/96): Add new `Minitest/UnspecifiedException` cop. ([@fatkodima][])
+* [#98](https://github.com/rubocop/rubocop-minitest/pull/98): Add new `Minitest/AssertOutput` cop. ([@fatkodima][])
+* [#84](https://github.com/rubocop/rubocop-minitest/pull/84): New cops `AssertKindOf` and `RefuteKindOf` check for use of `assert_kind_of`/`refute_kind_of` instead of `assert(foo.kind_of?(Class))`/`refute(foo.kind_of?(Class))`. ([@fatkodima][])
+* [#85](https://github.com/rubocop/rubocop-minitest/pull/85): Add autocorrect to `Rails/AssertEmptyLiteral` cop. ([@fatkodima][])
 
 ### Changes
 
-* [#104](https://github.com/rubocop-hq/rubocop-minitest/pull/104): Require RuboCop 0.87 or higher. ([@koic][])
+* [#104](https://github.com/rubocop/rubocop-minitest/pull/104): Require RuboCop 0.87 or higher. ([@koic][])
 
 [@fatkodima]: https://github.com/fatkodima
 [@tsmmark]: https://github.com/tsmmark

data/relnotes/v0.10.1.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#106](https://github.com/rubocop-hq/rubocop-minitest/issues/106): Fix an error for `Minitest/AssertOutput` when using gvar at top level. ([@koic][])
+* [#106](https://github.com/rubocop/rubocop-minitest/issues/106): Fix an error for `Minitest/AssertOutput` when using gvar at top level. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.10.2.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#113](https://github.com/rubocop-hq/rubocop-minitest/issues/113): This PR fixes an error for `Minitest/AssertEqual` and some cops when using `assert` with block argument. ([@koic][])
+* [#113](https://github.com/rubocop/rubocop-minitest/issues/113): This PR fixes an error for `Minitest/AssertEqual` and some cops when using `assert` with block argument. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.10.3.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#115](https://github.com/rubocop-hq/rubocop-minitest/issues/115): Fix a false positive for `Minitest/TestMethodName` for when defining test method has an argument, and test method without assertion methods. ([@koic][])
+* [#115](https://github.com/rubocop/rubocop-minitest/issues/115): Fix a false positive for `Minitest/TestMethodName` for when defining test method has an argument, and test method without assertion methods. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.11.0.md

@@ -0,0 +1,16 @@
+### New features
+
+* [#117](https://github.com/rubocop/rubocop-minitest/issues/117): Add new cop `Minitest/AssertWithExpectedArgument` to check for unintended usages of `assert` instead of `assert_equal`. ([@cstyles][])
+
+### Bug fixes
+
+* [#122](https://github.com/rubocop/rubocop-minitest/pull/122): Fix `Minitest/TestMethodName` for tests with multiple assertions. ([@ghiculescu][])
+
+### Changes
+
+* [#118](https://github.com/rubocop/rubocop-minitest/pull/118): **(BREAKING)** Fix `Minitest/AssertEmptyLiteral` by making it check for `assert_equal([], array)` instead of `assert([], array)`. ([@cstyles][])
+* [#125](https://github.com/rubocop/rubocop-minitest/pull/125): Require RuboCop 0.90 or higher. ([@koic][])
+
+[@cstyles]: https://github.com/cstyles
+[@ghiculescu]: https://github.com/ghiculescu
+[@koic]: https://github.com/koic

data/relnotes/v0.11.1.md

@@ -0,0 +1,5 @@
+### Changes
+
+* [#126](https://github.com/rubocop/rubocop-minitest/issues/126): Mark `Minitest/AssertWithExpectedArgument` as unsafe. ([@koic][])
+
+[@koic]: https://github.com/koic

data/relnotes/v0.12.0.md

@@ -0,0 +1,10 @@
+### New features
+
+* [#124](https://github.com/rubocop/rubocop-minitest/pull/124): Add new `Minitest/NoAssertions` cop. ([@ghiculescu][])
+
+### Changes
+
+* [#129](https://github.com/rubocop/rubocop-minitest/pull/129): Drop Ruby 2.4 support. ([@koic][])
+
+[@ghiculescu]: https://github.com/ghiculescu
+[@koic]: https://github.com/koic

data/relnotes/v0.12.1.md

@@ -0,0 +1,5 @@
+### Bug fixes
+
+* [#131](https://github.com/rubocop/rubocop-minitest/issues/131): Fix an error for `Minitest/MultipleAssertions` and fixes a false positive for `test` block. ([@koic][])
+
+[@koic]: https://github.com/koic

data/relnotes/v0.13.0.md

@@ -0,0 +1,5 @@
+### New features
+
+* [#136](https://github.com/rubocop/rubocop-minitest/pull/136): Support Active Support's `test` method for `Minitest/MultipleAssertions` and `Minitest/NoAssertions` cops. ([@koic][])
+
+[@koic]: https://github.com/koic

data/relnotes/v0.2.0.md

@@ -1,9 +1,9 @@
 ### New features
 
-* [#11](https://github.com/rubocop-hq/rubocop-minitest/pull/11): Add new `Minitest/RefuteNil` cop. ([@tejasbubane ][])
-* [#8](https://github.com/rubocop-hq/rubocop-minitest/pull/8): Add new `Minitest/AssertTruthy` cop. ([@abhaynikam ][])
-* [#9](https://github.com/rubocop-hq/rubocop-minitest/pull/9): Add new `Minitest/AssertIncludes` cop. ([@abhaynikam ][])
-* [#10](https://github.com/rubocop-hq/rubocop-minitest/pull/10): Add new `Minitest/AssertEmpty` cop. ([@abhaynikam ][])
+* [#11](https://github.com/rubocop/rubocop-minitest/pull/11): Add new `Minitest/RefuteNil` cop. ([@tejasbubane ][])
+* [#8](https://github.com/rubocop/rubocop-minitest/pull/8): Add new `Minitest/AssertTruthy` cop. ([@abhaynikam ][])
+* [#9](https://github.com/rubocop/rubocop-minitest/pull/9): Add new `Minitest/AssertIncludes` cop. ([@abhaynikam ][])
+* [#10](https://github.com/rubocop/rubocop-minitest/pull/10): Add new `Minitest/AssertEmpty` cop. ([@abhaynikam ][])
 
 [@tejasbubane]: https://github.com/tejasbubane
 [@abhaynikam]: https://github.com/abhaynikam