aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/abstract_unit.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/abstract_unit.rb')
-rw-r--r--railties/test/abstract_unit.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index e1ce32da65..516ab8523e 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -3,18 +3,15 @@ $:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
$:.unshift File.dirname(__FILE__) + "/../lib"
$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
+require 'rubygems'
require 'test/unit'
+gem 'mocha', '>= 0.9.3'
+require 'mocha'
require 'stringio'
require 'active_support'
-# Wrap tests that use Mocha and skip if unavailable.
def uses_mocha(test_name)
- require 'rubygems'
- gem 'mocha', '>= 0.5.5'
- require 'mocha'
yield
-rescue LoadError
- $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
end
if defined?(RAILS_ROOT)