aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-13 05:24:03 -0700
committerJosé Valim <jose.valim@gmail.com>2012-03-13 05:24:03 -0700
commitfc3e9b32fd88e19033c24136d5c06baa1a295084 (patch)
tree8018c43394f485c9636bc6090763e5bdad441c56
parent0e502e08f3654925be48fbcf7ad40e07606ea1a8 (diff)
parentf0ee9e68891a6436946784d5a7e2124040bc14b4 (diff)
downloadrails-fc3e9b32fd88e19033c24136d5c06baa1a295084.tar.gz
rails-fc3e9b32fd88e19033c24136d5c06baa1a295084.tar.bz2
rails-fc3e9b32fd88e19033c24136d5c06baa1a295084.zip
Merge pull request #5406 from parndt/fix_issue_5193_in_master
Fix issue #5193 in master
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
index dcd3b276e3..8d45b2bbd9 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
@@ -8,3 +8,8 @@ Rails.backtrace_cleaner.remove_silencers!
# Load support files
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.method_defined?(:fixture_path)
+ ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end \ No newline at end of file