From d72201e43801994ade896a9706f0960589e3e8a7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 15 Oct 2005 17:47:46 +0000 Subject: Backed out of setting testing settings through initializer as that would break backwards compatibility git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2618 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/initializer.rb | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'railties/lib/initializer.rb') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 577d56644a..56299d12a9 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -36,7 +36,6 @@ module Rails load_environment initialize_database - initialize_fixture_settings initialize_logger initialize_framework_logging initialize_framework_views @@ -101,17 +100,6 @@ module Rails ActiveRecord::Base.establish_connection end - def initialize_fixture_settings - return if configuration.environment != 'test' || !configuration.frameworks.include?(:active_record) - - require 'test/unit' - require 'active_record/fixtures' - - Test::Unit::TestCase.use_transactional_fixtures = configuration.transactional_fixtures - Test::Unit::TestCase.use_instantiated_fixtures = configuration.instantiated_fixtures - Test::Unit::TestCase.pre_loaded_fixtures = configuration.pre_loaded_fixtures - end - def initialize_logger # if the environment has explicitly defined a logger, use it return if defined?(RAILS_DEFAULT_LOGGER) @@ -199,9 +187,6 @@ module Rails self.breakpoint_server = default_breakpoint_server self.whiny_nils = default_whiny_nils self.database_configuration_file = default_database_configuration_file - self.transactional_fixtures = default_transactional_fixtures - self.instantiated_fixtures = default_instantiated_fixtures - self.pre_loaded_fixtures = default_pre_loaded_fixtures for framework in default_frameworks self.send("#{framework}=", OrderedOptions.new) @@ -294,18 +279,6 @@ module Rails def default_whiny_nils false end - - def default_transactional_fixtures - true - end - - def default_instantiated_fixtures - false - end - - def default_pre_loaded_fixtures - false - end end end -- cgit v1.2.3