Cleanup the test_unit generator move into the railtie

railties/lib/rails/generators.rb

@@ -52,8 +52,8 @@ module Generators
         :helper => true,
         :layout => true,
         :orm => :active_record,
-        :integration_tool => :test_unit,
-        :performance_tool => :test_unit,
+        :integration_tool => nil,
+        :performance_tool => nil,
         :resource_controller => :controller,
         :scaffold_controller => :scaffold_controller,
         :singleton => false,
@@ -62,11 +62,6 @@ module Generators
         :template_engine => :erb
       },
 
-      :test_unit => {
-        :fixture => true,
-        :fixture_replacement => nil
-      },
-
       :plugin => {
         :generator => false,
         :tasks => false

railties/lib/rails/test_unit/railtie.rb

@@ -2,7 +2,13 @@ module Rails
   class TestUnitRailtie < Rails::Railtie
     railtie_name :test_unit
 
-    config.generators.test_framework :test_unit
+    config.generators do |c|
+      c.test_framework :test_unit, :fixture => true,
+                                   :fixture_replacement => nil
+
+      c.integration_tool :test_unit
+      c.performance_tool :test_unit
+    end
 
     rake_tasks do
        load "rails/tasks/testing.rake"