rubocop-minitest 0.11.0 → 0.14.0

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Minitest
+      # This cop checks for `assert_raises` has an assertion method at
+      # the bottom of block because the assertion will be never reached.
+      #
+      # @example
+      #
+      #   # bad
+      #   assert_raises FooError do
+      #     obj.occur_error
+      #     assert_equal('foo', obj.bar) # Never asserted.
+      #   end
+      #
+      #   # good
+      #   assert_raises FooError do
+      #     obj.occur_error
+      #   end
+      #   assert_equal('foo', obj.bar)
+      #
+      class UnreachableAssertion < Base
+        include MinitestExplorationHelpers
+
+        MSG = 'Unreachable `%<assertion_method>s` detected.'
+
+        def on_block(node)
+          return unless node.method?(:assert_raises) && (body = node.body)
+
+          last_node = body.begin_type? ? body.children.last : body
+          return unless last_node.send_type?
+
+          method_name = last_node.method_name
+          return unless assertion_method?(method_name)
+
+          add_offense(last_node, message: format(MSG, assertion_method: method_name))
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module RuboCop
       #   assert_raises(FooException) { raise FooException }
       #   assert_raises(FooException, 'This should have raised') { raise FooException }
       #
-      class UnspecifiedException < Cop
+      class UnspecifiedException < Base
         MSG = 'Specify the exception being captured.'
 
         def on_block(block_node)

data/lib/rubocop/cop/minitest_cops.rb

@@ -23,6 +23,7 @@ require_relative 'minitest/assert_truthy'
 require_relative 'minitest/global_expectations'
 require_relative 'minitest/literal_as_actual_argument'
 require_relative 'minitest/multiple_assertions'
+require_relative 'minitest/no_assertions'
 require_relative 'minitest/refute_empty'
 require_relative 'minitest/refute_false'
 require_relative 'minitest/refute_equal'
@@ -35,4 +36,5 @@ require_relative 'minitest/refute_instance_of'
 require_relative 'minitest/refute_path_exists'
 require_relative 'minitest/refute_respond_to'
 require_relative 'minitest/test_method_name'
+require_relative 'minitest/unreachable_assertion'
 require_relative 'minitest/unspecified_exception'

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

@@ -9,24 +9,14 @@ module RuboCop
       def on_send(node)
         equal_floats_call(node) do |expected, actual, message|
           message = message.first
+          good_method = build_good_method(expected, actual, message)
 
           if expected.float_type? || actual.float_type?
-            message = format(MSG,
-                             good_method: build_good_method(expected, actual, message),
-                             bad_method: node.source)
+            message = format(MSG, good_method: good_method, bad_method: node.source)
 
-            add_offense(node, message: message)
-          end
-        end
-      end
-
-      def autocorrect(node)
-        equal_floats_call(node) do |expected, actual, message|
-          message = message.first
-          replacement = build_good_method(expected, actual, message)
-
-          lambda do |corrector|
-            corrector.replace(node, replacement)
+            add_offense(node, message: message) do |corrector|
+              corrector.replace(node, good_method)
+            end
           end
         end
       end

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

@@ -26,6 +26,7 @@ module RuboCop
 
         class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
           include ArgumentRangeHelper
+          extend AutoCorrector
 
           MSG = 'Prefer using `#{preferred_method}(%<new_arguments>s)` over ' \
                 '`#{assertion_method}(%<original_arguments>s)`.'
@@ -36,23 +37,21 @@ module RuboCop
             return unless (arguments = peel_redundant_parentheses_from(node.arguments))
             return unless arguments.first.respond_to?(:method?) && arguments.first.method?(:#{target_method})
 
-            add_offense(node, message: offense_message(arguments))
+            add_offense(node, message: offense_message(arguments)) do |corrector|
+              autocorrect(corrector, node, arguments)
+            end
           end
 
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.selector, '#{preferred_method}')
-
-              arguments = peel_redundant_parentheses_from(node.arguments)
+          def autocorrect(corrector, node, arguments)
+            corrector.replace(node.loc.selector, '#{preferred_method}')
 
-              new_arguments = new_arguments(arguments).join(', ')
+            new_arguments = new_arguments(arguments).join(', ')
 
-              if enclosed_in_redundant_parentheses?(node)
-                new_arguments = '(' + new_arguments + ')'
-              end
-
-              corrector.replace(first_argument_range(node), new_arguments)
+            if enclosed_in_redundant_parentheses?(node)
+              new_arguments = '(' + new_arguments + ')'
             end
+
+            corrector.replace(first_argument_range(node), new_arguments)
           end
 
           private

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

@@ -19,6 +19,8 @@ module RuboCop
         refute_respond_to refute_same
       ].freeze
 
+      FLUNK = 'flunk'
+
       LIFECYCLE_HOOK_METHODS = %i[
         before_setup
         setup
@@ -42,8 +44,13 @@ module RuboCop
       end
 
       def test_cases(class_node)
-        class_def_nodes(class_node)
-          .select { |def_node| test_case_name?(def_node.method_name) }
+        test_cases = class_def_nodes(class_node).select { |def_node| test_case_name?(def_node.method_name) }
+
+        # Support Active Support's `test 'example' { ... }` method.
+        # https://api.rubyonrails.org/classes/ActiveSupport/Testing/Declarative.html
+        test_blocks = class_node.each_descendant(:block).select { |block_node| block_node.method?(:test) }
+
+        test_cases + test_blocks
       end
 
       def lifecycle_hooks(class_node)
@@ -82,11 +89,14 @@ module RuboCop
 
       def assertion?(node)
         node.send_type? &&
-          ASSERTION_PREFIXES.any? { |prefix| node.method_name.to_s.start_with?(prefix) }
+          ASSERTION_PREFIXES.any? do |prefix|
+            method_name = node.method_name.to_s
+            method_name == FLUNK || method_name.start_with?(prefix)
+          end
       end
 
       def assertion_method?(method_name)
-        ASSERTION_METHODS.include?(method_name)
+        method_name == FLUNK || ASSERTION_METHODS.include?(method_name)
       end
 
       def lifecycle_hook_method?(node)

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.11.0'
+      STRING = '0.14.0'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

data/relnotes/v0.11.1.md

@@ -0,0 +1,5 @@
+### Changes
+
+* [#126](https://github.com/rubocop/rubocop-minitest/issues/126): Mark `Minitest/AssertWithExpectedArgument` as unsafe. ([@koic][])
+
+[@koic]: https://github.com/koic

data/relnotes/v0.12.0.md

@@ -0,0 +1,10 @@
+### New features
+
+* [#124](https://github.com/rubocop/rubocop-minitest/pull/124): Add new `Minitest/NoAssertions` cop. ([@ghiculescu][])
+
+### Changes
+
+* [#129](https://github.com/rubocop/rubocop-minitest/pull/129): Drop Ruby 2.4 support. ([@koic][])
+
+[@ghiculescu]: https://github.com/ghiculescu
+[@koic]: https://github.com/koic

data/relnotes/v0.12.1.md

@@ -0,0 +1,5 @@
+### Bug fixes
+
+* [#131](https://github.com/rubocop/rubocop-minitest/issues/131): Fix an error for `Minitest/MultipleAssertions` and fixes a false positive for `test` block. ([@koic][])
+
+[@koic]: https://github.com/koic

data/relnotes/v0.13.0.md

@@ -0,0 +1,5 @@
+### New features
+
+* [#136](https://github.com/rubocop/rubocop-minitest/pull/136): Support Active Support's `test` method for `Minitest/MultipleAssertions` and `Minitest/NoAssertions` cops. ([@koic][])
+
+[@koic]: https://github.com/koic

data/relnotes/v0.14.0.md

@@ -0,0 +1,5 @@
+### New features
+
+* [#133](https://github.com/rubocop/rubocop-minitest/issues/133): Add new `Minitest/UnreachableAssertion` cop. ([@koic][])
+
+[@koic]: https://github.com/koic

data/rubocop-minitest.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   DESCRIPTION
   spec.license = 'MIT'
 
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.metadata = {
     'homepage_uri' => 'https://docs.rubocop.org/rubocop-minitest/',
     'changelog_uri' => 'https://github.com/rubocop/rubocop-minitest/blob/master/CHANGELOG.md',

data/tasks/cops_documentation.rake

@@ -25,15 +25,14 @@ task verify_cops_documentation: :generate_cops_documentation do
     # Output diff before raising error
     sh('GIT_PAGER=cat git diff docs')
 
-    warn 'The docs directory is out of sync. ' \
-      'Run `rake generate_cops_documentation` and commit the results.'
+    warn 'The docs directory is out of sync. Run `rake generate_cops_documentation` and commit the results.'
     exit!
   end
 end
 
 desc 'Syntax check for the documentation comments'
 task documentation_syntax_check: :yard_for_generate_documentation do
-  require 'parser/ruby25'
+  require 'parser/ruby30'
 
   ok = true
   YARD::Registry.load!
@@ -46,17 +45,15 @@ task documentation_syntax_check: :yard_for_generate_documentation do
     end
 
     examples.to_a.each do |example|
-      begin
-        buffer = Parser::Source::Buffer.new('<code>', 1)
-        buffer.source = example.text
-        parser = Parser::Ruby25.new(RuboCop::AST::Builder.new)
-        parser.diagnostics.all_errors_are_fatal = true
-        parser.parse(buffer)
-      rescue Parser::SyntaxError => e
-        path = example.object.file
-        puts "#{path}: Syntax Error in an example. #{e}"
-        ok = false
-      end
+      buffer = Parser::Source::Buffer.new('<code>', 1)
+      buffer.source = example.text
+      parser = Parser::Ruby30.new(RuboCop::AST::Builder.new)
+      parser.diagnostics.all_errors_are_fatal = true
+      parser.parse(buffer)
+    rescue Parser::SyntaxError => e
+      path = example.object.file
+      puts "#{path}: Syntax Error in an example. #{e}"
+      ok = false
     end
   end
   abort unless ok

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -105,6 +105,7 @@ files:
 - lib/rubocop/cop/minitest/global_expectations.rb
 - lib/rubocop/cop/minitest/literal_as_actual_argument.rb
 - lib/rubocop/cop/minitest/multiple_assertions.rb
+- lib/rubocop/cop/minitest/no_assertions.rb
 - lib/rubocop/cop/minitest/refute_empty.rb
 - lib/rubocop/cop/minitest/refute_equal.rb
 - lib/rubocop/cop/minitest/refute_false.rb
@@ -117,6 +118,7 @@ files:
 - lib/rubocop/cop/minitest/refute_path_exists.rb
 - lib/rubocop/cop/minitest/refute_respond_to.rb
 - lib/rubocop/cop/minitest/test_method_name.rb
+- lib/rubocop/cop/minitest/unreachable_assertion.rb
 - lib/rubocop/cop/minitest/unspecified_exception.rb
 - lib/rubocop/cop/minitest_cops.rb
 - lib/rubocop/cop/mixin/argument_range_helper.rb
@@ -134,6 +136,11 @@ files:
 - relnotes/v0.10.2.md
 - relnotes/v0.10.3.md
 - relnotes/v0.11.0.md
+- relnotes/v0.11.1.md
+- relnotes/v0.12.0.md
+- relnotes/v0.12.1.md
+- relnotes/v0.13.0.md
+- relnotes/v0.14.0.md
 - relnotes/v0.2.0.md
 - relnotes/v0.2.1.md
 - relnotes/v0.3.0.md
@@ -158,7 +165,7 @@ metadata:
   homepage_uri: https://docs.rubocop.org/rubocop-minitest/
   changelog_uri: https://github.com/rubocop/rubocop-minitest/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop-minitest
-  documentation_uri: https://docs.rubocop.org/rubocop-minitest/0.11
+  documentation_uri: https://docs.rubocop.org/rubocop-minitest/0.14
   bug_tracker_uri: https://github.com/rubocop/rubocop-minitest/issues
 post_install_message:
 rdoc_options: []
@@ -168,14 +175,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.2.18
 signing_key:
 specification_version: 4
 summary: Automatic Minitest code style checking tool.