rubocop-minitest 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e766db856d11b13a5c3fbbf11a17a0e0fdbdda162195f11fbbc898c08670102
-  data.tar.gz: 5c223aa1303c61e17766a3c1be7e2641da280446450cbe8d93786b4542c624aa
+  metadata.gz: 7583581a57a2d02e2794742beda02c84256b1b61e1139095e28d7f95832afa26
+  data.tar.gz: 724e5254b30b3862ecf1101ca7d33dacb67880abd4d1d84f6dff9b4ab21d433c
 SHA512:
-  metadata.gz: d7e1ef3c91cc1b9b55a6c26c9737fe6207cada7f48a3f78c40288650fa17b3efaeb4e740ab60ff12a532a4506f78e5c7fa823a840f6618791d0454f7071ddd29
-  data.tar.gz: c6eb92763493631a30e3bbf35efd62d3141a9ad0fa8365975cb96825f31454c0892ca249df6421b724e589b95c9098302c56572d55514f6b77b1b58d6feb3838
+  metadata.gz: 3095ba19f3e22c2d8219d1ef6fc87de197d9c27f74e2d62e4ee2336c3bbe47642606a5c406fa4f8f14134fe160cbde7b31e975f982cbddf1dd02c6706c409adc
+  data.tar.gz: f1d4837b08291f388ea6ec949949d186f59da810ebb05014c6c6375977fe2bcaa545759cd04a1d19d4e48446a5261a31ddd7a8f3ab41fea9fd3586c3cdb8810e

data/.rubocop.yml

@@ -47,6 +47,9 @@ Layout/ClassStructure:
       - protected_methods
       - private_methods
 
+Layout/LineLength:
+  Max: 120
+
 # Trailing white space is meaningful in code examples
 Layout/TrailingWhitespace:
   AllowInHeredoc: true

data/.rubocop_todo.yml

@@ -14,10 +14,3 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
-
-# Offense count: 40
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 100

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master (unreleased)
 
+## 0.8.1 (2020-04-06)
+
+### Bug fixes
+
+* [#72](https://github.com/rubocop-hq/rubocop-minitest/pull/72): Fix some false negatives for `Minitest/GlobalExpectations`. ([@andrykonchin][])
+
 ## 0.8.0 (2020-03-24)
 
 ### New features
@@ -119,3 +125,4 @@
 [@abhaynikam]: https://github.com/abhaynikam
 [@herwinw]: https://github.com/herwinw
 [@fsateler]: https://github.com/fsateler
+[@andrykonchin]: https://github.com/andrykonchin

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

@@ -30,27 +30,43 @@ module RuboCop
 
         BLOCK_MATCHERS = %i[must_output must_raise must_be_silent must_throw].freeze
 
-        MATCHERS_STR = (VALUE_MATCHERS + BLOCK_MATCHERS).map do |m|
+        VALUE_MATCHERS_STR = VALUE_MATCHERS.map do |m|
           ":#{m}"
         end.join(' ').freeze
 
-        def_node_matcher :global_expectation?, <<~PATTERN
-          (send {
-            (send _ _)
-            ({lvar ivar cvar gvar} _)
-            (send {(send _ _) ({lvar ivar cvar gvar} _)} _ _)
-          } {#{MATCHERS_STR}} ...)
+        BLOCK_MATCHERS_STR = BLOCK_MATCHERS.map do |m|
+          ":#{m}"
+        end.join(' ').freeze
+
+        # There are aliases for the `_` method - `expect` and `value`
+        DSL_METHODS_LIST = %w[_ value expect].map do |n|
+          ":#{n}"
+        end.join(' ').freeze
+
+        def_node_matcher :value_global_expectation?, <<~PATTERN
+          (send !(send nil? {#{DSL_METHODS_LIST}} _) {#{VALUE_MATCHERS_STR}} _)
+        PATTERN
+
+        def_node_matcher :block_global_expectation?, <<~PATTERN
+          (send
+            [
+              !(send nil? {#{DSL_METHODS_LIST}} _)
+              !(block (send nil? {#{DSL_METHODS_LIST}}) _ _)
+            ]
+            {#{BLOCK_MATCHERS_STR}}
+            _
+          )
         PATTERN
 
         def on_send(node)
-          return unless global_expectation?(node)
+          return unless value_global_expectation?(node) || block_global_expectation?(node)
 
           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)
+          return unless value_global_expectation?(node) || block_global_expectation?(node)
 
           lambda do |corrector|
             receiver = node.receiver.source_range

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

@@ -22,9 +22,7 @@ module RuboCop
       # @param inverse [Boolean] An optional param. Order of arguments replaced by auto-correction.
       #
       def define_rule(assertion_method, target_method:, preferred_method: nil, inverse: false)
-        if preferred_method.nil?
-          preferred_method = "#{assertion_method}_#{target_method.to_s.delete('?')}"
-        end
+        preferred_method = "#{assertion_method}_#{target_method.to_s.delete('?')}" if preferred_method.nil?
 
         class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
           include ArgumentRangeHelper

data/lib/rubocop/minitest/version.rb

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

data/relnotes/v0.8.1.md

@@ -0,0 +1,5 @@
+### Bug fixes
+
+* [#72](https://github.com/rubocop-hq/rubocop-minitest/pull/72): Fix some false negatives for `Minitest/GlobalExpectations`. ([@andrykonchin][])
+
+[@andrykonchin]: https://github.com/andrykonchin

metadata

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