aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-09-16 10:51:29 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-09-16 10:51:29 -0300
commit6e4aa9d5eab53bb0f5063145f5143d91a175a1f7 (patch)
treecef5240c6653b67f235d8c3acc80827dda43b21f /railties/lib/rails
parent0da9923926c6b3e61cbb2224b0edcd4248ac1be2 (diff)
parent8c9b3473427d865a7e34b0a2a7295456d2c52747 (diff)
downloadrails-6e4aa9d5eab53bb0f5063145f5143d91a175a1f7.tar.gz
rails-6e4aa9d5eab53bb0f5063145f5143d91a175a1f7.tar.bz2
rails-6e4aa9d5eab53bb0f5063145f5143d91a175a1f7.zip
Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error
Use dynamic path for dummy app location in plugin's test_helper.rb
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb2
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 1e26a313cd..40c83d063a 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
@@ -1,7 +1,7 @@
# Configure Rails Environment
ENV["RAILS_ENV"] = "test"
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
+require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb", __FILE__)
require "rails/test_help"
Rails.backtrace_cleaner.remove_silencers!