Move the ActiveRecord generator settings into the Railtie

5 files changed, 7 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 5e4ce34934..dc80ac4b30 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -10,6 +10,9 @@ module ActiveRecord
   class Railtie < Rails::Railtie
     railtie_name :active_record
 
+    config.generators.orm :active_record, :migration => true,
+                                          :timestamps => true
+
     rake_tasks do
       load "active_record/railties/databases.rake"
     end
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 41dec3a120..1271de7af9 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -38,11 +38,6 @@ module Rails
     }
 
     DEFAULT_OPTIONS = {
-      :active_record => {
-        :migration  => true,
-        :timestamps => true
-      },
-
       :erb => {
         :layout => true
       },
@@ -51,7 +46,7 @@ module Rails
         :force_plural => false,
         :helper => true,
         :layout => true,
-        :orm => :active_record,
+        :orm => nil,
         :integration_tool => nil,
         :performance_tool => nil,
         :resource_controller => :controller,
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 13fbdfb417..e54edea07c 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -34,7 +34,7 @@ module ApplicationTests
     end
 
     test "generators set rails options" do
-      with_config do |c|
+      with_bare_config do |c|
         c.generators.orm            = :datamapper
         c.generators.test_framework = :rspec
         c.generators.helper         = false
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 2f886dcd66..40ac11fa03 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -25,6 +25,7 @@ module RailtiesTest
     end
 
     test "Rails::Engine itself does not respond to config" do
+      boot_rails
       assert !Rails::Engine.respond_to?(:config)
     end
   end
diff --git a/railties/test/railties/plugin_test.rb b/railties/test/railties/plugin_test.rb
index a3cccba3af..997b692e49 100644
--- a/railties/test/railties/plugin_test.rb
+++ b/railties/test/railties/plugin_test.rb
@@ -20,6 +20,7 @@ module RailtiesTest
     end
 
     test "Rails::Plugin itself does not respond to config" do
+      boot_rails
       assert !Rails::Plugin.respond_to?(:config)
     end