rubocop-minitest 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe4a7de0dfd13839c19db673fa07861a917a78e2558fae305131eeb852ccb89
-  data.tar.gz: 6c2c47e6ecf6260635e87d86cbda171d4716a581fef79786af619b97b76a8dc4
+  metadata.gz: 6e766db856d11b13a5c3fbbf11a17a0e0fdbdda162195f11fbbc898c08670102
+  data.tar.gz: 5c223aa1303c61e17766a3c1be7e2641da280446450cbe8d93786b4542c624aa
 SHA512:
-  metadata.gz: 9cf68be606a67b36392817fcf1436f5eb6b7c1b4bf1ea5c35516384dde2ff8a2a1b370bdbf900d3c58b96f0e4d0f5ae9c70084864ca08ef3fdbe0a8bf6a50a1d
-  data.tar.gz: 0f88de02da060b0b05c2ff6cb14d37989c1ca0d63b7c298809dda8fad8fb9271d41c98c816f90dff0282198a40096523c5a70151b7551fec0c4c6790a689bdfd
+  metadata.gz: d7e1ef3c91cc1b9b55a6c26c9737fe6207cada7f48a3f78c40288650fa17b3efaeb4e740ab60ff12a532a4506f78e5c7fa823a840f6618791d0454f7071ddd29
+  data.tar.gz: c6eb92763493631a30e3bbf35efd62d3141a9ad0fa8365975cb96825f31454c0892ca249df6421b724e589b95c9098302c56572d55514f6b77b1b58d6feb3838

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## master (unreleased)
 
+## 0.8.0 (2020-03-24)
+
+### New features
+
+* [#66](https://github.com/rubocop-hq/rubocop-minitest/issues/66): Support all expectations of `Minitest::Expectations` for `Minitest/GlobalExpectations` cop. ([@koic][])
+
+### Bug fixes
+
+* [#60](https://github.com/rubocop-hq/rubocop-minitest/issues/60): Fix `Minitest/GlobalExpectations` autocorrection for chained methods. ([@tejasbubane][])
+* [#69](https://github.com/rubocop-hq/rubocop-minitest/pull/69): Fix a false negative for `Minitest/GlobalExpectations` cop when using a variable or a hash index for receiver. ([@koic][])
+* [#71](https://github.com/rubocop-hq/rubocop-minitest/pull/71): Fix a false negative for `Minitest/AssertEqual` when an argument is enclosed in redundant parentheses. ([@koic][])
+
 ## 0.7.0 (2020-03-09)
 
 ### New features

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

@@ -14,38 +14,9 @@ module RuboCop
       #   assert_equal("rubocop-minitest", actual)
       #
       class AssertEqual < Cop
-        include ArgumentRangeHelper
+        extend MinitestCopRule
 
-        MSG = 'Prefer using `assert_equal(%<preferred>s)` over ' \
-              '`assert(%<over>s)`.'
-
-        def_node_matcher :assert_equal, <<~PATTERN
-          (send nil? :assert $(send $_ :== $_) $...)
-        PATTERN
-
-        def on_send(node)
-          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(', ')
-            over = [first_receiver_arg.source, message&.source].compact.join(', ')
-
-            offense_message = format(MSG, preferred: preferred, over: over)
-
-            add_offense(node, message: offense_message)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            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
+        define_rule :assert, target_method: :==, preferred_method: :assert_equal
       end
     end
   end

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

@@ -3,50 +3,57 @@
 module RuboCop
   module Cop
     module Minitest
-      # This Cop checks for deprecated global expectations
+      # This cop checks for deprecated global expectations
       # and autocorrects them to use expect format.
       #
       # @example
       #   # bad
-      #   n.must_equal 42
-      #   n.wont_match b
+      #   musts.must_equal expected_musts
+      #   wonts.wont_match expected_wonts
+      #   musts.must_raise TypeError
       #
       #   # good
-      #   _(n).must_equal 42
-      #   _(n).wont_match b
+      #   _(musts).must_equal expected_musts
+      #   _(wonts).wont_match expected_wonts
+      #   _ { musts }.must_raise TypeError
       class GlobalExpectations < Cop
-        MSG = 'Prefer using `%<corrected>s`.'
+        MSG = 'Use `%<preferred>s` instead.'
 
         VALUE_MATCHERS = %i[
-          be be_close_to be_empty be_instance_of be_kind_of
-          be_nil be_same_as be_silent be_within_epsilon equal
-          include match respond_to must_exist
-        ].map do |matcher|
-          [:"must_#{matcher}", :"wont_#{matcher}"]
-        end.flatten.freeze
+          must_be_empty must_equal must_be_close_to must_be_within_delta
+          must_be_within_epsilon must_include must_be_instance_of must_be_kind_of
+          must_match must_be_nil must_be must_respond_to must_be_same_as
+          path_must_exist path_wont_exist wont_be_empty wont_equal wont_be_close_to
+          wont_be_within_delta wont_be_within_epsilon wont_include wont_be_instance_of
+          wont_be_kind_of wont_match wont_be_nil wont_be wont_respond_to wont_be_same_as
+        ].freeze
 
-        BLOCK_MATCHERS = %i[must_output must_raise must_throw].freeze
+        BLOCK_MATCHERS = %i[must_output must_raise must_be_silent must_throw].freeze
 
         MATCHERS_STR = (VALUE_MATCHERS + BLOCK_MATCHERS).map do |m|
           ":#{m}"
         end.join(' ').freeze
 
         def_node_matcher :global_expectation?, <<~PATTERN
-          (send (send _ _) {#{MATCHERS_STR}} ...)
+          (send {
+            (send _ _)
+            ({lvar ivar cvar gvar} _)
+            (send {(send _ _) ({lvar ivar cvar gvar} _)} _ _)
+          } {#{MATCHERS_STR}} ...)
         PATTERN
 
         def on_send(node)
           return unless global_expectation?(node)
 
-          message = format(MSG, corrected: correct_suggestion(node))
-          add_offense(node, message: message)
+          message = format(MSG, preferred: preferred_receiver(node))
+          add_offense(node, location: node.receiver.source_range, message: message)
         end
 
         def autocorrect(node)
           return unless global_expectation?(node)
 
           lambda do |corrector|
-            receiver = node.receiver.loc.selector
+            receiver = node.receiver.source_range
 
             if BLOCK_MATCHERS.include?(node.method_name)
               corrector.insert_before(receiver, '_ { ')
@@ -60,12 +67,12 @@ module RuboCop
 
         private
 
-        def correct_suggestion(node)
+        def preferred_receiver(node)
           source = node.receiver.source
           if BLOCK_MATCHERS.include?(node.method_name)
-            node.source.sub(source, "_ { #{source} }")
+            "_ { #{source} }"
           else
-            node.source.sub(source, "_(#{source})")
+            "_(#{source})"
           end
         end
       end

data/lib/rubocop/minitest/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Minitest
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/manual/cops_minitest.md

@@ -226,19 +226,21 @@ Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChan
 --- | --- | --- | --- | ---
 Enabled | Yes | Yes  | 0.7 | -
 
-This Cop checks for deprecated global expectations
+This cop checks for deprecated global expectations
 and autocorrects them to use expect format.
 
 ### Examples
 
 ```ruby
 # bad
-n.must_equal 42
-n.wont_match b
+musts.must_equal expected_musts
+wonts.wont_match expected_wonts
+musts.must_raise TypeError
 
 # good
-_(n).must_equal 42
-_(n).wont_match b
+_(musts).must_equal expected_musts
+_(wonts).wont_match expected_wonts
+_ { musts }.must_raise TypeError
 ```
 
 ## Minitest/RefuteEmpty

data/relnotes/v0.8.0.md

@@ -0,0 +1,12 @@
+### New features
+
+* [#66](https://github.com/rubocop-hq/rubocop-minitest/issues/66): Support all expectations of `Minitest::Expectations` for `Minitest/GlobalExpectations` cop. ([@koic][])
+
+### Bug fixes
+
+* [#60](https://github.com/rubocop-hq/rubocop-minitest/issues/60): Fix `Minitest/GlobalExpectations` autocorrection for chained methods. ([@tejasbubane][])
+* [#69](https://github.com/rubocop-hq/rubocop-minitest/pull/69): Fix a false negative for `Minitest/GlobalExpectations` cop when using a variable or a hash index for receiver. ([@koic][])
+* [#71](https://github.com/rubocop-hq/rubocop-minitest/pull/71): Fix a false negative for `Minitest/AssertEqual` when an argument is enclosed in redundant parentheses. ([@koic][])
+
+[@koic]: https://github.com/koic
+[@tejasbubane]: https://github.com/tejasbubane

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -110,6 +110,7 @@ files:
 - relnotes/v0.6.1.md
 - relnotes/v0.6.2.md
 - relnotes/v0.7.0.md
+- relnotes/v0.8.0.md
 - rubocop-minitest.gemspec
 - tasks/cops_documentation.rake
 - tasks/cut_release.rake