mirror of
https://github.com/github/rails.git
synced 2026-01-31 09:18:17 -05:00
Dont run FCGIDispatcher tests if mocha is not available
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5118 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -5,8 +5,6 @@ $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
|
||||
|
||||
require 'test/unit'
|
||||
require 'rubygems'
|
||||
require 'mocha'
|
||||
require 'stubba'
|
||||
|
||||
# Needed for the class mock delegation
|
||||
#require File.dirname(__FILE__) + "/../../activesupport/lib/active_support/core_ext/class/attribute_accessors"
|
||||
|
||||
@@ -138,4 +138,4 @@ class DispatcherTest < Test::Unit::TestCase
|
||||
def assert_subclasses(howmany, klass, message = klass.subclasses.inspect)
|
||||
assert_equal howmany, klass.subclasses.size, message
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,5 +1,10 @@
|
||||
require File.dirname(__FILE__) + "/abstract_unit"
|
||||
|
||||
begin # rescue LoadError
|
||||
|
||||
require 'mocha'
|
||||
require 'stubba'
|
||||
|
||||
$:.unshift File.dirname(__FILE__) + "/mocks"
|
||||
|
||||
require 'stringio'
|
||||
@@ -283,3 +288,7 @@ class RailsFCGIHandlerPeriodicGCTest < Test::Unit::TestCase
|
||||
assert_nil @handler.when_ready
|
||||
end
|
||||
end
|
||||
|
||||
rescue LoadError
|
||||
$stderr.puts "Skipping dispatcher tests. `gem install mocha` and try again."
|
||||
end
|
||||
Reference in New Issue
Block a user