diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-09-23 10:48:05 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-09-23 10:48:05 -0300 |
| commit | e88f8d7dcb325aaf27a7a92af766b6dbce43337a (patch) | |
| tree | ab9cecc7430502e552c7887bac20403a848a2243 /railties | |
| parent | 13e1348cbad06c8dd20f03dc0cba334e591e5851 (diff) | |
| parent | 95e3e42b87f3aea4552073cf370b696c28ea0caa (diff) | |
| download | rails-e88f8d7dcb325aaf27a7a92af766b6dbce43337a.tar.gz rails-e88f8d7dcb325aaf27a7a92af766b6dbce43337a.tar.bz2 rails-e88f8d7dcb325aaf27a7a92af766b6dbce43337a.zip | |
Merge pull request #17029 from grk/fix-loading-fixtures-in-engine-tests
Fix loading fixtures in engine tests
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb index c6e2247e16..28cdfecf81 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb @@ -13,6 +13,6 @@ Rails.backtrace_cleaner.remove_silencers! Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } # Load fixtures from the engine -if ActiveSupport::TestCase.method_defined?(:fixture_path=) +if ActiveSupport::TestCase.respond_to?(:fixture_path=) ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) end |