Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Make tests run with mocha gem

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 9b55e3dad13e4f68d10ead329784bef4e1a74cd7 1 parent c361caf
@dhh dhh authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 railties/test/fcgi_dispatcher_test.rb
View
7 railties/test/fcgi_dispatcher_test.rb
@@ -2,8 +2,7 @@
begin # rescue LoadError
-require 'mocha'
-require 'stubba'
+require_library_or_gem 'mocha'
$:.unshift File.dirname(__FILE__) + "/mocks"
@@ -261,6 +260,6 @@ def test_periodic_gc
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

0 comments on commit 9b55e3d

Please sign in to comment.
Something went wrong with that request. Please try again.