From d7462ea36550bd59cfbcd7961f5870c49bcf8963 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 23 Jun 2008 00:31:49 -0700 Subject: Revert "Check for mocha gem without requiring the lib. [#403 state:resolved]" This reverts commit 4d5ac3f3d2e1667971752c9a4e536de1a5bec364. --- activesupport/lib/active_support/testing/setup_and_teardown.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib') 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 -- cgit v1.2.3