Clean up and run the Active Record integration tests by default.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4804 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
bb531a946d
commit
070f3fdc8c
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Clean up and run the Active Record integration tests by default. [Jeremy Kemper]
|
||||
|
||||
* Correct example in cookies docs. #5832 [jessemerriman@warpmail.net]
|
||||
|
||||
* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
|
||||
|
|
|
@ -22,7 +22,9 @@ task :default => [ :test ]
|
|||
|
||||
# Run the unit tests
|
||||
|
||||
Rake::TestTask.new { |t|
|
||||
task :test => [:test_action_pack, :test_active_record_integration]
|
||||
|
||||
Rake::TestTask.new(:test_action_pack) { |t|
|
||||
t.libs << "test"
|
||||
# make sure we include the controller tests (c*) first as on some systems
|
||||
# this will not happen automatically and the tests (as a whole) will error
|
||||
|
|
|
@ -11,14 +11,25 @@ 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... '
|
||||
begin
|
||||
PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
|
||||
require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
|
||||
require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
|
||||
PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
|
||||
raise "#{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 Object => e
|
||||
$stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
|
||||
$stderr.print "failed. Skipping Active Record assertion tests: #{e}"
|
||||
ActiveRecordTestConnector.able_to_connect = false
|
||||
end
|
||||
end
|
||||
$stderr.flush
|
||||
|
||||
|
||||
|
||||
# Define the rest of the connector
|
||||
class ActiveRecordTestConnector
|
||||
|
@ -38,7 +49,6 @@ class ActiveRecordTestConnector
|
|||
|
||||
def self.setup_connection
|
||||
if Object.const_defined?(:ActiveRecord)
|
||||
|
||||
begin
|
||||
ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
|
||||
ActiveRecord::Base.connection
|
||||
|
@ -65,10 +75,13 @@ end
|
|||
# Test case for inheiritance
|
||||
class ActiveRecordTestCase < Test::Unit::TestCase
|
||||
# Set our fixture path
|
||||
if ActiveRecordTestConnector.able_to_connect
|
||||
self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
|
||||
self.use_transactional_fixtures = false
|
||||
end
|
||||
|
||||
def setup
|
||||
abort_tests unless ActiveRecordTestConnector.connected = true
|
||||
abort_tests unless ActiveRecordTestConnector.connected
|
||||
end
|
||||
|
||||
# Default so Test::Unit::TestCase doesn't complain
|
||||
|
@ -76,7 +89,6 @@ class ActiveRecordTestCase < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
private
|
||||
|
||||
# If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
|
||||
def abort_tests
|
||||
self.class.public_instance_methods.grep(/^test./).each do |method|
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
require "#{File.dirname(__FILE__)}/../active_record_unit"
|
||||
require 'fixtures/company'
|
||||
require 'fixtures/company' if ActiveRecordTestConnector.able_to_connect
|
||||
|
||||
class ActiveRecordAssertionsController < ActionController::Base
|
||||
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
||||
|
@ -39,7 +39,7 @@ class ActiveRecordAssertionsController < ActionController::Base
|
|||
end
|
||||
|
||||
class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
|
||||
fixtures :companies
|
||||
fixtures :companies if ActiveRecordTestConnector.able_to_connect
|
||||
|
||||
def setup
|
||||
@request = ActionController::TestRequest.new
|
||||
|
|
|
@ -70,6 +70,7 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
|
|||
session_class.create_table!
|
||||
|
||||
ENV['REQUEST_METHOD'] = 'GET'
|
||||
ENV['REQUEST_URI'] = '/'
|
||||
CGI::Session::ActiveRecordStore.session_class = session_class
|
||||
|
||||
@cgi = CGI.new
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
require File.dirname(__FILE__) + '/../active_record_unit'
|
||||
|
||||
if ActiveRecordTestConnector.able_to_connect
|
||||
require 'fixtures/topic'
|
||||
require 'fixtures/reply'
|
||||
require 'fixtures/developer'
|
||||
require 'fixtures/project'
|
||||
end
|
||||
|
||||
class PaginationTest < ActiveRecordTestCase
|
||||
if ActiveRecordTestConnector.able_to_connect
|
||||
fixtures :topics, :replies, :developers, :projects, :developers_projects
|
||||
end
|
||||
|
||||
class PaginationController < ActionController::Base
|
||||
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
||||
|
|
Loading…
Reference in New Issue