aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-11-16 18:57:25 +0100
committerJosé Valim <jose.valim@gmail.com>2010-11-16 22:58:13 +0100
commit1395545404eb0b28af08108b50d7cfe3fa9a5357 (patch)
tree6f5d8e5ff51297ac5e82236517a58d2a6d9d6e15
parent59ba800698ac9dcea1df9e40bb03335ddb4f5156 (diff)
downloadrails-1395545404eb0b28af08108b50d7cfe3fa9a5357.tar.gz
rails-1395545404eb0b28af08108b50d7cfe3fa9a5357.tar.bz2
rails-1395545404eb0b28af08108b50d7cfe3fa9a5357.zip
Do not run migrations from mounted engine separately.
There is no good way now to run migrations for mounted engine in test application, but that way of running migrations makes it really hard to run engine in development mode and test it (you need to copy migrations in dev mode and in that case in tests they will be run twice). Signed-off-by: José Valim <jose.valim@gmail.com>
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
index dbcaf6b92f..7b61047e77 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
@@ -9,8 +9,6 @@ Rails.backtrace_cleaner.remove_silencers!
<% if full? && !options[:skip_active_record] -%>
# Run any available migration from application
ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-# and from engine
-ActiveRecord::Migrator.migrate File.expand_path("../../db/migrate/", __FILE__)
<% end -%>
# Load support files