aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-09-22 17:48:54 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-09-22 17:48:54 +0000
commit9b55e3dad13e4f68d10ead329784bef4e1a74cd7 (patch)
tree6cf7d0f99c950b20a6ea20518e08a050143e369e
parentc361caf8b41f51e83ec4bd857df1cf58e7f31915 (diff)
downloadrails-9b55e3dad13e4f68d10ead329784bef4e1a74cd7.tar.gz
rails-9b55e3dad13e4f68d10ead329784bef4e1a74cd7.tar.bz2
rails-9b55e3dad13e4f68d10ead329784bef4e1a74cd7.zip
Make tests run with mocha gem
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/test/fcgi_dispatcher_test.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/test/fcgi_dispatcher_test.rb b/railties/test/fcgi_dispatcher_test.rb
index 607e15d912..37bf4c8641 100644
--- a/railties/test/fcgi_dispatcher_test.rb
+++ b/railties/test/fcgi_dispatcher_test.rb
@@ -2,8 +2,7 @@ require File.dirname(__FILE__) + "/abstract_unit"
begin # rescue LoadError
-require 'mocha'
-require 'stubba'
+require_library_or_gem 'mocha'
$:.unshift File.dirname(__FILE__) + "/mocks"
@@ -261,6 +260,6 @@ class RailsFCGIHandlerPeriodicGCTest < Test::Unit::TestCase
end
end
-rescue LoadError
- $stderr.puts "Skipping dispatcher tests. `gem install mocha` and try again."
+rescue LoadError => e
+ $stderr.puts "Skipping dispatcher tests. `gem install mocha` and try again. (#{e})"
end \ No newline at end of file