Merge pull request #1963 from jake3030/fix_engine_rake_task

Fix engine rake task

2 files changed, 10 insertions, 0 deletions

diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index 2f0e7be896..2152e811f5 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -67,3 +67,5 @@ def find_engine_path(path)
     find_engine_path(File.expand_path('..', path))
   end
 end
+
+Rake.application.invoke_task(:load_app)
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index be72391e58..4bd77ff7e3 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -159,6 +159,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_match(/1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
   end
 
+  def test_ensure_that_migration_tasks_work_with_mountable_option
+    run_generator [destination_root, "--mountable"]
+    FileUtils.cd destination_root
+    quietly { system 'bundle install' }
+    `bundle exec rake db:migrate`
+    assert_equal 0, $?.exitstatus
+  end
+
   def test_creating_engine_in_full_mode
     run_generator [destination_root, "--full"]
     assert_file "app/assets/javascripts/bukkits"