rubocop-minitest 0.19.0 → 0.20.1

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the use of `assert_equal(expected, actual)`
+      # Enforces the use of `assert_equal(expected, actual)`
       # over `assert(expected == actual)`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_in_delta`
+      # Enforces the test to use `assert_in_delta`
       # instead of using `assert_equal` to compare floats.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_includes`
+      # Enforces the test to use `assert_includes`
       # instead of using `assert(collection.include?(object))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_instance_of(Class, object)`
+      # Enforces the test to use `assert_instance_of(Class, object)`
       # over `assert(object.instance_of?(Class))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_kind_of(Class, object)`
+      # Enforces the test to use `assert_kind_of(Class, object)`
       # over `assert(object.kind_of?(Class))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_match`
+      # Enforces the test to use `assert_match`
       # instead of using `assert(matcher.match(string))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_nil` instead of using
+      # Enforces the test to use `assert_nil` instead of using
       # `assert_equal(nil, something)`, `assert(something.nil?)`, or `assert_predicate(something, :nil?)`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks for opportunities to use `assert_output`.
+      # Checks for opportunities to use `assert_output`.
       #
       # @example
       #   # bad

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

@@ -3,8 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_path_exists`
-      # instead of using `assert(File.exist?(path))`.
+      # Enforces the test to use `assert_path_exists` instead of using `assert(File.exist?(path))`.
       #
       # @example
       #   # bad

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_predicate`
+      # Enforces the test to use `assert_predicate`
       # instead of using `assert(obj.a_predicate_method?)`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the use of `assert_respond_to(object, :do_something)`
+      # Enforces the use of `assert_respond_to(object, :do_something)`
       # over `assert(object.respond_to?(:do_something))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert_silent { ... }`
+      # Enforces the test to use `assert_silent { ... }`
       # instead of using `assert_output('', '') { ... }`.
       #
       # @example

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

@@ -3,8 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `assert(actual)`
-      # instead of using `assert_equal(true, actual)`.
+      # Enforces the test to use `assert(actual)` instead of using `assert_equal(true, actual)`.
       #
       # @example
       #   # bad

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop tries to detect when a user accidentally used
+      # Tries to detect when a user accidentally used
       # `assert` when they meant to use `assert_equal`.
       #
       # @safety

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks for usage of assertions in lifecycle hooks.
+      # Checks for usage of assertions in lifecycle hooks.
       #
       # @example
       #   # bad

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

@@ -7,7 +7,7 @@ module RuboCop
       # it will also inherit its methods causing Minitest to run the parent's tests methods twice.
       #
       # This cop detects when there are two tests classes, one inherits from the other, and both have tests methods.
-      # This cop will add an offence to the Child class in such a case.
+      # This cop will add an offense to the Child class in such a case.
       #
       # @example
       #   # bad
@@ -63,7 +63,10 @@ module RuboCop
 
         def parent_class_has_test_methods?(class_node)
           parent_class = class_node.parent_class
-          parent_class_node = class_node.parent.each_child_node(:class).detect do |klass|
+
+          return false unless (class_node_parent = class_node.parent)
+
+          parent_class_node = class_node_parent.each_child_node(:class).detect do |klass|
             klass.identifier == parent_class
           end
 

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

@@ -3,15 +3,20 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks for deprecated global expectations
+      # Checks for deprecated global expectations
       # and autocorrects them to use expect format.
       #
-      # @example EnforcedStyle: _
+      # @example EnforcedStyle: any (default)
       #   # bad
       #   musts.must_equal expected_musts
       #   wonts.wont_match expected_wonts
       #   musts.must_raise TypeError
       #
+      #   # good
+      #   _(musts).must_equal expected_musts
+      #   _(wonts).wont_match expected_wonts
+      #   _ { musts }.must_raise TypeError
+      #
       #   expect(musts).must_equal expected_musts
       #   expect(wonts).wont_match expected_wonts
       #   expect { musts }.must_raise TypeError
@@ -20,22 +25,12 @@ module RuboCop
       #   value(wonts).wont_match expected_wonts
       #   value { musts }.must_raise TypeError
       #
-      #   # good
-      #   _(musts).must_equal expected_musts
-      #   _(wonts).wont_match expected_wonts
-      #   _ { musts }.must_raise TypeError
-      #
-      # @example EnforcedStyle: any (default)
+      # @example EnforcedStyle: _
       #   # bad
       #   musts.must_equal expected_musts
       #   wonts.wont_match expected_wonts
       #   musts.must_raise TypeError
       #
-      #   # good
-      #   _(musts).must_equal expected_musts
-      #   _(wonts).wont_match expected_wonts
-      #   _ { musts }.must_raise TypeError
-      #
       #   expect(musts).must_equal expected_musts
       #   expect(wonts).wont_match expected_wonts
       #   expect { musts }.must_raise TypeError
@@ -44,6 +39,11 @@ module RuboCop
       #   value(wonts).wont_match expected_wonts
       #   value { musts }.must_raise TypeError
       #
+      #   # good
+      #   _(musts).must_equal expected_musts
+      #   _(wonts).wont_match expected_wonts
+      #   _ { musts }.must_raise TypeError
+      #
       # @example EnforcedStyle: expect
       #   # bad
       #   musts.must_equal expected_musts

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces correct order of expected and
+      # Enforces correct order of expected and
       # actual arguments for `assert_equal`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks if test cases contain too many assertion calls.
+      # Checks if test cases contain too many assertion calls.
       # The maximum allowed assertion calls is configurable.
       #
       # @example Max: 1

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks if test cases contain any assertion calls.
+      # Checks if test cases contain any assertion calls.
       #
       # @example
       #   # bad

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

@@ -3,8 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces to use `refute_empty` instead of
-      # using `refute(object.empty?)`.
+      # Enforces to use `refute_empty` instead of using `refute(object.empty?)`.
       #
       # @example
       #   # bad

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the use of `refute_equal(expected, object)`
+      # Enforces the use of `refute_equal(expected, object)`
       # over `assert(expected != actual)` or `assert(! expected == actual)`.
       #
       # @example

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

@@ -3,8 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the use of `refute(object)`
-      # over `assert_equal(false, object)`.
+      # Enforces the use of `refute(object)` over `assert_equal(false, object)`.
       #
       # @example
       #   # bad

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_in_delta`
+      # Enforces the test to use `refute_in_delta`
       # instead of using `refute_equal` to compare floats.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_includes`
+      # Enforces the test to use `refute_includes`
       # instead of using `refute(collection.include?(object))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the use of `refute_instance_of(Class, object)`
+      # Enforces the use of `refute_instance_of(Class, object)`
       # over `refute(object.instance_of?(Class))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the use of `refute_kind_of(Class, object)`
+      # Enforces the use of `refute_kind_of(Class, object)`
       # over `refute(object.kind_of?(Class))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_match`
+      # Enforces the test to use `refute_match`
       # instead of using `refute(matcher.match(string))`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_nil` instead of using
+      # Enforces the test to use `refute_nil` instead of using
       # `refute_equal(nil, something)`, `refute(something.nil?)`, or `refute_predicate(something, :nil?)`.
       #
       # @example

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

@@ -3,8 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_path_exists`
-      # instead of using `refute(File.exist?(path))`.
+      # Enforces the test to use `refute_path_exists` instead of using `refute(File.exist?(path))`.
       #
       # @example
       #   # bad

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_predicate`
+      # Enforces the test to use `refute_predicate`
       # instead of using `refute(obj.a_predicate_method?)`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces the test to use `refute_respond_to(object, :do_something)`
+      # Enforces the test to use `refute_respond_to(object, :do_something)`
       # over `refute(object.respond_to?(:do_something))`.
       #
       # @example

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

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Minitest
+      # Checks that `ensure` call even if `skip`. It is unexpected that `ensure` will be called when skipping test.
+      # If conditional `skip` is used, it checks that `ensure` is also called conditionally.
+      #
+      # On the other hand, it accepts `skip` used in `rescue` because `ensure` may be teardown process to `begin`
+      # setup process.
+      #
+      # @example
+      #
+      #   # bad
+      #   def test_skip
+      #     skip 'This test is skipped.'
+      #
+      #     assert 'foo'.present?
+      #   ensure
+      #     do_something
+      #   end
+      #
+      #   # bad
+      #   def test_conditional_skip
+      #     skip 'This test is skipped.' if condition
+      #
+      #     assert do_something
+      #   ensure
+      #     do_teardown
+      #   end
+      #
+      #   # good
+      #   def test_skip
+      #     skip 'This test is skipped.'
+      #
+      #     begin
+      #       assert 'foo'.present?
+      #     ensure
+      #       do_something
+      #     end
+      #   end
+      #
+      #   # good
+      #   def test_conditional_skip
+      #     skip 'This test is skipped.' if condition
+      #
+      #     assert do_something
+      #   ensure
+      #     if condition
+      #       do_teardown
+      #     end
+      #   end
+      #
+      #   # good
+      #   def test_skip_is_used_in_rescue
+      #     do_setup
+      #     assert do_something
+      #   rescue
+      #     skip 'This test is skipped.'
+      #   ensure
+      #     do_teardown
+      #   end
+      #
+      class SkipEnsure < Base
+        MSG = '`ensure` is called even though the test is skipped.'
+
+        def on_ensure(node)
+          skip = find_skip(node)
+
+          return if skip.nil? || use_skip_in_rescue?(skip) || valid_conditional_skip?(skip, node)
+
+          add_offense(node.loc.keyword)
+        end
+
+        private
+
+        def find_skip(node)
+          node.node_parts.first.descendants.detect { |n| n.send_type? && n.receiver.nil? && n.method?(:skip) }
+        end
+
+        def use_skip_in_rescue?(skip_method)
+          skip_method.ancestors.detect(&:rescue_type?)
+        end
+
+        def valid_conditional_skip?(skip_method, ensure_node)
+          if_node = skip_method.ancestors.detect(&:if_type?)
+          return false unless ensure_node.body.if_type?
+
+          match_keyword = ensure_node.body.if? ? if_node.if? : if_node.unless?
+          match_keyword && ensure_node.body.condition == if_node.condition
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop enforces that test method names start with `test_` prefix.
+      # Enforces that test method names start with `test_` prefix.
       # It aims to prevent tests that aren't executed by forgetting to start test method name with `test_`.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks for `assert_raises` has an assertion method at
+      # Checks for `assert_raises` has an assertion method at
       # the bottom of block because the assertion will be never reached.
       #
       # @example

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Minitest
-      # This cop checks for a specified error in `assert_raises`.
+      # Checks for a specified error in `assert_raises`.
       #
       # @example
       #   # bad

data/lib/rubocop/cop/minitest_cops.rb

@@ -40,6 +40,7 @@ require_relative 'minitest/refute_instance_of'
 require_relative 'minitest/refute_path_exists'
 require_relative 'minitest/refute_predicate'
 require_relative 'minitest/refute_respond_to'
+require_relative 'minitest/skip_ensure'
 require_relative 'minitest/test_method_name'
 require_relative 'minitest/unreachable_assertion'
 require_relative 'minitest/unspecified_exception'

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

@@ -16,10 +16,10 @@ module RuboCop
       # @param assertion_method [Symbol] Assertion method like `assert` or `refute`.
       # @param target_method [Symbol] Method name offensed by assertion method arguments.
       # @param preferred_method [Symbol] An optional param. Custom method name replaced by
-      #                                  auto-correction. The preferred method name that connects
+      #                                  autocorrection. The preferred method name that connects
       #                                  `assertion_method` and `target_method` with `_` is
       #                                  the default name.
-      # @param inverse [Boolean] An optional param. Order of arguments replaced by auto-correction.
+      # @param inverse [Boolean] An optional param. Order of arguments replaced by autocorrection.
       #
       def define_rule(assertion_method, target_method:, preferred_method: nil, inverse: false)
         preferred_method = "#{assertion_method}_#{target_method.to_s.delete('?')}" if preferred_method.nil?

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

@@ -10,8 +10,13 @@ module RuboCop
 
         def on_send(node)
           return unless (arguments = peel_redundant_parentheses_from(node.arguments))
-          return unless arguments.first.respond_to?(:predicate_method?) && arguments.first.predicate_method?
-          return unless arguments.first.arguments.count.zero?
+
+          first_argument = arguments.first
+
+          return unless first_argument
+          return if first_argument.block_type? || first_argument.numblock_type?
+          return unless predicate_method?(first_argument)
+          return unless first_argument.arguments.count.zero?
 
           add_offense(node, message: offense_message(arguments)) do |corrector|
             autocorrect(corrector, node, arguments)
@@ -34,6 +39,10 @@ module RuboCop
           peel_redundant_parentheses_from(arguments.first.children)
         end
 
+        def predicate_method?(first_argument)
+          first_argument.respond_to?(:predicate_method?) && first_argument.predicate_method?
+        end
+
         def offense_message(arguments)
           message_argument = arguments.last if arguments.first != arguments.last
 

data/lib/rubocop/minitest/assert_offense.rb

@@ -55,7 +55,7 @@ module RuboCop
     # that there were no offenses. The `assert_offense` method has
     # to do more work by parsing out lines that contain carets.
     #
-    # If the code produces an offense that could not be auto-corrected, you can
+    # If the code produces an offense that could not be autocorrected, you can
     # use `assert_no_corrections` after `assert_offense`.
     #
     # @example `assert_offense` and `assert_no_corrections`
@@ -93,7 +93,7 @@ module RuboCop
       def assert_offense(source, file = nil)
         setup_assertion
 
-        @cop.instance_variable_get(:@options)[:auto_correct] = true
+        @cop.instance_variable_get(:@options)[:autocorrect] = true
 
         expected_annotations = RuboCop::RSpec::ExpectOffense::AnnotatedSource.parse(source)
         if expected_annotations.plain_source == source
@@ -176,7 +176,7 @@ module RuboCop
       end
 
       def ruby_version
-        2.5
+        2.6
       end
     end
   end

data/lib/rubocop/minitest/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Minitest
     # This module holds the RuboCop Minitest version information.
     module Version
-      STRING = '0.19.0'
+      STRING = '0.20.1'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

data/relnotes/v0.12.0.md

@@ -4,7 +4,7 @@
 
 ### Changes
 
-* [#129](https://github.com/rubocop/rubocop-minitest/pull/129): Drop Ruby 2.4 support. ([@koic][])
+* [#129](https://github.com/rubocop/rubocop-minitest/pull/129): **(Compatibility)** Drop Ruby 2.4 support. ([@koic][])
 
 [@ghiculescu]: https://github.com/ghiculescu
 [@koic]: https://github.com/koic

data/relnotes/v0.15.2.md

@@ -1,5 +1,5 @@
 ### Bug fixes
 
-* [#145](https://github.com/rubocop/rubocop-minitest/pull/145): Mark `Minitest/AssertEmptyLiteral` as safe auto-correction. ([@koic][])
+* [#145](https://github.com/rubocop/rubocop-minitest/pull/145): Mark `Minitest/AssertEmptyLiteral` as safe autocorrection. ([@koic][])
 
 [@koic]: https://github.com/koic

data/relnotes/v0.19.0.md

@@ -1,5 +1,5 @@
 ### New features
 
-* [#164](https://github.com/rubocop/rubocop-minitest/pull/164): Add new `Minitest/DuplicateTestRun cop. ([@ignacio-chiazzo][])
+* [#164](https://github.com/rubocop/rubocop-minitest/pull/164): Add new `Minitest/DuplicateTestRun` cop. ([@ignacio-chiazzo][])
 
 [@ignacio-chiazzo]: https://github.com/ignacio-chiazzo

data/relnotes/v0.19.1.md

@@ -0,0 +1,5 @@
+### Bug fixes
+
+* [#167](https://github.com/rubocop/rubocop-minitest/pull/167): Fix potential for valid Ruby code to be unparsable in `Minitest/DuplicateTestRun` cop. ([@gjtorikian][])
+
+[@gjtorikian]: https://github.com/gjtorikian

data/relnotes/v0.20.0.md

@@ -0,0 +1,13 @@
+### New features
+
+* [#169](https://github.com/rubocop/rubocop-minitest/issues/169): Add new `Minitest/SkipEnsure` cop. ([@koic][])
+
+### Bug fixes
+
+* [#172](https://github.com/rubocop/rubocop-minitest/issues/172): Fix a false positive for `Minitest/AssertPredicate` and `Minitest/RefutePredicate` when using numbered parameters. ([@koic][])
+
+### Changes
+
+* [#168](https://github.com/rubocop/rubocop-minitest/pull/168): **(Compatibility)** Drop Ruby 2.5 support. ([@koic][])
+
+[@koic]: https://github.com/koic