aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/rails/generators.rb9
-rw-r--r--railties/lib/rails/test_unit/railtie.rb8
2 files changed, 9 insertions, 8 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 421f3df474..41dec3a120 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -52,8 +52,8 @@ module Rails
: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 Rails
:template_engine => :erb
},
- :test_unit => {
- :fixture => true,
- :fixture_replacement => nil
- },
-
:plugin => {
:generator => false,
:tasks => false
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index 6858e8ebbd..f93dace9bb 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/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"