test-unit-activesupport 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee232c1a36b8324a842707a1956fafef2fd3fbee
-  data.tar.gz: 9d6747dc2b117d9ed06c98db2d89cbc9938060dd
+SHA256:
+  metadata.gz: 72fb6f3db588c7c5fa4538ea41afb3946b625f619648b7dd5e3e7cb193cd0dc1
+  data.tar.gz: '0887c23e8337a1bc12aa7d2cef2055d451b414b0eea049bc5023b9ce54aa7d26'
 SHA512:
-  metadata.gz: f4902be929ea3f959eb2d7073bea197abf31b08a989dfd5192b19d3ea6cacaff9ebbf717fcff744c29b13d18b942caf42397b3b3579ba60b6ea5c2ca688d4673
-  data.tar.gz: 09e9d30d6214d6a071ba24a2b9af599091529dc1fa58107c1beda3fe50c1959a1cc48e01f731b7f7a035065a0fd7fbcf1c45a7b4746cc1eb2867373b18955b4d
+  metadata.gz: 2b8506271e926f244864c9207ad4080b63bbfc80de7460032b20df8a87f7e319b4a653f50c4969210596c5fbb6a496a819a259fb09adc0347d7d89cfcf459fa7
+  data.tar.gz: 4c851c2b43def691b781fb5d48ef3115edf7299dd1204f6496a04b5b0e1eba1ddb19e4251c477a6df18e3821c9152ff177f6e01f0a01ff0b6de3b141d84f8acb

data/README.md

@@ -12,16 +12,14 @@ test-unit-activesupport is an ActiveSupport adapter for test-unit 3. You can use
 
 Require `test/unit/active_support`:
 
-```
+```ruby
 require "test/unit/active_support"
 require "active_support"
 ```
 
 Now you can use full test-unit 3.x features with ActiveSupport.
 
-```
-require "test/unit/active_support"
-require "active_support"
+```ruby
 
 class YourTest < ActiveSupport::TestCase
   # ...

data/doc/text/news.md

@@ -1,5 +1,54 @@
 # 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
+
+  * Supported `#before_setup` and `#after_teardown`.
+    [GitHub:test-unit-rails#15][Reported by naofumi-fujii]
+
+### Thanks
+
+  * naofumi-fujii
+
+## 1.0.8 - 2016-12-20 {#1-0-8}
+
+### Fixes
+
+  * Supported Active Support 4 again.
+    [GitHub#12][Patch by Akira Matsuda]
+
+### Thanks
+
+  * Akira Matsuda
+
+## 1.0.7 - 2016-12-15 {#1-0-7}
+
+### Improvements
+
+  * Supported `ActiveSupport::Testing::FileFixtures`.
+
+### Fixes
+
+  * Removed duplicated description in README.
+    [GitHub#11][Patch by James Pinto]
+
+### Thanks
+
+  * James Pinto
+
 ## 1.0.6 - 2016-05-20 {#1-0-6}
 
 Rails 5.0 RC1 support release.

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.6"
+      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
@@ -17,7 +15,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "test-unit"
+require "active_support"
+require 'active_support/core_ext/class/attribute'
 require "active_support/testing/assertions"
+begin
+  require 'active_support/testing/file_fixtures'
+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)}
@@ -38,12 +48,24 @@ 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
     Assertion = Test::Unit::AssertionFailedError
 
+    setup :before => :prepend
+    def before_setup
+    end
+
+    teardown :after => :append
+    def after_teardown
+    end
+
     # rails 4.1 (action dispatch assertions) needs the 'message'
     # method which is not defined in test-unit 3
     def message(msg=nil, ending=nil, &default)
@@ -64,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.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,13 +143,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+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
-has_rdoc: 
+- test/test_assertions.rb