@@ -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 activesupport/lib/active_support/testing/setup_and_teardown.rb 4d5ac3f3d2e1667971752c9a4e536de1a5bec364 Jeremy Kemper jeremy@bitsweat.net http://github.com/ddollar/rails/commit/d7462ea36550bd59cfbcd7961f5870c49bcf8963 d7462ea36550bd59cfbcd7961f5870c49bcf8963 2008-06-23T00:31:49-07:00 2008-06-23T00:31:49-07:00 Revert "Check for mocha gem without requiring the lib. [#403 state:resolved]" This reverts commit 4d5ac3f3d2e1667971752c9a4e536de1a5bec364. 10bf700bcc147535ee694ce39cd4d4d110383b8d Jeremy Kemper jeremy@bitsweat.net