rubocop-minitest 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f7bc7c5d1f40800643ddc8cfbdb5b3b716484e
-  data.tar.gz: d2f4fedb8db4422c4f601a4410b04b77ef51bf12
+  metadata.gz: ba7306fba69394bb98154a2d39b7f755587ad0e4
+  data.tar.gz: 9d20cb250e999413a04620cfbe0eb5c930a3b83e
 SHA512:
-  metadata.gz: 0eaa51499fa109978fae23597f05cb11c0003fb7a4d887249b17c4966f6a2422aec2ee29c2c62baa044b006eb2965076072c306a3863b821382019324274c549
-  data.tar.gz: 79225d37425d04fcc425ad661b7970b99ab291f93f2337cf7cb7008ffa55aeb9d29cc0a79d9129f1e089c7eb5f00af95187b785a002f63ffde8b92ea0cd0df52
+  metadata.gz: c9e12069624b30051284458118b7447fd5d52697d97cbd150f1062898cbd2a5975d2bb24d13185afd94b13ad40702a242ba180c1484e2b6761f0218f30e0bab3
+  data.tar.gz: f33c1179084c1ac358d702c4537b84eba697851368a6c3d9245e54abf20e4acd4149c7d0bfb833ee3c9b42537cde7d0bfca6bd30420fd1e1480e5386490d0d6c

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## 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

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/lib/rubocop/cop/minitest/assert_includes.rb

@@ -16,45 +16,9 @@ module RuboCop
       #   assert_includes(collection, object, 'the message')
       #
       class AssertIncludes < Cop
-        include ArgumentRangeHelper
+        extend IncludesCopRule
 
-        MSG = 'Prefer using `assert_includes(%<arguments>s)` over ' \
-              '`assert(%<receiver>s)`.'
-
-        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 |_, collection, actual|
-              corrector.replace(node.loc.selector, 'assert_includes')
-
-              replacement = [collection, actual].map(&:source).join(', ')
-              corrector.replace(first_argument_range(node), 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/refute_false.rb

@@ -11,6 +11,9 @@ module RuboCop
       #   assert_equal(false, actual)
       #   assert_equal(false, actual, 'the message')
       #
+      #   assert(!test)
+      #   assert(!test, 'the message')
+      #
       #   # good
       #   refute(actual)
       #   refute(actual, 'the message')
@@ -18,31 +21,52 @@ module RuboCop
       class RefuteFalse < Cop
         include ArgumentRangeHelper
 
-        MSG = 'Prefer using `refute(%<arguments>s)` over ' \
+        MSG_FOR_ASSERT_EQUAL = 'Prefer using `refute(%<arguments>s)` over ' \
               '`assert_equal(false, %<arguments>s)`.'
+        MSG_FOR_ASSERT = 'Prefer using `refute(%<arguments>s)` over ' \
+              '`assert(!%<arguments>s)`.'
 
         def_node_matcher :assert_equal_with_false, <<~PATTERN
           (send nil? :assert_equal false $_ $...)
         PATTERN
 
+        def_node_matcher :assert_with_bang_argument, <<~PATTERN
+          (send nil? :assert (send $_ :!) $...)
+        PATTERN
+
         def on_send(node)
-          assert_equal_with_false(node) do |actual, rest_receiver_arg|
-            message = rest_receiver_arg.first
+          actual, rest_receiver_arg = assert_equal_with_false(node) ||
+                                      assert_with_bang_argument(node)
+          return unless actual
 
-            arguments = [actual.source, message&.source].compact.join(', ')
+          message_argument = rest_receiver_arg.first
 
-            add_offense(node, message: format(MSG, arguments: arguments))
-          end
+          arguments = [actual.source, message_argument&.source].compact.join(', ')
+
+          message = if node.method?(:assert_equal)
+                      MSG_FOR_ASSERT_EQUAL
+                    else
+                      MSG_FOR_ASSERT
+                    end
+
+          add_offense(node, message: format(message, arguments: arguments))
         end
 
         def autocorrect(node)
           lambda do |corrector|
+            corrector.replace(node.loc.selector, 'refute')
+
             assert_equal_with_false(node) do |actual|
-              corrector.replace(node.loc.selector, 'refute')
               corrector.replace(
                 first_and_second_arguments_range(node), actual.source
               )
             end
+
+            assert_with_bang_argument(node) do |actual|
+              corrector.replace(
+                first_argument_range(node), actual.source
+              )
+            end
           end
         end
       end

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

@@ -16,45 +16,9 @@ module RuboCop
       #   refute_includes(collection, object, 'the message')
       #
       class RefuteIncludes < Cop
-        include ArgumentRangeHelper
+        extend IncludesCopRule
 
-        MSG = 'Prefer using `refute_includes(%<arguments>s)` over ' \
-              '`refute(%<receiver>s)`.'
-
-        def_node_matcher :refute_with_includes, <<~PATTERN
-          (send nil? :refute $(send $_ :include? $_) $...)
-        PATTERN
-
-        def on_send(node)
-          refute_with_includes(node) do
-            |first_receiver_arg, collection, object, rest_receiver_arg|
-
-            message = rest_receiver_arg.first
-            arguments = node_arguments(collection, object, 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|
-            refute_with_includes(node) do |_, collection, actual|
-              corrector.replace(node.loc.selector, 'refute_includes')
-
-              replacement = [collection, actual].map(&:source).join(', ')
-              corrector.replace(first_argument_range(node), replacement)
-            end
-          end
-        end
-
-        private
-
-        def node_arguments(collection, object, message)
-          [collection.source, object.source, message&.source].compact.join(', ')
-        end
+        rule target_method: :refute, prefer_method: :refute_includes
       end
     end
   end

data/lib/rubocop/cop/minitest_cops.rb

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

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Define the rule for `Minitest/AssertIncludes` and `Minitest/RefuteIncludes` cops.
+    module IncludesCopRule
+      def rule(target_method:, prefer_method:)
+        class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+          include ArgumentRangeHelper
+
+          MSG = 'Prefer using `#{prefer_method}(%<new_arguments>s)` over ' \
+                '`#{target_method}(%<original_arguments>s)`.'
+
+          def on_send(node)
+            return unless node.method?(:#{target_method})
+            return unless (arguments = peel_redundant_parentheses_from(node.arguments))
+            return unless arguments.first.method?(:include?)
+
+            add_offense(node, message: offense_message(arguments))
+          end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              corrector.replace(node.loc.selector, '#{prefer_method}')
+
+              arguments = peel_redundant_parentheses_from(node.arguments)
+
+              new_arguments = [
+                arguments.first.receiver.source,
+                arguments.first.arguments.map(&:source)
+              ].join(', ')
+
+              if enclosed_in_redundant_parentheses?(node)
+                new_arguments = '(' + new_arguments + ')'
+              end
+
+              corrector.replace(first_argument_range(node), new_arguments)
+            end
+          end
+
+          private
+
+          def peel_redundant_parentheses_from(arguments)
+            return arguments unless arguments.first.begin_type?
+
+            peel_redundant_parentheses_from(arguments.first.children)
+          end
+
+          def offense_message(arguments)
+            new_arguments = new_arguments(arguments)
+
+            original_arguments = arguments.map(&:source).join(', ')
+
+            format(
+              MSG,
+              new_arguments: new_arguments,
+              original_arguments: original_arguments
+            )
+          end
+
+          def new_arguments(arguments)
+            message_argument = arguments.last if arguments.first != arguments.last
+
+            [
+              arguments.first.receiver,
+              arguments.first.arguments.first,
+              message_argument
+            ].compact.map(&:source).join(', ')
+          end
+
+          def enclosed_in_redundant_parentheses?(node)
+            node.arguments.first.begin_type?
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/rubocop/minitest/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Minitest
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/manual/cops_minitest.md

@@ -285,6 +285,9 @@ over `assert_equal(false, object)`.
 assert_equal(false, actual)
 assert_equal(false, actual, 'the message')
 
+assert(!test)
+assert(!test, 'the message')
+
 # good
 refute(actual)
 refute(actual, 'the message')

data/relnotes/v0.6.1.md

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

data/rubocop-minitest.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
   spec.metadata = {
-    'homepage_uri' => 'https://docs.rubocop.org/projects/minitest',
+    'homepage_uri' => 'https://docs.rubocop.org/projects/minitest/',
     'changelog_uri' => 'https://github.com/rubocop-hq/rubocop-minitest/blob/master/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/rubocop-hq/rubocop-minitest',
-    'documentation_uri' => 'https://docs.rubocop.org/projects/minitest',
+    'documentation_uri' => 'https://docs.rubocop.org/projects/minitest/',
     'bug_tracker_uri' => 'https://github.com/rubocop-hq/rubocop-minitest/issues'
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -85,6 +85,7 @@ files:
 - lib/rubocop/cop/minitest/refute_respond_to.rb
 - lib/rubocop/cop/minitest_cops.rb
 - lib/rubocop/cop/mixin/argument_range_helper.rb
+- lib/rubocop/cop/mixin/includes_cop_rule.rb
 - lib/rubocop/minitest.rb
 - lib/rubocop/minitest/inject.rb
 - lib/rubocop/minitest/version.rb
@@ -104,6 +105,7 @@ files:
 - relnotes/v0.5.0.md
 - relnotes/v0.5.1.md
 - relnotes/v0.6.0.md
+- relnotes/v0.6.1.md
 - rubocop-minitest.gemspec
 - tasks/cops_documentation.rake
 - tasks/cut_release.rake
@@ -111,10 +113,10 @@ homepage:
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://docs.rubocop.org/projects/minitest
+  homepage_uri: https://docs.rubocop.org/projects/minitest/
   changelog_uri: https://github.com/rubocop-hq/rubocop-minitest/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop-hq/rubocop-minitest
-  documentation_uri: https://docs.rubocop.org/projects/minitest
+  documentation_uri: https://docs.rubocop.org/projects/minitest/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop-minitest/issues
 post_install_message: 
 rdoc_options: []