Permalink
Browse files

Merge pull request #6693 from jkraemer/3-2-stable

Bugfix: Namespace collision with test-unit-activesupport 1.0.0
  • Loading branch information...
2 parents eaeebc2 + e66c240 commit 6cc941dedbc435efa65cce896e7c6bf5fa519e99 @josevalim josevalim committed Jun 10, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/testing/deprecation.rb
@@ -45,7 +45,7 @@ module Unit
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

0 comments on commit 6cc941d

Please sign in to comment.