github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-26 23:08:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up fix a bit

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-10-14 21:21:09 +00:00
parent 9285f6c7ae
commit a442e6dbdf
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
railties/lib/initializer.rb
View File

@@ -36,7 +36,7 @@ module Rails
load_environment
initialize_database
initialize_fixture_settings if configuration.environment == 'test'
initialize_fixture_settings
initialize_logger
initialize_framework_logging
initialize_framework_views
@@ -102,12 +102,14 @@ module Rails
end
def initialize_fixture_settings
return unless configuration.frameworks.include?(:active_record)
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
Test::Unit::TestCase.use_instantiated_fixtures = configuration.instantiated_fixtures
Test::Unit::TestCase.pre_loaded_fixtures = configuration.pre_loaded_fixtures
end
def initialize_logger
@@ -198,7 +200,7 @@ module Rails
self.whiny_nils = default_whiny_nils
self.database_configuration_file = default_database_configuration_file
self.transactional_fixtures = default_transactional_fixtures
self.instantiated_fixtures = default_use_instantiated_fixtures
self.instantiated_fixtures = default_instantiated_fixtures
self.pre_loaded_fixtures = default_pre_loaded_fixtures
for framework in default_frameworks
@@ -297,7 +299,7 @@ module Rails
true
end
def default_use_instantiated_fixtures
def default_instantiated_fixtures
false
end