From 4ce9b4c5575cad6f5f1ccd69ddb57d06640e2422 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 30 Sep 2005 01:00:04 +0000 Subject: Use transactional fixtures by default for AR tests. Set ENV['AR_NO_TX_FIXTURES'] to yes to disable. Tidy up abstract_unit. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2416 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/abstract_unit.rb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'activerecord/test/abstract_unit.rb') diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb index 34eb92e24c..9373422403 100755 --- a/activerecord/test/abstract_unit.rb +++ b/activerecord/test/abstract_unit.rb @@ -9,16 +9,11 @@ require 'active_support/breakpoint' require 'connection' class Test::Unit::TestCase #:nodoc: - def create_fixtures(*table_names) - if block_given? - Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names) { yield } - else - Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names) - end + self.fixture_path = File.dirname(__FILE__) + "/fixtures/" + self.use_instantiated_fixtures = false + self.use_transactional_fixtures = (ENV['AR_NO_TX_FIXTURES'] != "yes") + + def create_fixtures(*table_names, &block) + Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names, &block) end end - -Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/" -Test::Unit::TestCase.use_instantiated_fixtures = false -Test::Unit::TestCase.use_transactional_fixtures = (ENV['AR_TX_FIXTURES'] == "yes") - -- cgit v1.2.3