mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make tests run with mocha gem
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
c361caf8b4
commit
9b55e3dad1
1 changed files with 3 additions and 4 deletions
|
@ -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
|
Loading…
Reference in a new issue