rubocop-minitest 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb2a1153e8f5e4eb37a349fcdfff211a421369606facb6d866fbc4701a60d6c
-  data.tar.gz: 2e258868d43eddc169e142e408e01d52e7d6e63ac5e9f1f53643feca8ff8968e
+  metadata.gz: c3c643f7623a14a4a99f813daf392e31a491b7177504cad25760093d80e0b32e
+  data.tar.gz: b2e5de6e39a741828ae69ca48311b366747bb19aebbc85b23c96ff346f180b39
 SHA512:
-  metadata.gz: 466706a3aa3020369c7b855c20ad0619cfd8d2e4c94a6f260287908ce2d5ecefdc8190bc88a60d7cb59d0cdd39a276dc87ebdea91c240a5d820e167d984424c9
-  data.tar.gz: 6aede577f029efa7fb8a2cf89151261c16dfe57f980100b568c8e11252b7652e45cac051f404212411e2cac2a0232d0c4c752322f6781fa3c37297e6a10eae11
+  metadata.gz: eada0f53e4b625d321342f22aa80942512fcefa2131443a7d7d1d7a6f9fafabc1f1e8659f7b7fd2cc002bf83dcec037e760def29db035ac2f1e29bb6ace5fba3
+  data.tar.gz: ca010bc26330c8c32a9a28fe12f27870affa6e554c6832b6eedede0daf4c89fd5e28ffd93bca1e152a5e3785240023db9e4d35226f3e1bcfc02f49a7cffc5c68

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,10 @@
 
 ## master (unreleased)
 
+## 0.5.1 (2019-12-25)
+
+* [#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

data/Gemfile

@@ -10,4 +10,7 @@ gem 'bump', require: false
 gem 'rake'
 gem 'rubocop', github: 'rubocop-hq/rubocop'
 gem 'rubocop-performance', '~> 1.5.0'
-gem 'yard', '~> 0.9'
+# Workaround for YARD 0.9.20 or lower.
+# It specifies `github` until the release that includes the following changes:
+# https://github.com/lsegal/yard/pull/1290
+gem 'yard', github: 'lsegal/yard', ref: '10a2e5b'

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_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,6 +16,8 @@ module RuboCop
       #   assert_includes(collection, object, 'the message')
       #
       class AssertIncludes < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_includes(%<arguments>s)` over ' \
               '`assert(%<receiver>s)`.'
 
@@ -39,12 +41,11 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_with_includes(node) do
-              |_receiver, collection, actual, rest_receiver_arg|
+            assert_with_includes(node) do |_, collection, actual|
+              corrector.replace(node.loc.selector, 'assert_includes')
 
-              message = rest_receiver_arg.first
-              replacement = node_arguments(collection, actual, message)
-              corrector.replace(node.loc.expression, "assert_includes(#{replacement})")
+              replacement = [collection, actual].map(&:source).join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             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_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

@@ -18,6 +18,8 @@ module RuboCop
       #   assert_respond_to(self, some_method)
       #
       class AssertRespondTo < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `assert_respond_to(%<preferred>s)` over ' \
               '`assert(%<over>s)`.'
 
@@ -37,11 +39,12 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_with_respond_to(node) do |_, object, method, rest_args|
-              custom_message = rest_args.first
-              preferred = build_preferred_arguments(object, method, custom_message)
-              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

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

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

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

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

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

@@ -15,6 +15,8 @@ module RuboCop
       #   refute_equal("rubocop-minitest", actual)
       #
       class RefuteEqual < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `refute_equal(%<preferred>s)` over ' \
               '`assert(%<over>s)`.'
 
@@ -32,20 +34,17 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            assert_not_equal(node) do |_, first_arg, second_arg, rest_args|
-              autocorrect_node(node, corrector, first_arg, second_arg, rest_args)
+            assert_not_equal(node) do |_, expected, actual|
+              corrector.replace(node.loc.selector, 'refute_equal')
+
+              replacement = [expected, actual].map(&:source).join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             end
           end
         end
 
         private
 
-        def autocorrect_node(node, corrector, first_arg, second_arg, rest_args)
-          custom_message = rest_args.first
-          replacement = preferred_usage(first_arg, second_arg, custom_message)
-          corrector.replace(node.loc.expression, "refute_equal(#{replacement})")
-        end
-
         def preferred_usage(first_arg, second_arg, custom_message = nil)
           [first_arg, second_arg, custom_message]
             .compact.map(&:source).join(', ')

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

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

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

@@ -16,6 +16,8 @@ module RuboCop
       #   refute_includes(collection, object, 'the message')
       #
       class RefuteIncludes < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `refute_includes(%<arguments>s)` over ' \
               '`refute(%<receiver>s)`.'
 
@@ -39,12 +41,11 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            refute_with_includes(node) do
-              |_receiver, collection, object, rest_receiver_arg|
+            refute_with_includes(node) do |_, collection, actual|
+              corrector.replace(node.loc.selector, 'refute_includes')
 
-              message = rest_receiver_arg.first
-              replacement = node_arguments(collection, object, message)
-              corrector.replace(node.loc.expression, "refute_includes(#{replacement})")
+              replacement = [collection, actual].map(&:source).join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             end
           end
         end

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

@@ -16,6 +16,8 @@ module RuboCop
       #   refute_instance_of(Class, object, 'the message')
       #
       class RefuteInstanceOf < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `refute_instance_of(%<arguments>s)` over ' \
               '`refute(%<receiver>s)`.'
 
@@ -24,9 +26,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          refute_with_instance_of(node) do
-            |first_receiver_arg, object, method, rest_args|
-
+          refute_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|
-            refute_with_instance_of(node) do |_, object, method, rest_args|
-              message = rest_args.first
-              arguments = node_arguments(object, method, message)
+            refute_with_instance_of(node) do |_, object, method|
+              corrector.replace(node.loc.selector, 'refute_instance_of')
 
-              replacement = "refute_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/refute_nil.rb

@@ -16,6 +16,8 @@ module RuboCop
       #   refute_nil(actual, 'the message')
       #
       class RefuteNil < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `refute_nil(%<arguments>s)` over ' \
               '`refute_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, "refute_nil(#{replacement})")
+            refute_equal_with_nil(node) do |actual|
+              corrector.replace(node.loc.selector, 'refute_nil')
+              corrector.replace(
+                first_and_second_arguments_range(node), actual.source
+              )
+            end
           end
         end
       end

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

@@ -18,6 +18,8 @@ module RuboCop
       #   refute_respond_to(self, :some_method)
       #
       class RefuteRespondTo < Cop
+        include ArgumentRangeHelper
+
         MSG = 'Prefer using `refute_respond_to(%<preferred>s)` over ' \
               '`refute(%<over>s)`.'
 
@@ -37,11 +39,12 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            refute_with_respond_to(node) do |_, object, method, rest_args|
-              custom_message = rest_args.first
-              preferred = build_preferred_arguments(object, method, custom_message)
-              replacement = "refute_respond_to(#{preferred})"
-              corrector.replace(node.loc.expression, replacement)
+            refute_with_respond_to(node) do |_, object, method|
+              corrector.replace(node.loc.selector, 'refute_respond_to')
+
+              object = object ? object.source : 'self'
+              replacement = [object, method.source].join(', ')
+              corrector.replace(first_argument_range(node), replacement)
             end
           end
         end

data/lib/rubocop/cop/minitest_cops.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'mixin/argument_range_helper'
 require_relative 'minitest/assert_empty'
 require_relative 'minitest/assert_empty_literal'
 require_relative 'minitest/assert_equal'

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Methods that calculate and return `Parser::Source::Ranges`.
+    module ArgumentRangeHelper
+      include RangeHelp
+
+      private
+
+      def first_argument_range(node)
+        first_argument = node.first_argument
+
+        range_between(
+          first_argument.source_range.begin_pos,
+          first_argument.source_range.end_pos
+        )
+      end
+
+      def first_and_second_arguments_range(node)
+        first_argument = node.first_argument
+        second_argument = node.arguments[1]
+
+        range_between(
+          first_argument.source_range.begin_pos,
+          second_argument.source_range.end_pos
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/minitest/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Minitest
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/relnotes/v0.5.1.md

@@ -0,0 +1,3 @@
+* [#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][])
+
+[@koic]: https://github.com/koic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -82,6 +82,7 @@ files:
 - lib/rubocop/cop/minitest/refute_nil.rb
 - lib/rubocop/cop/minitest/refute_respond_to.rb
 - lib/rubocop/cop/minitest_cops.rb
+- lib/rubocop/cop/mixin/argument_range_helper.rb
 - lib/rubocop/minitest.rb
 - lib/rubocop/minitest/inject.rb
 - lib/rubocop/minitest/version.rb
@@ -99,6 +100,7 @@ files:
 - relnotes/v0.4.0.md
 - relnotes/v0.4.1.md
 - relnotes/v0.5.0.md
+- relnotes/v0.5.1.md
 - rubocop-minitest.gemspec
 - tasks/cops_documentation.rake
 - tasks/cut_release.rake
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Automatic Minitest code style checking tool.