From c547e968f5709f174ee13818b35429cbe585b5dd Mon Sep 17 00:00:00 2001
From: Steven Anderson <steve@whilefalse.net>
Date: Mon, 17 Oct 2011 16:28:00 +0100
Subject: Added environment rake task to engines

---
 railties/lib/rails/tasks/engine.rake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index 2152e811f5..eea8abe7d2 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -2,6 +2,7 @@ task "load_app" do
   namespace :app do
     load APP_RAKEFILE
   end
+  task :environment => "app:environment"
 
   if !defined?(ENGINE_PATH) || !ENGINE_PATH
     ENGINE_PATH = find_engine_path(APP_RAKEFILE)
-- 
cgit v1.2.3


From 40d1555091433d827e23e92e9f816e11a2db679b Mon Sep 17 00:00:00 2001
From: steve <steve@whilefalse.net>
Date: Tue, 18 Oct 2011 17:06:32 +0100
Subject: Added test for rake environment in an engine

---
 railties/test/railties/shared_tests.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 21fde49ff7..7653e52d26 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -21,6 +21,23 @@ module RailtiesTest
       assert_match "alert()", last_response.body
     end
 
+    def test_rake_environment_can_be_called_in_the_engine_or_plugin
+      boot_rails
+
+      @plugin.write "Rakefile", <<-RUBY
+        APP_RAKEFILE = '#{app_path}/Rakefile'
+        load 'rails/tasks/engine.rake'
+        task :foo => :environment do
+          puts "Task ran"
+        end
+      RUBY
+
+      Dir.chdir(@plugin.path) do
+        output = `bundle exec rake foo`
+        assert_match "Task ran", output
+      end
+    end
+
     def test_copying_migrations
       @plugin.write "db/migrate/1_create_users.rb", <<-RUBY
         class CreateUsers < ActiveRecord::Migration
-- 
cgit v1.2.3