Move the ActiveRecord generator settings into the Railtie

3 files changed, 3 insertions, 1 deletions

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