diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-23 00:31:49 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-23 00:31:49 -0700 |
| commit | d7462ea36550bd59cfbcd7961f5870c49bcf8963 (patch) | |
| tree | 10bf700bcc147535ee694ce39cd4d4d110383b8d /activesupport/lib/active_support/testing | |
| parent | 4d5ac3f3d2e1667971752c9a4e536de1a5bec364 (diff) | |
| download | rails-d7462ea36550bd59cfbcd7961f5870c49bcf8963.tar.gz rails-d7462ea36550bd59cfbcd7961f5870c49bcf8963.tar.bz2 rails-d7462ea36550bd59cfbcd7961f5870c49bcf8963.zip | |
Revert "Check for mocha gem without requiring the lib. [#403 state:resolved]"
This reverts commit 4d5ac3f3d2e1667971752c9a4e536de1a5bec364.
Diffstat (limited to 'activesupport/lib/active_support/testing')
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index d934246d4d..21d71eb92a 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -18,9 +18,9 @@ module ActiveSupport alias_method :run, :run_with_callbacks_and_miniunit else begin - gem 'mocha' + require 'mocha' alias_method :run, :run_with_callbacks_and_mocha - rescue Gem::LoadError + rescue LoadError alias_method :run, :run_with_callbacks_and_testunit end end |