From e66c240a8f46eba1f7d0816c9d72e5cb89f997da Mon Sep 17 00:00:00 2001 From: Jens Kraemer Date: Sun, 10 Jun 2012 11:22:56 +0200 Subject: fix namespace collision with test-unit-activesupport --- activesupport/lib/active_support/testing/deprecation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/testing') diff --git a/activesupport/lib/active_support/testing/deprecation.rb b/activesupport/lib/active_support/testing/deprecation.rb index 0135185a47..36824134da 100644 --- a/activesupport/lib/active_support/testing/deprecation.rb +++ b/activesupport/lib/active_support/testing/deprecation.rb @@ -45,7 +45,7 @@ else class Error #:nodoc: # Silence warnings when reporting test errors. def message_with_silenced_deprecation - ActiveSupport::Deprecation.silence { message_without_silenced_deprecation } + ::ActiveSupport::Deprecation.silence { message_without_silenced_deprecation } end alias_method :message_without_silenced_deprecation, :message alias_method :message, :message_with_silenced_deprecation -- cgit v1.2.3