Permalink
Browse files

Revert "Check for mocha gem without requiring the lib. [#403 state:re…

…solved]"

This reverts commit 4d5ac3f.
  • Loading branch information...
1 parent 4d5ac3f commit d7462ea36550bd59cfbcd7961f5870c49bcf8963 @jeremy jeremy committed Jun 23, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -18,9 +18,9 @@ def self.included(base)
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

0 comments on commit d7462ea

Please sign in to comment.