diff options
Diffstat (limited to 'actionpack/test/activerecord')
3 files changed, 4 insertions, 47 deletions
diff --git a/actionpack/test/activerecord/active_record_assertions_test.rb b/actionpack/test/activerecord/active_record_assertions_test.rb index ebb7774fc9..6662d3d10c 100644 --- a/actionpack/test/activerecord/active_record_assertions_test.rb +++ b/actionpack/test/activerecord/active_record_assertions_test.rb @@ -1,5 +1,4 @@ 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 @@ class ActiveRecordAssertionsController < ActionController::Base end class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase - fixtures :companies if ActiveRecordTestConnector.able_to_connect + fixtures :companies def setup @request = ActionController::TestRequest.new diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb index f85bdeb466..3bb37a2274 100644 --- a/actionpack/test/activerecord/active_record_store_test.rb +++ b/actionpack/test/activerecord/active_record_store_test.rb @@ -1,33 +1,8 @@ -# 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 @@ class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest 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 diff --git a/actionpack/test/activerecord/pagination_test.rb b/actionpack/test/activerecord/pagination_test.rb index a32dd0369a..ddd2cec8b3 100644 --- a/actionpack/test/activerecord/pagination_test.rb +++ b/actionpack/test/activerecord/pagination_test.rb @@ -1,17 +1,8 @@ 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 - + fixtures :topics, :replies, :developers, :projects, :developers_projects + class PaginationController < ActionController::Base self.template_root = "#{File.dirname(__FILE__)}/../fixtures/" |