Clean up and run the Active Record integration tests by default. Closes #5854.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

 *SVN*
 
-* Clean up and run the Active Record integration tests by default.  [Jeremy Kemper]
+* Clean up and run the Active Record integration tests by default.  #5854 [kevin.clark@gmail.com, Jeremy Kemper]
 
 * Correct example in cookies docs.  #5832 [jessemerriman@warpmail.net]
 

actionpack/test/abstract_unit.rb

@@ -6,7 +6,6 @@
 require 'test/unit'
 require 'action_controller'
 require 'breakpoint'
-
 require 'action_controller/test_process'
 
 ActionController::Base.logger = nil

actionpack/test/active_record_unit.rb

@@ -33,10 +33,12 @@ class ActiveRecordTestConnector
 
 # Define the rest of the connector
 class ActiveRecordTestConnector
-  def self.setup
+  class << self
+    def setup
       unless self.connected || !self.able_to_connect
         setup_connection
         load_schema
+        require_fixture_models
         self.connected = true
       end
     rescue Object => e
@@ -47,14 +49,18 @@ def self.setup
 
     private
 
-  def self.setup_connection
+    def setup_connection
       if Object.const_defined?(:ActiveRecord)
         begin
-        ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+          connection_options = {:adapter => 'sqlite3', :dbfile => ':memory:'}
+          ActiveRecord::Base.establish_connection(connection_options)
+          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => connection_options } 
           ActiveRecord::Base.connection
         rescue Object
           $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
-        ActiveRecord::Base.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
+          connection_options = {:adapter => 'sqlite', :dbfile => ':memory:'}
+          ActiveRecord::Base.establish_connection(connection_options)
+          ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => connection_options } 
           ActiveRecord::Base.connection
         end
 
@@ -65,11 +71,16 @@ def self.setup_connection
     end
 
     # Load actionpack sqlite tables
-  def self.load_schema
+    def load_schema
       File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
         ActiveRecord::Base.connection.execute(sql) unless sql.blank?
       end
     end
+
+    def require_fixture_models
+      Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
+    end
+  end
 end
 
 # Test case for inheiritance
@@ -80,6 +91,10 @@ class ActiveRecordTestCase < Test::Unit::TestCase
     self.use_transactional_fixtures = false
   end
 
+  def self.fixtures(*args)
+    super if ActiveRecordTestConnector.connected
+  end
+
   def setup
     abort_tests unless ActiveRecordTestConnector.connected
   end

actionpack/test/activerecord/active_record_assertions_test.rb

 require "#{File.dirname(__FILE__)}/../active_record_unit"
-require 'fixtures/company' if ActiveRecordTestConnector.able_to_connect
 
 class ActiveRecordAssertionsController < ActionController::Base
   self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
@@ -39,7 +38,7 @@ def rescue_action(e) raise; end
 end
 
 class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
-  fixtures :companies if ActiveRecordTestConnector.able_to_connect
+  fixtures :companies
 
   def setup
     @request = ActionController::TestRequest.new

actionpack/test/activerecord/active_record_store_test.rb

-# Unfurl the safety net.
-path_to_ar = File.dirname(__FILE__) + '/../../../activerecord'
-if Object.const_defined?(:ActiveRecord) or File.exist?(path_to_ar)
-  begin
-
 # These tests exercise CGI::Session::ActiveRecordStore, so you're going to
 # need AR in a sibling directory to AP and have SQLite installed.
-
-unless Object.const_defined?(:ActiveRecord)
-  require File.join(path_to_ar, 'lib', 'active_record')
-end
-
-require File.dirname(__FILE__) + '/../abstract_unit'
+require File.dirname(__FILE__) + '/../active_record_unit'
 require 'action_controller/session/active_record_store'
 
-#ActiveRecord::Base.logger = Logger.new($stdout)
-begin
-  CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-  CGI::Session::ActiveRecordStore::Session.connection
-rescue Object
-  $stderr.puts 'SQLite 3 unavailable; falling back to SQLite 2.'
-  begin
-    CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :database => ':memory:')
-    CGI::Session::ActiveRecordStore::Session.connection
-  rescue Object
-    $stderr.puts 'SQLite 2 unavailable; skipping ActiveRecordStore test suite.'
-    raise SystemExit
-  end
-end
-
 
 module CommonActiveRecordStoreTests
   def test_basics
@@ -165,11 +140,3 @@ def test_model_attribute
     assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
   end
 end
-
-
-# End of safety net.
-  rescue Object => e
-    $stderr.puts "Skipping CGI::Session::ActiveRecordStore tests: #{e}"
-    #$stderr.puts "  #{e.backtrace.join("\n  ")}"
-  end
-end

actionpack/test/activerecord/pagination_test.rb

 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/"