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

This reverts commit 8636df7b5572b996cee0bfb59f9804825b3030d2.
jeremy (author)
Mon Jun 23 00:37:19 -0700 2008
commit  642b0e95122c6f748ba0575e6dd3e2eccf34509c
tree    f9ed5664d573e3403f645427db327318c0348009
parent  8636df7b5572b996cee0bfb59f9804825b3030d2
0
activesupport/lib/active_support/testing/setup_and_teardown.rb 
...
14
15
16
17
 
18
19
 
20
21
22
 
...
14
15
16
 
17
18
 
19
20
21
22
 
0
@@ -14,9 +14,9 @@ module ActiveSupport
0
         base.define_callbacks :setup, :teardown
0
 
0
         begin
0
-          gem 'mocha'
0
+          require 'mocha'
0
           base.alias_method_chain :run, :callbacks_and_mocha
0
-        rescue Gem::LoadError
0
+        rescue LoadError
0
           base.alias_method_chain :run, :callbacks
0
         end
0
       end

Comments