From 0e49ef433093c0ed08c7df8609b0b9e3dae5150c Mon Sep 17 00:00:00 2001
From: Patrick Helm <ph@werbeboten.de>
Date: Thu, 12 Apr 2012 16:25:28 +0200
Subject: [PATCH] Provided fix for calling rake tasks within mountable engines

---
 railties/lib/rails/engine.rb          |  7 +++++-
 railties/test/railties/engine_test.rb | 31 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 131d6e5711..ceb8905c8f 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -603,7 +603,12 @@ module Rails
           desc "Copy migrations from #{railtie_name} to application"
           task :migrations do
             ENV["FROM"] = railtie_name
-            Rake::Task["railties:install:migrations"].invoke
+            if Rake::Task.task_defined?("railties:install:migrations")
+              Rake::Task["railties:install:migrations"].invoke
+            else
+              Rake::Task["app:railties:install:migrations"].invoke
+            end
+
           end
         end
       end
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 5e93a8e783..1650a15080 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -112,6 +112,37 @@ module RailtiesTest
       end
     end
 
+    test "mountable engine should copy migrations within engine_path" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            isolate_namespace Bukkits
+          end
+        end
+      RUBY
+
+      @plugin.write "db/migrate/0_add_first_name_to_users.rb", <<-RUBY
+        class AddFirstNameToUsers < ActiveRecord::Migration
+        end
+      RUBY
+
+      @plugin.write "Rakefile", <<-RUBY
+        APP_RAKEFILE = '#{app_path}/Rakefile'
+        load 'rails/tasks/engine.rake'
+      RUBY
+
+      add_to_config "ActiveRecord::Base.timestamped_migrations = false"
+
+      boot_rails
+
+      Dir.chdir(@plugin.path) do
+        output = `bundle exec rake app:bukkits:install:migrations`
+        assert File.exists?("#{app_path}/db/migrate/0_add_first_name_to_users.bukkits.rb")
+        assert_match(/Copied migration 0_add_first_name_to_users.bukkits.rb from bukkits/, output)
+        assert_equal 1, Dir["#{app_path}/db/migrate/*.rb"].length
+      end
+    end
+
     test "no rake task without migrations" do
       boot_rails
       require 'rake'