aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing/setup_and_teardown.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-19 10:52:30 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-19 10:52:30 -0500
commitd84d99a8f7dc672b050a6ab891c1680a323a7c97 (patch)
tree9de802664f629dd76f560056408b07f32c3dd5b7 /activesupport/lib/active_support/testing/setup_and_teardown.rb
parentf2059393481ceb632abc7a9d92670e409020d5bd (diff)
downloadrails-d84d99a8f7dc672b050a6ab891c1680a323a7c97.tar.gz
rails-d84d99a8f7dc672b050a6ab891c1680a323a7c97.tar.bz2
rails-d84d99a8f7dc672b050a6ab891c1680a323a7c97.zip
Undefine old run method
Diffstat (limited to 'activesupport/lib/active_support/testing/setup_and_teardown.rb')
-rw-r--r--activesupport/lib/active_support/testing/setup_and_teardown.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 21d71eb92a..a514b61fea 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -15,12 +15,15 @@ module ActiveSupport
define_callbacks :setup, :teardown
if defined?(::Mini)
+ undef_method :run
alias_method :run, :run_with_callbacks_and_miniunit
else
begin
require 'mocha'
+ undef_method :run
alias_method :run, :run_with_callbacks_and_mocha
rescue LoadError
+ undef_method :run
alias_method :run, :run_with_callbacks_and_testunit
end
end