diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-27 01:18:27 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-27 01:18:27 -0300 |
commit | 79fc70f413b76397aacc9885f85de27d2af3b1c2 (patch) | |
tree | f7873516c34894f43f53388b558be9ff225bf882 /railties/lib/rails/generators | |
parent | f9996803f857afcd6f32e18e63ab0269ac8213e6 (diff) | |
parent | 5469d9e1c49156e7e3463985912c56eb695deae1 (diff) | |
download | rails-79fc70f413b76397aacc9885f85de27d2af3b1c2.tar.gz rails-79fc70f413b76397aacc9885f85de27d2af3b1c2.tar.bz2 rails-79fc70f413b76397aacc9885f85de27d2af3b1c2.zip |
Merge pull request #20714 from y-yagi/fix_file_fixture_path
correct `file_fixture_path` in plugins `test_helper.rb`
Diffstat (limited to 'railties/lib/rails/generators')
-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 0852ffce9a..95adcc06ff 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 @@ -20,6 +20,6 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } # Load fixtures from the engine 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.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files" ActiveSupport::TestCase.fixtures :all end |