Use application's generators defaults as engine defaults to not force…

… users to manually set it
rails · Nov 2, 2010 · cfbe595 · cfbe595
1 parent 9e86767
commit cfbe595
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
@@ -14,7 +14,7 @@ class Railtie < Rails::Railtie
     config.active_record = ActiveSupport::OrderedOptions.new
 
     config.app_generators.orm :active_record, :migration => true,
-                                          :timestamps => true
+                                              :timestamps => true
 
     config.app_middleware.insert_after "::ActionDispatch::Callbacks",
       "ActiveRecord::QueryCache"

diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
@@ -10,6 +10,7 @@ class Configuration < ::Rails::Railtie::Configuration
       def initialize(root=nil)
         super()
         @root = root
+        @generators = app_generators
       end
 
       # Returns the middleware stack for the engine.

diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
@@ -685,5 +685,22 @@ class Engine < ::Rails::Engine
       assert_equal :haml      , generators[:template_engine]
       assert_equal :rspec     , generators[:test_framework]
     end
+
+    test "engine should get default generators with ability to overwrite them" do
+      @plugin.write "lib/bukkits.rb", <<-RUBY
+        module Bukkits
+          class Engine < ::Rails::Engine
+            config.generators.test_framework :rspec
+          end
+        end
+      RUBY
+
+      boot_rails
+      require "#{rails_root}/config/environment"
+
+      generators = Bukkits::Engine.config.generators.options[:rails]
+      assert_equal :active_record, generators[:orm]
+      assert_equal :rspec        , generators[:test_framework]
+    end
   end
 end