diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-15 13:18:17 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-15 13:18:17 +0000 |
| commit | 0930256b457bb5b7b959ca334dcaaeb595c26fc5 (patch) | |
| tree | ee31985aa45ce5b07c01711d8470418c38889b25 /railties/lib | |
| parent | 09aae0a275b46b653e2386e35658d0455fd5763a (diff) | |
| download | rails-0930256b457bb5b7b959ca334dcaaeb595c26fc5.tar.gz rails-0930256b457bb5b7b959ca334dcaaeb595c26fc5.tar.bz2 rails-0930256b457bb5b7b959ca334dcaaeb595c26fc5.zip | |
Fixed the overeager test running
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2609 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 2 | ||||
| -rw-r--r-- | railties/lib/test_help.rb | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index dd87ca7070..577d56644a 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -102,7 +102,7 @@ module Rails end def initialize_fixture_settings - return if configuration.environment == 'test' || !configuration.frameworks.include?(:active_record) + return if configuration.environment != 'test' || !configuration.frameworks.include?(:active_record) require 'test/unit' require 'active_record/fixtures' diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb index bd2234365b..9410501282 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -8,8 +8,6 @@ require 'breakpoint' Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/fixtures/" -class Test::Unit::TestCase - def create_fixtures(*table_names) - Fixtures.create_fixtures(RAILS_ROOT + "/fixtures", table_names) - end +def create_fixtures(*table_names) + Fixtures.create_fixtures(RAILS_ROOT + "/fixtures", table_names) end
\ No newline at end of file |