test-unit-activesupport 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aed9d1a340f08ed230f9ee71a37ef837fad81b46
-  data.tar.gz: 3219a38b5460b420224b92b51bc068297709f798
+SHA256:
+  metadata.gz: 72fb6f3db588c7c5fa4538ea41afb3946b625f619648b7dd5e3e7cb193cd0dc1
+  data.tar.gz: '0887c23e8337a1bc12aa7d2cef2055d451b414b0eea049bc5023b9ce54aa7d26'
 SHA512:
-  metadata.gz: 444784182d3328b2326f1272e293f81fe4e57a678b69e949f1344e7c2b5eea146ec9f869388c8d0e3630a09837c9ba4f4ac07b1426bf955e2234cdc78f8fc87a
-  data.tar.gz: ee73e619f1e793c6a6b9285246ebfd38c702d1a681963851998a8a7e1ffb2434209d343683939f6e3948203a683004280c78e2d4731004e0012ac3b0d253390d
+  metadata.gz: 2b8506271e926f244864c9207ad4080b63bbfc80de7460032b20df8a87f7e319b4a653f50c4969210596c5fbb6a496a819a259fb09adc0347d7d89cfcf459fa7
+  data.tar.gz: 4c851c2b43def691b781fb5d48ef3115edf7299dd1204f6496a04b5b0e1eba1ddb19e4251c477a6df18e3821c9152ff177f6e01f0a01ff0b6de3b141d84f8acb

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.1.0 - 2021-02-20 {#1-1-0}
+
+### Improvements
+
+  * Added support for exception in assertions defined by Active
+    Support 6 or later.
+    [GitHub#14][Reported by Yuki Morohoshi]
+
+### Thanks
+
+  * Yuki Morohoshi
+
 ## 1.0.9 - 2017-07-26 {#1-0-9}
 
 ### Improvements

data/lib/test/unit/active_support/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
 module Test
   module Unit
     module ActiveSupport
-      VERSION = "1.0.9"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/test/unit/active_support.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -25,6 +23,11 @@ begin
 rescue LoadError
   # Active Support < 5 doesn't have file_fixtures
 end
+begin
+  require "active_support/testing/tagged_logging"
+rescue LoadError
+  # Active Support < 7 doesn't have tagged_logging
+end
 
 as_test_case_name = "active_support/test_case.rb"
 unless $LOADED_FEATURES.any? {|feature| feature.end_with?(as_test_case_name)}
@@ -45,8 +48,11 @@ module ActiveSupport
   end
 
   class TestCase < ::Test::Unit::TestCase
+    alias_method :assert_nothing_raised_original, :assert_nothing_raised
     include ActiveSupport::Testing::Assertions
+    alias_method :assert_nothing_raised, :assert_nothing_raised_original
     include ActiveSupport::Testing::FileFixtures if defined?(ActiveSupport::Testing::FileFixtures)
+    include ActiveSupport::Testing::TaggedLogging if defined?(ActiveSupport::Testing::TaggedLogging)
 
     # shoulda needs ActiveSupport::TestCase::Assertion, which is not
     # set in test-unit 3
@@ -80,5 +86,22 @@ module ActiveSupport
     def mu_pp(object)
       AssertionMessage.convert(object)
     end
+
+    if private_method_defined?(:_assert_nothing_raised_or_warn)
+      def _assert_nothing_raised_or_warn(assertion, &block)
+        assert_nothing_raised(&block)
+      rescue Test::Unit::AssertionFailedError => e
+        if tagged_logger && tagged_logger.warn?
+          warning = <<~MSG
+            #{self.class} - #{name}: #{e.error.class} raised.
+            If you expected this exception, use `assert_raise` as near to the code that raises as possible.
+            Other block based assertions (e.g. `#{assertion}`) can be used, as long as `assert_raise` is inside their block.
+          MSG
+          tagged_logger.warn warning
+        end
+
+        raise
+      end
+    end
   end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2022  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,10 +16,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-base_dir = File.expand_path("..")
-lib_dir = File.join(base_dir)
+base_dir = File.expand_path(File.join(__dir__, ".."))
+lib_dir = File.join(base_dir, "lib")
 $LOAD_PATH.unshift(lib_dir)
 
 require "test/unit/active_support"
 
-exit(Test::Unit::AutoRunner.run(true))
+test_dir = File.join(base_dir, "test")
+exit(Test::Unit::AutoRunner.run(true, test_dir))

data/test/test_assertions.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2022  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -26,12 +26,38 @@ class TestAssertions < ActiveSupport::TestCase
     end
   end
 
+  test "assert_difference: raise" do
+    x = 1
+    if ActiveSupport.version < Gem::Version.new("6")
+      assert_raise(RuntimeError.new("Unexpected")) do
+        assert_difference("x", 1) do
+          raise "Unexpected"
+        end
+      end
+    else
+      assert_raise(Test::Unit::AssertionFailedError) do
+        assert_difference("x", 1) do
+          raise "Unexpected"
+        end
+      end
+    end
+  end
+
   test "assert_no_difference" do
     x = 1
     assert_no_difference("x") do
     end
   end
 
+
+  test "assert_nothing_raised" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_nothing_raised do
+        raise "Unexpected"
+      end
+    end
+  end
+
   test "message method" do
     delayed_message = message("test", "bernd") do
       "hans"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-unit-activesupport
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,12 +143,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: test-unit-activesupport is an ActiveSupport adapter for test-unit 3. You
   can use full test-unit 3 features with `ActiveSupport::TestCase`.
 test_files:
-- test/test_assertions.rb
 - test/run-test.rb
+- test/test_assertions.rb