diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-22 20:52:29 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-22 20:52:29 -0700 |
| commit | 4d5ac3f3d2e1667971752c9a4e536de1a5bec364 (patch) | |
| tree | a4ba362120c09947499ffc512c6cbbb21a8039fd /activesupport | |
| parent | baddea95e183b3bef290ec433f917ee8cd806934 (diff) | |
| download | rails-4d5ac3f3d2e1667971752c9a4e536de1a5bec364.tar.gz rails-4d5ac3f3d2e1667971752c9a4e536de1a5bec364.tar.bz2 rails-4d5ac3f3d2e1667971752c9a4e536de1a5bec364.zip | |
Check for mocha gem without requiring the lib. [#403 state:resolved]
Diffstat (limited to 'activesupport')
| -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 21d71eb92a..d934246d4d 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 - require 'mocha' + gem 'mocha' alias_method :run, :run_with_callbacks_and_mocha - rescue LoadError + rescue Gem::LoadError alias_method :run, :run_with_callbacks_and_testunit end end |