timcharper / rails fork watch download tarball
public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/timcharper/rails.git 
Revert "Check for mocha gem without requiring the lib.  [#403 
state:resolved]"

This reverts commit 4d5ac3f3d2e1667971752c9a4e536de1a5bec364.
jeremy (author)
Mon Jun 23 00:31:49 -0700 2008
commit  d7462ea36550bd59cfbcd7961f5870c49bcf8963
tree    10bf700bcc147535ee694ce39cd4d4d110383b8d
parent  4d5ac3f3d2e1667971752c9a4e536de1a5bec364
0
activesupport/lib/active_support/testing/setup_and_teardown.rb 
...
18
19
20
21
 
22
23
 
24
25
26
 
...
18
19
20
 
21
22
 
23
24
25
26
 
0
@@ -18,9 +18,9 @@ module ActiveSupport
0
             alias_method :run, :run_with_callbacks_and_miniunit
0
           else
0
             begin
0
-              gem 'mocha'
0
+              require 'mocha'
0
               alias_method :run, :run_with_callbacks_and_mocha
0
-            rescue Gem::LoadError
0
+            rescue LoadError
0
               alias_method :run, :run_with_callbacks_and_testunit
0
             end
0
           end

Comments

    No one has commented yet.