提交 bcb68605 编写于 作者: J Joshua Peek

Hush loading AR unless it fails

上级 819a353c
......@@ -11,19 +11,15 @@ class ActiveRecordTestConnector
end
# Try to grab AR
if defined?(ActiveRecord) && defined?(Fixtures)
$stderr.puts 'Active Record is already loaded, running tests'
else
$stderr.print 'Attempting to load Active Record... '
unless defined?(ActiveRecord) && defined?(Fixtures)
begin
PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
$LOAD_PATH.unshift PATH_TO_AR
require 'active_record'
require 'active_record/fixtures'
$stderr.puts 'success'
rescue LoadError => e
$stderr.print "failed. Skipping Active Record assertion tests: #{e}"
$stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
ActiveRecordTestConnector.able_to_connect = false
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册