Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove more references to Test::Unit

  • Loading branch information...
commit 2fc3a30e1775732cfa0f84256b452197465f4c7f 1 parent c8fef32
@rafaelfranca rafaelfranca authored
View
19 activesupport/lib/active_support/testing/deprecation.rb
@@ -34,22 +34,3 @@ def collect_deprecations
end
end
end
-
-begin
- require 'test/unit/error'
-rescue LoadError
- # Using miniunit, ignore.
-else
- module Test
- module Unit
- class Error #:nodoc:
- # Silence warnings when reporting test errors.
- def message_with_silenced_deprecation
- ActiveSupport::Deprecation.silence { message_without_silenced_deprecation }
- end
- alias_method :message_without_silenced_deprecation, :message
- alias_method :message, :message_with_silenced_deprecation
- end
- end
- end
-end
View
2  activesupport/test/deprecation_test.rb
@@ -120,7 +120,7 @@ def test_assert_deprecated_matches_any_warning
ActiveSupport::Deprecation.warn 'abc'
ActiveSupport::Deprecation.warn 'def'
end
- rescue Test::Unit::AssertionFailedError
+ rescue MiniTest::Assertion
flunk 'assert_deprecated should match any warning in block, not just the last one'
end
Please sign in to comment.
Something went wrong with that request. Please try again.