aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2006-11-27 05:19:15 +0000
committerMichael Koziarski <michael@koziarski.com>2006-11-27 05:19:15 +0000
commit02dfb239fa953ebfbc9a9e7d10d71e3b03e5cf11 (patch)
tree2b0af5cdcfc05dd6bc7128831caf54f32bb15cc1
parent0a86122a248020081722bf0c12de70c929cbcbd9 (diff)
downloadrails-02dfb239fa953ebfbc9a9e7d10d71e3b03e5cf11.tar.gz
rails-02dfb239fa953ebfbc9a9e7d10d71e3b03e5cf11.tar.bz2
rails-02dfb239fa953ebfbc9a9e7d10d71e3b03e5cf11.zip
merge 5639 to trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5640 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/lib/test_help.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 12aaf9753f..0c6a8178c5 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -1,6 +1,6 @@
require_dependency 'application'
-# Make double-sure the RAILS_ENV is set to test,
+# Make double-sure the RAILS_ENV is set to test,
# so fixtures are loaded to the right database
silence_warnings { RAILS_ENV = "test" }
@@ -12,6 +12,7 @@ require 'action_web_service/test_invoke'
require 'breakpoint'
Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
+ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
def create_fixtures(*table_names)
Fixtures.create_fixtures(RAILS_ROOT + "/test/fixtures", table_names)