Merge pull request #181 from koic/fix_an_incorrect_autocorrect_for_mi…

…nitest_assert_match

Fix an incorrect autocorrect for `Minitest/AssertMatch`

changelog/fix_an_incorrect_autocorrect_for_minitest_assert_match.md

@@ -0,0 +1 @@
+* [#181](https://github.com/rubocop/rubocop-minitest/pull/181): Fix an incorrect autocorrect for `Minitest/AssertMatch` when `assert` with `match` and RHS is a regexp literal. ([@koic][])

lib/rubocop/cop/minitest/assert_match.rb

@@ -18,7 +18,7 @@ module Minitest
       class AssertMatch < Base
         extend MinitestCopRule
 
-        define_rule :assert, target_method: :match
+        define_rule :assert, target_method: :match, inverse: 'regexp_type?'
       end
     end
   end

lib/rubocop/cop/mixin/minitest_cop_rule.rb

@@ -19,7 +19,8 @@ module MinitestCopRule
       #                                  autocorrection. The preferred method name that connects
       #                                  `assertion_method` and `target_method` with `_` is
       #                                  the default name.
-      # @param inverse [Boolean] An optional param. Order of arguments replaced by autocorrection.
+      # @param inverse [Boolean, String] An optional param. Order of arguments replaced by autocorrection.
+      #                                  If string is passed, it becomes a predicate method for the first argument node.
       # @api private
       #
       def define_rule(assertion_method, target_method:, preferred_method: nil, inverse: false)
@@ -78,10 +79,15 @@ def offense_message(arguments)
 
           def new_arguments(arguments)
             receiver = correct_receiver(arguments.first.receiver)
-            method_argument = arguments.first.arguments.first&.source
+            method_argument = arguments.first.arguments.first
 
-            new_arguments = [receiver, method_argument].compact
-            new_arguments.reverse! if #{inverse}
+            new_arguments = [receiver, method_argument&.source].compact
+            inverse_condition = if %w[true false].include?('#{inverse}')
+              #{inverse}
+            else
+              method_argument.#{inverse}
+            end
+            new_arguments.reverse! if inverse_condition
             new_arguments
           end
 

test/rubocop/cop/minitest/assert_match_test.rb

@@ -22,6 +22,44 @@ def test_do_something
     RUBY
   end
 
+  def test_registers_offense_when_using_assert_with_match_and_lhs_is_regexp_literal
+    assert_offense(<<~RUBY)
+      class FooTest < Minitest::Test
+        def test_do_something
+          assert(/regexp/.match(object))
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer using `assert_match(/regexp/, object)`.
+        end
+      end
+    RUBY
+
+    assert_correction(<<~RUBY)
+      class FooTest < Minitest::Test
+        def test_do_something
+          assert_match(/regexp/, object)
+        end
+      end
+    RUBY
+  end
+
+  def test_registers_offense_when_using_assert_with_match_and_rhs_is_regexp_literal
+    assert_offense(<<~RUBY)
+      class FooTest < Minitest::Test
+        def test_do_something
+          assert(object.match(/regexp/))
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer using `assert_match(/regexp/, object)`.
+        end
+      end
+    RUBY
+
+    assert_correction(<<~RUBY)
+      class FooTest < Minitest::Test
+        def test_do_something
+          assert_match(/regexp/, object)
+        end
+      end
+    RUBY
+  end
+
   def test_registers_offense_when_using_assert_with_match_and_message
     assert_offense(<<~RUBY, @cop)
       class FooTest < Minitest::Test