diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-01-29 09:54:50 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-01-29 09:54:50 +0100 |
| commit | de3d61518366e2b8b77646ceb01b396d517aa68d (patch) | |
| tree | c39e92be168a6de2e94f7b19d2cf7ca5e97462d6 /railties | |
| parent | d88f4bc1c1b5cae920cb76d571c3411ce3c41af2 (diff) | |
| parent | 0176aef1ebaa9f69001c7045a51727a8ea9b61b8 (diff) | |
| download | rails-de3d61518366e2b8b77646ceb01b396d517aa68d.tar.gz rails-de3d61518366e2b8b77646ceb01b396d517aa68d.tar.bz2 rails-de3d61518366e2b8b77646ceb01b396d517aa68d.zip | |
Merge pull request #18719 from 5t111111/add-fix-for-loading-fixtures-in-engine-tests
Add fix for loading fixtures in engine tests (additional fix for #4971)
Conflicts:
railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb | 1 |
1 files changed, 1 insertions, 0 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 2bd6ffef72..0852ffce9a 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 @@ -21,4 +21,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } if ActiveSupport::TestCase.respond_to?(:fixture_path=) ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "files" + ActiveSupport::TestCase.fixtures :all end |