aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorPhilip Arndt <parndt@gmail.com>2012-03-13 14:49:49 +1300
committerPhilip Arndt <parndt@gmail.com>2012-03-13 14:49:52 +1300
commit5ef806914b4f14e03ab7b6b323141975929bc8ab (patch)
tree20d891336acfbc6e38fc2b61c2ad85dddcac62fb /railties
parentf665e20dbfcd4cb085a4fedf58983af9a1fb157b (diff)
downloadrails-5ef806914b4f14e03ab7b6b323141975929bc8ab.tar.gz
rails-5ef806914b4f14e03ab7b6b323141975929bc8ab.tar.bz2
rails-5ef806914b4f14e03ab7b6b323141975929bc8ab.zip
Fixed problem when fixture_path is not always defined (incidentally, only when ActiveRecord is according to test_help.rb).
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb4
1 files changed, 3 insertions, 1 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 260011c8fd..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
@@ -10,4 +10,6 @@ Rails.backtrace_cleaner.remove_silencers!
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
# Load fixtures from the engine
-ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) \ No newline at end of file
+if ActiveSupport::TestCase.method_defined?(:fixture_path)
+ ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end \ No newline at end of file