rubocop-minitest 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c9b3f5ddb92c5f5b813bc30191e4a217e84625fd306708d119fa8214a386d9'
-  data.tar.gz: 864f4e6170234aea432a9b8d14e7fb940c35aa0acb4297871382f75768e686bc
+  metadata.gz: e9952135d079a3cd02bea1c521f30f9a15eca9614caa6730c84d0afce7fca845
+  data.tar.gz: a11c62c0872b7abb891151770cc9008e1c43f0e8753b8371b85ba8c47142bd05
 SHA512:
-  metadata.gz: c6d46818eda0dfcfb3307e5f5d648ce695fcc9054bda0c59ea61a4f894434a57185facdd8a6d44810515a249487c4007ae9424bcc188686fa2e2e0838792ed65
-  data.tar.gz: e64bd49fc78e749da4b3e6422387e8bfe8c5ab7c56d9f64376d3b860adfeb2c6a5c1822ead7bbc282527908e7511e90a72a962f77c9cc9adbd31bb6454e8ed2c
+  metadata.gz: 16fb13dc153d36bd4479690fc2be96dcfc119e9430271231266ba8b150c79871ce1ee417020c9af9a13c31928ea3afd97f23156c975d17ca1be1e2f9f9937770
+  data.tar.gz: f8bd286ee337818358b5e87bb5f375a6d03f2028de3f55481f0a8788013fe4f32314e90985fe967d7a83218dd3c8da0684cdc3b5e998a96f662e644e93c4afd8

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

@@ -9,14 +9,46 @@ module RuboCop
       # @example
       #   # bad
       #   assert("rubocop-minitest" == actual)
+      #   assert_operator("rubocop-minitest", :==, actual)
       #
       #   # good
       #   assert_equal("rubocop-minitest", actual)
       #
       class AssertEqual < Base
-        extend MinitestCopRule
+        include ArgumentRangeHelper
+        extend AutoCorrector
 
-        define_rule :assert, target_method: :==, preferred_method: :assert_equal
+        MSG = 'Prefer using `assert_equal(%<preferred>s)`.'
+        RESTRICT_ON_SEND = %i[assert assert_operator].freeze
+
+        def_node_matcher :assert_equal, <<~PATTERN
+          {
+            (send nil? :assert (send $_ :== $_) $...)
+            (send nil? :assert_operator $_ (sym :==) $_ $...)
+          }
+        PATTERN
+
+        # rubocop:disable Metrics/AbcSize
+        def on_send(node)
+          assert_equal(node) do |expected, actual, rest_args|
+            basic_arguments = "#{expected.source}, #{actual.source}"
+            preferred = (message_arg = rest_args.first) ? "#{basic_arguments}, #{message_arg.source}" : basic_arguments
+            message = format(MSG, preferred: preferred)
+
+            add_offense(node, message: message) do |corrector|
+              corrector.replace(node.loc.selector, 'assert_equal')
+
+              range = if node.method?(:assert)
+                        node.first_argument
+                      else
+                        node.first_argument.source_range.begin.join(node.arguments[2].source_range.end)
+                      end
+
+              corrector.replace(range, basic_arguments)
+            end
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

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

@@ -11,6 +11,7 @@ module RuboCop
       #   assert(matcher.match(string))
       #   assert(matcher.match?(string))
       #   assert(matcher =~ string)
+      #   assert_operator(matcher, :=~, string)
       #   assert(matcher.match(string), 'message')
       #
       #   # good
@@ -18,10 +19,50 @@ module RuboCop
       #   assert_match(matcher, string, 'message')
       #
       class AssertMatch < Base
-        extend MinitestCopRule
+        include ArgumentRangeHelper
+        extend AutoCorrector
 
-        define_rule :assert, target_method: %i[match match? =~],
-                             preferred_method: :assert_match, inverse: 'regexp_type?'
+        MSG = 'Prefer using `assert_match(%<preferred>s)`.'
+        RESTRICT_ON_SEND = %i[assert assert_operator].freeze
+
+        def_node_matcher :assert_match, <<~PATTERN
+          {
+            (send nil? :assert (send $_ {:match :match? :=~} $_) $...)
+            (send nil? :assert_operator $_ (sym :=~) $_ $...)
+          }
+        PATTERN
+
+        # rubocop:disable Metrics/AbcSize
+        def on_send(node)
+          assert_match(node) do |expected, actual, rest_args|
+            basic_arguments = order_expected_and_actual(expected, actual)
+            preferred = (message_arg = rest_args.first) ? "#{basic_arguments}, #{message_arg.source}" : basic_arguments
+            message = format(MSG, preferred: preferred)
+
+            add_offense(node, message: message) do |corrector|
+              corrector.replace(node.loc.selector, 'assert_match')
+
+              range = if node.method?(:assert)
+                        node.first_argument
+                      else
+                        node.first_argument.source_range.begin.join(node.arguments[2].source_range.end)
+                      end
+
+              corrector.replace(range, basic_arguments)
+            end
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        private
+
+        def order_expected_and_actual(expected, actual)
+          if actual.regexp_type?
+            [actual, expected]
+          else
+            [expected, actual]
+          end.map(&:source).join(', ')
+        end
       end
     end
   end

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

@@ -18,10 +18,14 @@ module RuboCop
 
         MSG = 'Prefer using `assert_operator(%<new_arguments>s)`.'
         RESTRICT_ON_SEND = %i[assert].freeze
+        ALLOWED_OPERATORS = [:[]].freeze
 
         def on_send(node)
           first_argument = node.first_argument
-          return unless first_argument.respond_to?(:operator_method?) && first_argument.operator_method?
+          return unless first_argument.respond_to?(:binary_operation?) && first_argument.binary_operation?
+
+          operator = first_argument.to_a[1]
+          return if ALLOWED_OPERATORS.include?(operator)
 
           new_arguments = build_new_arguments(node)
 

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

@@ -9,6 +9,9 @@ module RuboCop
       # @example
       #   # bad
       #   assert("rubocop-minitest" != actual)
+      #   refute("rubocop-minitest" == actual)
+      #   assert_operator("rubocop-minitest", :!=, actual)
+      #   refute_operator("rubocop-minitest", :==, actual)
       #
       #   # good
       #   refute_equal("rubocop-minitest", actual)
@@ -18,45 +21,38 @@ module RuboCop
         extend AutoCorrector
 
         MSG = 'Prefer using `refute_equal(%<preferred>s)`.'
-        RESTRICT_ON_SEND = %i[assert].freeze
-
-        def_node_matcher :assert_not_equal, <<~PATTERN
-          (send nil? :assert (send $_ :!= $_) $... )
+        RESTRICT_ON_SEND = %i[assert refute assert_operator refute_operator].freeze
+
+        def_node_matcher :refute_equal, <<~PATTERN
+          {
+            (send nil? :assert (send $_ :!= $_) $...)
+            (send nil? :refute (send $_ :== $_) $...)
+            (send nil? :assert_operator $_ (sym :!=) $_ $...)
+            (send nil? :refute_operator $_ (sym :==) $_ $...)
+          }
         PATTERN
 
+        # rubocop:disable Metrics/AbcSize
         def on_send(node)
-          preferred = process_not_equal(node)
-          return unless preferred
-
-          assert_not_equal(node) do |expected, actual|
+          refute_equal(node) do |expected, actual, rest_args|
+            basic_arguments = "#{expected.source}, #{actual.source}"
+            preferred = (message_arg = rest_args.first) ? "#{basic_arguments}, #{message_arg.source}" : basic_arguments
             message = format(MSG, preferred: preferred)
 
             add_offense(node, message: message) do |corrector|
               corrector.replace(node.loc.selector, 'refute_equal')
 
-              replacement = [expected, actual].map(&:source).join(', ')
-              corrector.replace(node.first_argument, replacement)
-            end
-          end
-        end
-
-        private
+              range = if node.method?(:assert) || node.method?(:refute)
+                        node.first_argument
+                      else
+                        node.first_argument.source_range.begin.join(node.arguments[2].source_range.end)
+                      end
 
-        def preferred_usage(first_arg, second_arg, custom_message = nil)
-          [first_arg, second_arg, custom_message].compact.map(&:source).join(', ')
-        end
-
-        def original_usage(first_part, custom_message)
-          [first_part, custom_message].compact.join(', ')
-        end
-
-        def process_not_equal(node)
-          assert_not_equal(node) do |first_arg, second_arg, rest_args|
-            custom_message = rest_args.first
-
-            preferred_usage(first_arg, second_arg, custom_message)
+              corrector.replace(range, basic_arguments)
+            end
           end
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

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

@@ -11,6 +11,8 @@ module RuboCop
       #   refute(matcher.match(string))
       #   refute(matcher.match?(string))
       #   refute(matcher =~ string)
+      #   refute_operator(matcher, :=~, string)
+      #   assert_operator(matcher, :!~, string)
       #   refute(matcher.match(string), 'message')
       #
       #   # good
@@ -18,10 +20,51 @@ module RuboCop
       #   refute_match(matcher, string, 'message')
       #
       class RefuteMatch < Base
-        extend MinitestCopRule
+        include ArgumentRangeHelper
+        extend AutoCorrector
 
-        define_rule :refute, target_method: %i[match match? =~],
-                             preferred_method: :refute_match, inverse: 'regexp_type?'
+        MSG = 'Prefer using `refute_match(%<preferred>s)`.'
+        RESTRICT_ON_SEND = %i[refute refute_operator assert_operator].freeze
+
+        def_node_matcher :refute_match, <<~PATTERN
+          {
+            (send nil? :refute (send $_ {:match :match? :=~} $_) $...)
+            (send nil? :refute_operator $_ (sym :=~) $_ $...)
+            (send nil? :assert_operator $_ (sym :!~) $_ $...)
+          }
+        PATTERN
+
+        # rubocop:disable Metrics/AbcSize
+        def on_send(node)
+          refute_match(node) do |expected, actual, rest_args|
+            basic_arguments = order_expected_and_actual(expected, actual)
+            preferred = (message_arg = rest_args.first) ? "#{basic_arguments}, #{message_arg.source}" : basic_arguments
+            message = format(MSG, preferred: preferred)
+
+            add_offense(node, message: message) do |corrector|
+              corrector.replace(node.loc.selector, 'refute_match')
+
+              range = if node.method?(:refute)
+                        node.first_argument
+                      else
+                        node.first_argument.source_range.begin.join(node.arguments[2].source_range.end)
+                      end
+
+              corrector.replace(range, basic_arguments)
+            end
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        private
+
+        def order_expected_and_actual(expected, actual)
+          if actual.regexp_type?
+            [actual, expected]
+          else
+            [expected, actual]
+          end.map(&:source).join(', ')
+        end
       end
     end
   end

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

@@ -18,10 +18,14 @@ module RuboCop
 
         MSG = 'Prefer using `refute_operator(%<new_arguments>s)`.'
         RESTRICT_ON_SEND = %i[refute].freeze
+        ALLOWED_OPERATORS = [:[]].freeze
 
         def on_send(node)
           first_argument = node.first_argument
-          return unless first_argument.respond_to?(:operator_method?) && first_argument.operator_method?
+          return unless first_argument.respond_to?(:binary_operation?) && first_argument.binary_operation?
+
+          operator = first_argument.to_a[1]
+          return if ALLOWED_OPERATORS.include?(operator)
 
           new_arguments = build_new_arguments(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.32.1'
+      STRING = '0.33.0'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -117,7 +117,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.32
+  documentation_uri: https://docs.rubocop.org/rubocop-minitest/0.33
   bug_tracker_uri: https://github.com/rubocop/rubocop-minitest/issues
   rubygems_mfa_required: 'true'
 post_install_message: