Allow railties to specify generators paths.

2 files changed, 23 insertions, 0 deletions

diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 60c81a813f..664d1e5670 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -148,6 +148,13 @@ class GeneratorsTest < Rails::Generators::TestCase
     Rails::Generators.subclasses.delete(klass)
   end
 
+  def test_load_generators_from_railties
+    Rails::Generators::ModelGenerator.expects(:start).with(["Account"], {})
+    Rails::Generators.send(:remove_instance_variable, :@generators_from_railties)
+    Rails.application.expects(:load_generators)
+    Rails::Generators.invoke("model", ["Account"])
+  end
+
   def test_rails_root_templates
     template = File.join(Rails.root, "lib", "templates", "active_record", "model", "model.rb")
 
diff --git a/railties/test/plugins/framework_extension_test.rb b/railties/test/plugins/framework_extension_test.rb
index c920db77aa..d57fd4e635 100644
--- a/railties/test/plugins/framework_extension_test.rb
+++ b/railties/test/plugins/framework_extension_test.rb
@@ -30,6 +30,22 @@ module PluginsTest
       AppTemplate::Application.load_tasks
       assert $ran_block
     end
+
+    test "generators block is executed when MyApp.load_generators is called" do
+      $ran_block = false
+
+      class MyTie < Rails::Railtie
+        generators do
+          $ran_block = true
+        end
+      end
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      AppTemplate::Application.load_generators
+      assert $ran_block
+    end
   end
 
   class ActiveRecordExtensionTest < Test::Unit::TestCase