Merge branch 'master' of git://github.com/lifo/docrails

1 files changed, 24 insertions, 0 deletions

diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 406d5d764f..6d194eecba 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -103,6 +103,30 @@ module RailtiesTest
       assert $ran_block
     end
 
+    test "rake_tasks block defined in superclass of railtie is also executed" do
+      $ran_block = []
+
+      class Rails::Railtie
+        rake_tasks do
+          $ran_block << railtie_name
+        end
+      end
+
+      class MyTie < Rails::Railtie
+        railtie_name "my_tie"
+      end
+
+      require "#{app_path}/config/environment"
+
+      assert_equal [], $ran_block
+      require 'rake'
+      require 'rake/testtask'
+      require 'rake/rdoctask'
+
+      AppTemplate::Application.load_tasks
+      assert $ran_block.include?("my_tie")
+    end
+
     test "generators block is executed when MyApp.load_generators is called" do
       $ran_block = false