rubocop-minitest 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '06679af4eeb82332ac490d8aceb5cd0668cb3686e1bf7f7d8fb83d1bc6d99f50'
-  data.tar.gz: f967a4cff6cfdc23182befb62fbc4363197213065acb21da6fc99e62d685951d
+SHA1:
+  metadata.gz: ba7306fba69394bb98154a2d39b7f755587ad0e4
+  data.tar.gz: 9d20cb250e999413a04620cfbe0eb5c930a3b83e
 SHA512:
-  metadata.gz: 3b2bbdefbd8de0346adb4b06884ab674ed88588bfaf8550ebcbadcd8f07be0199a0270c50ac15a9f36f607e157b3edde095db6e7caf3814cd8ff9ecc7350b9f3
-  data.tar.gz: 0f45beaa717b0d0135dd41462d372a794a66aea60e700f6cd942b79cd01a61f69914d45ad83ccad26ca95aa88b681d20f04b6b2b2e0a5278464399ef1a8ee47c
+  metadata.gz: c9e12069624b30051284458118b7447fd5d52697d97cbd150f1062898cbd2a5975d2bb24d13185afd94b13ad40702a242ba180c1484e2b6761f0218f30e0bab3
+  data.tar.gz: f33c1179084c1ac358d702c4537b84eba697851368a6c3d9245e54abf20e4acd4149c7d0bfb833ee3c9b42537cde7d0bfca6bd30420fd1e1480e5386490d0d6c

data/.circleci/config.yml

@@ -35,6 +35,9 @@ workflows:
       - rake_default:
           name: Ruby 2.6
           image: circleci/ruby:2.6
+      - rake_default:
+          name: Ruby 2.7
+          image: circleci/ruby:2.7
       - rake_default:
           name: Ruby HEAD
           image: rubocophq/circleci-ruby-snapshot:latest # Nightly snapshot build

data/.github/FUNDING.yml

@@ -1,6 +1,7 @@
 # These are supported funding model platforms
 
-github: bbatsov
+github: [bbatsov, koic]
 patreon: bbatsov
 open_collective: rubocop
+tidelift: "rubygems/rubocop"
 custom: https://www.paypal.me/bbatsov

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-07 15:41:02 +0900 using RuboCop version 0.74.0.
+# on 2019-12-21 01:15:41 +0900 using RuboCop version 0.78.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,14 +10,14 @@
 Metrics/AbcSize:
   Max: 17
 
-# Offense count: 5
+# Offense count: 19
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
-# Offense count: 2
+# Offense count: 40
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 87
+Layout/LineLength:
+  Max: 90

data/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 ## master (unreleased)
 
+## 0.6.1 (2020-02-18)
+
+### Bug fixes
+
+* [#52](https://github.com/rubocop-hq/rubocop-minitest/issues/52): Make `Minitest/RefuteFalse` cop aware of `assert(!test)`. ([@koic][])
+* [#52](https://github.com/rubocop-hq/rubocop-minitest/issues/52): Fix a false negative for `Minitest/AssertIncludes` and `Minitest/RefuteIncludes` when an argument is enclosed in redundant parentheses. ([@koic][])
+
+## 0.6.0 (2020-02-07)
+
+### New features
+
+* [#49](https://github.com/rubocop-hq/rubocop-minitest/pull/49): New cops `AssertMatch` and `RefuteMatch` check for use of `assert_match`/`refute_match` instead of `assert(foo.match(bar))`/`refute(foo.match(bar))`. ([@fsateler][])
+
+## 0.5.1 (2019-12-25)
+
+### Bug fixes
+
+* [#42](https://github.com/rubocop-hq/rubocop-minitest/issues/42): Fix an incorrect autocorrect for some cops of `Minitest` department when using heredoc message. ([@koic][])
+
+## 0.5.0 (2019-11-24)
+
+### New features
+
+* [#32](https://github.com/rubocop-hq/rubocop-minitest/issues/32): Add new `Minitest/AssertEmptyLiteral` cop. ([@tejasbubane][])
+
+## 0.4.1 (2019-11-10)
+
+### Bug fixes
+
+* [#39](https://github.com/rubocop-hq/rubocop-minitest/issues/39): Fix an incorrect autocorrect for `Minitest/AssertRespondTo` and `Minitest/RefuteRespondTo` when using assertion method calling `respond_to` with receiver omitted. ([@koic][])
+
 ## 0.4.0 (2019-11-07)
 
 ### New features
@@ -56,3 +87,4 @@
 [@tejasbubane]: https://github.com/tejasbubane
 [@abhaynikam]: https://github.com/abhaynikam
 [@herwinw]: https://github.com/herwinw
+[@fsateler]: https://github.com/fsateler

data/Gemfile

@@ -9,5 +9,5 @@ gemspec
 gem 'bump', require: false
 gem 'rake'
 gem 'rubocop', github: 'rubocop-hq/rubocop'
-gem 'rubocop-performance', '~> 1.4.0'
+gem 'rubocop-performance', '~> 1.5.0'
 gem 'yard', '~> 0.9'

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Bozhidar Batsov, Jonas Arvidsson, Koichi ITO
+Copyright (c) 2019-2020 Bozhidar Batsov, Jonas Arvidsson, Koichi ITO
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -16,8 +16,8 @@ gem install rubocop-minitest
 
 or if you use bundler put this in your `Gemfile`
 
-```
-gem 'rubocop-minitest'
+```ruby
+gem 'rubocop-minitest', require: false
 ```
 
 ## Usage

data/config/default.yml

@@ -9,12 +9,23 @@ Minitest/AssertEmpty:
   Enabled: true
   VersionAdded: '0.2'
 
+Minitest/AssertEmptyLiteral:
+  Description: 'This cop enforces the test to use `assert_empty` instead of using `assert([], object)` or `assert({}, object)`.'
+  Enabled: true
+  VersionAdded: '0.5'
+
 Minitest/AssertEqual:
   Description: 'This cop enforces the test to use `assert_equal` instead of using `assert(expected == actual)`.'
   StyleGuide: 'https://github.com/rubocop-hq/minitest-style-guide#assert-equal-arguments-order'
   Enabled: true
   VersionAdded: '0.4'
 
+Minitest/AssertMatch:
+  Description: 'This cop enforces the test to use `assert_match` instead of using `assert(matcher.match(object))`.'
+  StyleGuide: 'https://github.com/rubocop-hq/minitest-style-guide#assert-match'
+  Enabled: true
+  VersionAdded: '0.6'
+
 Minitest/AssertIncludes:
   Description: 'This cop enforces the test to use `assert_includes` instead of using `assert(collection.include?(object))`.'
   StyleGuide: 'https://github.com/rubocop-hq/minitest-style-guide#assert-includes'
@@ -69,6 +80,12 @@ Minitest/RefuteIncludes:
   Enabled: true
   VersionAdded: '0.3'
 
+Minitest/RefuteMatch:
+  Description: 'This cop enforces the test to use `refute_match` instead of using `refute(matcher.match(object))`.'
+  StyleGuide: 'https://github.com/rubocop-hq/minitest-style-guide#refute-match'
+  Enabled: true
+  VersionAdded: '0.6'
+
 Minitest/RefuteInstanceOf:
   Description: 'This cop enforces the test to use `refute_instance_of(Class, object)` over `refute(object.instance_of?(Class))`.'
   StyleGuide: 'https://github.com/rubocop-hq/minitest-style-guide#refute-instance-of'

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

@@ -16,6 +16,8 @@ module RuboCop
       #   assert_empty(object, 'the message')
       #
       class AssertEmpty < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_empty(%<arguments>s)` over ' \
               '`assert(%<receiver>s)`.'
 
@@ -37,11 +39,9 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_with_empty(node) do |_first_receiver_arg, actual, rest_receiver_arg|
-              message = rest_receiver_arg.first
-
-              replacement = [actual.source, message&.source].compact.join(', ')
-              corrector.replace(node.loc.expression, "assert_empty(#{replacement})")
+            assert_with_empty(node) do |_, actual_arg|
+              corrector.replace(node.loc.selector, 'assert_empty')
+              corrector.replace(first_argument_range(node), actual_arg.source)
             end
           end
         end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Minitest
+      # This cop enforces the test to use `assert_empty`
+      # instead of using `assert([], object)`.
+      #
+      # @example
+      #   # bad
+      #   assert([], object)
+      #   assert({}, object)
+      #
+      #   # good
+      #   assert_empty(object)
+      #
+      class AssertEmptyLiteral < Cop
+        MSG = 'Prefer using `assert_empty(%<arguments>s)` over ' \
+              '`assert(%<literal>s, %<arguments>s)`.'
+
+        def_node_matcher :assert_with_empty_literal, <<~PATTERN
+          (send nil? :assert ${hash array} $...)
+        PATTERN
+
+        def on_send(node)
+          assert_with_empty_literal(node) do |literal, matchers|
+            args = matchers.map(&:source).join(', ')
+
+            message = format(MSG, literal: literal.source, arguments: args)
+            add_offense(node, message: message)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,8 @@ module RuboCop
       #   assert_equal("rubocop-minitest", actual)
       #
       class AssertEqual < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_equal(%<preferred>s)` over ' \
               '`assert(%<over>s)`.'
 
@@ -22,9 +24,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          assert_equal(node) do
-            |first_receiver_arg, expected, actual, rest_receiver_arg|
-
+          assert_equal(node) do |first_receiver_arg, expected, actual, rest_receiver_arg|
             message = rest_receiver_arg.first
             preferred = [expected.source, actual.source, message&.source]
                         .compact.join(', ')
@@ -38,19 +38,14 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_equal(node) do |_receiver, expected, actual, rest_receiver_arg|
-              message = rest_receiver_arg.first
-              replacement = node_arguments(expected, actual, message)
-              corrector.replace(node.loc.expression, "assert_equal(#{replacement})")
+            assert_equal(node) do |_, expected, actual|
+              corrector.replace(node.loc.selector, 'assert_equal')
+
+              replacement = [expected, actual].map(&:source).join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             end
           end
         end
-
-        private
-
-        def node_arguments(expected, actual, message)
-          [expected.source, actual.source, message&.source].compact.join(', ')
-        end
       end
     end
   end

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

@@ -16,44 +16,9 @@ module RuboCop
       #   assert_includes(collection, object, 'the message')
       #
       class AssertIncludes < Cop
-        MSG = 'Prefer using `assert_includes(%<arguments>s)` over ' \
-              '`assert(%<receiver>s)`.'
+        extend IncludesCopRule
 
-        def_node_matcher :assert_with_includes, <<~PATTERN
-          (send nil? :assert $(send $_ :include? $_) $...)
-        PATTERN
-
-        def on_send(node)
-          assert_with_includes(node) do
-            |first_receiver_arg, collection, actual, rest_receiver_arg|
-
-            message = rest_receiver_arg.first
-            arguments = node_arguments(collection, actual, message)
-            receiver = [first_receiver_arg.source, message&.source].compact.join(', ')
-
-            offense_message = format(MSG, arguments: arguments, receiver: receiver)
-
-            add_offense(node, message: offense_message)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            assert_with_includes(node) do
-              |_receiver, collection, actual, rest_receiver_arg|
-
-              message = rest_receiver_arg.first
-              replacement = node_arguments(collection, actual, message)
-              corrector.replace(node.loc.expression, "assert_includes(#{replacement})")
-            end
-          end
-        end
-
-        private
-
-        def node_arguments(collection, actual, message)
-          [collection.source, actual.source, message&.source].compact.join(', ')
-        end
+        rule target_method: :assert, prefer_method: :assert_includes
       end
     end
   end

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

@@ -16,6 +16,8 @@ module RuboCop
       #   assert_instance_of(Class, object, 'the message')
       #
       class AssertInstanceOf < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_instance_of(%<arguments>s)` over ' \
               '`assert(%<receiver>s)`.'
 
@@ -24,9 +26,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          assert_with_instance_of(node) do
-            |first_receiver_arg, object, method, rest_args|
-
+          assert_with_instance_of(node) do |first_receiver_arg, object, method, rest_args|
             message = rest_args.first
             arguments = node_arguments(object, method, message)
             receiver = [first_receiver_arg.source, message&.source].compact.join(', ')
@@ -39,12 +39,11 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_with_instance_of(node) do |_, object, method, rest_args|
-              message = rest_args.first
-              arguments = node_arguments(object, method, message)
+            assert_with_instance_of(node) do |_, object, method|
+              corrector.replace(node.loc.selector, 'assert_instance_of')
 
-              replacement = "assert_instance_of(#{arguments})"
-              corrector.replace(node.loc.expression, replacement)
+              replacement = [method, object].map(&:source).join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             end
           end
         end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Minitest
+      # This cop enforces the test to use `assert_match`
+      # instead of using `assert(matcher.match(string))`.
+      #
+      # @example
+      #   # bad
+      #   assert(matcher.match(string))
+      #   assert(matcher.match(string), 'the message')
+      #
+      #   # good
+      #   assert_match(regex, string)
+      #   assert_match(matcher, string, 'the message')
+      #
+      class AssertMatch < Cop
+        include ArgumentRangeHelper
+
+        MSG = 'Prefer using `assert_match(%<arguments>s)` over ' \
+              '`assert(%<receiver>s)`.'
+
+        def_node_matcher :assert_with_match, <<~PATTERN
+          (send nil? :assert $(send $_ :match $_) $...)
+        PATTERN
+
+        def on_send(node)
+          assert_with_match(node) do
+            |first_receiver_arg, matcher, actual, rest_receiver_arg|
+            message = rest_receiver_arg.first
+            arguments = node_arguments(matcher, actual, message)
+            receiver = [first_receiver_arg.source, message&.source].compact.join(', ')
+
+            offense_message = format(MSG, arguments: arguments, receiver: receiver)
+
+            add_offense(node, message: offense_message)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            assert_with_match(node) do |_, matcher, actual|
+              corrector.replace(node.loc.selector, 'assert_match')
+
+              replacement = [matcher, actual].map(&:source).join(', ')
+              corrector.replace(first_argument_range(node), replacement)
+            end
+          end
+        end
+
+        private
+
+        def node_arguments(matcher, actual, message)
+          [matcher.source, actual.source, message&.source].compact.join(', ')
+        end
+      end
+    end
+  end
+end

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

@@ -16,6 +16,8 @@ module RuboCop
       #   assert_nil(actual, 'the message')
       #
       class AssertNil < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_nil(%<arguments>s)` over ' \
               '`assert_equal(nil, %<arguments>s)`.'
 
@@ -35,9 +37,12 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            arguments = node.arguments.reject(&:nil_type?)
-            replacement = arguments.map(&:source).join(', ')
-            corrector.replace(node.loc.expression, "assert_nil(#{replacement})")
+            assert_equal_with_nil(node) do |actual|
+              corrector.replace(node.loc.selector, 'assert_nil')
+              corrector.replace(
+                first_and_second_arguments_range(node), actual.source
+              )
+            end
           end
         end
       end

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

@@ -10,12 +10,16 @@ module RuboCop
       #   # bad
       #   assert(object.respond_to?(:some_method))
       #   assert(object.respond_to?(:some_method), 'the message')
+      #   assert(respond_to?(:some_method))
       #
       #   # good
       #   assert_respond_to(object, :some_method)
       #   assert_respond_to(object, :some_method, 'the message')
+      #   assert_respond_to(self, some_method)
       #
       class AssertRespondTo < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_respond_to(%<preferred>s)` over ' \
               '`assert(%<over>s)`.'
 
@@ -26,9 +30,8 @@ module RuboCop
         def on_send(node)
           assert_with_respond_to(node) do |over, object, method, rest_args|
             custom_message = rest_args.first
-            preferred = [object, method, custom_message]
-                        .compact.map(&:source).join(', ')
-            over      = [over, custom_message].compact.map(&:source).join(', ')
+            preferred = build_preferred_arguments(object, method, custom_message)
+            over = [over, custom_message].compact.map(&:source).join(', ')
             message = format(MSG, preferred: preferred, over: over)
             add_offense(node, message: message)
           end
@@ -36,15 +39,23 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_with_respond_to(node) do |_, object, method, rest_args|
-              custom_message = rest_args.first
-              preferred = [object, method, custom_message]
-                          .compact.map(&:source).join(', ')
-              replacement = "assert_respond_to(#{preferred})"
-              corrector.replace(node.loc.expression, replacement)
+            assert_with_respond_to(node) do |_, object, method|
+              corrector.replace(node.loc.selector, 'assert_respond_to')
+
+              object = object ? object.source : 'self'
+              replacement = [object, method.source].join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             end
           end
         end
+
+        private
+
+        def build_preferred_arguments(receiver, method, message)
+          receiver = receiver ? receiver.source : 'self'
+
+          [receiver, method.source, message&.source].compact.join(', ')
+        end
       end
     end
   end