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*
|
*SVN*
|
||||||
|
|
||||||
|
* Clean up and run the Active Record integration tests by default. [Jeremy Kemper]
|
||||||
|
|
||||||
* Correct example in cookies docs. #5832 [jessemerriman@warpmail.net]
|
* Correct example in cookies docs. #5832 [jessemerriman@warpmail.net]
|
||||||
|
|
||||||
* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
|
* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
|
||||||
|
|
|
@ -22,7 +22,9 @@ task :default => [ :test ]
|
||||||
|
|
||||||
# Run the unit tests
|
# 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"
|
t.libs << "test"
|
||||||
# make sure we include the controller tests (c*) first as on some systems
|
# 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
|
# this will not happen automatically and the tests (as a whole) will error
|
||||||
|
|
|
@ -4,24 +4,35 @@ require File.dirname(__FILE__) + '/abstract_unit'
|
||||||
class ActiveRecordTestConnector
|
class ActiveRecordTestConnector
|
||||||
cattr_accessor :able_to_connect
|
cattr_accessor :able_to_connect
|
||||||
cattr_accessor :connected
|
cattr_accessor :connected
|
||||||
|
|
||||||
# Set our defaults
|
# Set our defaults
|
||||||
self.connected = false
|
self.connected = false
|
||||||
self.able_to_connect = true
|
self.able_to_connect = true
|
||||||
end
|
end
|
||||||
|
|
||||||
# Try to grab AR
|
# Try to grab AR
|
||||||
begin
|
if defined?(ActiveRecord) && defined?(Fixtures)
|
||||||
PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
|
$stderr.puts 'Active Record is already loaded, running tests'
|
||||||
require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
|
else
|
||||||
require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
|
$stderr.print 'Attempting to load Active Record... '
|
||||||
rescue Object => e
|
begin
|
||||||
$stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
|
PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
|
||||||
ActiveRecordTestConnector.able_to_connect = false
|
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.print "failed. Skipping Active Record assertion tests: #{e}"
|
||||||
|
ActiveRecordTestConnector.able_to_connect = false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
$stderr.flush
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Define the rest of the connector
|
# Define the rest of the connector
|
||||||
class ActiveRecordTestConnector
|
class ActiveRecordTestConnector
|
||||||
def self.setup
|
def self.setup
|
||||||
unless self.connected || !self.able_to_connect
|
unless self.connected || !self.able_to_connect
|
||||||
setup_connection
|
setup_connection
|
||||||
|
@ -33,12 +44,11 @@ class ActiveRecordTestConnector
|
||||||
#$stderr.puts " #{e.backtrace.join("\n ")}\n"
|
#$stderr.puts " #{e.backtrace.join("\n ")}\n"
|
||||||
self.able_to_connect = false
|
self.able_to_connect = false
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def self.setup_connection
|
def self.setup_connection
|
||||||
if Object.const_defined?(:ActiveRecord)
|
if Object.const_defined?(:ActiveRecord)
|
||||||
|
|
||||||
begin
|
begin
|
||||||
ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
|
ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
|
||||||
ActiveRecord::Base.connection
|
ActiveRecord::Base.connection
|
||||||
|
@ -47,13 +57,13 @@ class ActiveRecordTestConnector
|
||||||
ActiveRecord::Base.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
|
ActiveRecord::Base.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
|
||||||
ActiveRecord::Base.connection
|
ActiveRecord::Base.connection
|
||||||
end
|
end
|
||||||
|
|
||||||
Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
|
Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
|
||||||
else
|
else
|
||||||
raise "Couldn't locate ActiveRecord."
|
raise "Couldn't locate ActiveRecord."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Load actionpack sqlite tables
|
# Load actionpack sqlite tables
|
||||||
def self.load_schema
|
def self.load_schema
|
||||||
File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
|
File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
|
||||||
|
@ -61,28 +71,30 @@ class ActiveRecordTestConnector
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Test case for inheiritance
|
# Test case for inheiritance
|
||||||
class ActiveRecordTestCase < Test::Unit::TestCase
|
class ActiveRecordTestCase < Test::Unit::TestCase
|
||||||
# Set our fixture path
|
# Set our fixture path
|
||||||
self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
|
if ActiveRecordTestConnector.able_to_connect
|
||||||
|
self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
|
||||||
def setup
|
self.use_transactional_fixtures = false
|
||||||
abort_tests unless ActiveRecordTestConnector.connected = true
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def setup
|
||||||
|
abort_tests unless ActiveRecordTestConnector.connected
|
||||||
|
end
|
||||||
|
|
||||||
# Default so Test::Unit::TestCase doesn't complain
|
# Default so Test::Unit::TestCase doesn't complain
|
||||||
def test_truth
|
def test_truth
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
# If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
|
||||||
# If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
|
def abort_tests
|
||||||
def abort_tests
|
self.class.public_instance_methods.grep(/^test./).each do |method|
|
||||||
self.class.public_instance_methods.grep(/^test./).each do |method|
|
self.class.class_eval { define_method(method.to_sym){} }
|
||||||
self.class.class_eval { define_method(method.to_sym){} }
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
ActiveRecordTestConnector.setup
|
ActiveRecordTestConnector.setup
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require "#{File.dirname(__FILE__)}/../active_record_unit"
|
require "#{File.dirname(__FILE__)}/../active_record_unit"
|
||||||
require 'fixtures/company'
|
require 'fixtures/company' if ActiveRecordTestConnector.able_to_connect
|
||||||
|
|
||||||
class ActiveRecordAssertionsController < ActionController::Base
|
class ActiveRecordAssertionsController < ActionController::Base
|
||||||
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
||||||
|
@ -37,10 +37,10 @@ class ActiveRecordAssertionsController < ActionController::Base
|
||||||
# the safety dance......
|
# the safety dance......
|
||||||
def rescue_action(e) raise; end
|
def rescue_action(e) raise; end
|
||||||
end
|
end
|
||||||
|
|
||||||
class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
|
class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
|
||||||
fixtures :companies
|
fixtures :companies if ActiveRecordTestConnector.able_to_connect
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
@request = ActionController::TestRequest.new
|
@request = ActionController::TestRequest.new
|
||||||
@response = ActionController::TestResponse.new
|
@response = ActionController::TestResponse.new
|
||||||
|
@ -81,4 +81,4 @@ class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
|
||||||
assert_success
|
assert_success
|
||||||
assert_invalid_record 'company'
|
assert_invalid_record 'company'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -70,6 +70,7 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
|
||||||
session_class.create_table!
|
session_class.create_table!
|
||||||
|
|
||||||
ENV['REQUEST_METHOD'] = 'GET'
|
ENV['REQUEST_METHOD'] = 'GET'
|
||||||
|
ENV['REQUEST_URI'] = '/'
|
||||||
CGI::Session::ActiveRecordStore.session_class = session_class
|
CGI::Session::ActiveRecordStore.session_class = session_class
|
||||||
|
|
||||||
@cgi = CGI.new
|
@cgi = CGI.new
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
require File.dirname(__FILE__) + '/../active_record_unit'
|
require File.dirname(__FILE__) + '/../active_record_unit'
|
||||||
|
|
||||||
require 'fixtures/topic'
|
if ActiveRecordTestConnector.able_to_connect
|
||||||
require 'fixtures/reply'
|
require 'fixtures/topic'
|
||||||
require 'fixtures/developer'
|
require 'fixtures/reply'
|
||||||
require 'fixtures/project'
|
require 'fixtures/developer'
|
||||||
|
require 'fixtures/project'
|
||||||
|
end
|
||||||
|
|
||||||
class PaginationTest < ActiveRecordTestCase
|
class PaginationTest < ActiveRecordTestCase
|
||||||
fixtures :topics, :replies, :developers, :projects, :developers_projects
|
if ActiveRecordTestConnector.able_to_connect
|
||||||
|
fixtures :topics, :replies, :developers, :projects, :developers_projects
|
||||||
|
end
|
||||||
|
|
||||||
class PaginationController < ActionController::Base
|
class PaginationController < ActionController::Base
|
||||||
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
||||||
|
|
Loading…
Reference in New Issue