diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-18 18:39:44 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-18 18:39:44 -0300 |
| commit | c2dfc316912e780dfd6113e6ab9668128264f111 (patch) | |
| tree | 93e6c936d6d7110750a968aafa0e1f8cacb3107b /railties/lib/rails | |
| parent | 112077c255879351edf4530791cc4bcc7bd4005b (diff) | |
| parent | 7137c6b7750ca5d1ddcc794de5e9b219af65de1c (diff) | |
| download | rails-c2dfc316912e780dfd6113e6ab9668128264f111.tar.gz rails-c2dfc316912e780dfd6113e6ab9668128264f111.tar.bz2 rails-c2dfc316912e780dfd6113e6ab9668128264f111.zip | |
Merge pull request #16936 from untidy-hair/plugin_test_db_migrate_path
Specify dummy app's db migrate path in plugin's test_helper.rb
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb | 3 |
1 files changed, 3 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 40c83d063a..c6e2247e16 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 @@ -2,6 +2,9 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb", __FILE__) +<% unless options[:skip_active_record] -%> +ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../<%= options[:dummy_path] -%>/db/migrate", __FILE__)] +<% end -%> require "rails/test_help" Rails.backtrace_cleaner.remove_silencers! |