aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-01-27 17:39:11 -0800
committerCarl Lerche <carllerche@mac.com>2010-01-28 09:55:29 -0800
commitc7c3eac762ed46f1eb165f666916ed52abd2ab3f (patch)
tree55b0d3139f0922f3a0865bc490498fc794003ab4 /railties/lib/rails
parent3aa1ea1ae4baa4a03d03644e798eeb98a4745785 (diff)
downloadrails-c7c3eac762ed46f1eb165f666916ed52abd2ab3f.tar.gz
rails-c7c3eac762ed46f1eb165f666916ed52abd2ab3f.tar.bz2
rails-c7c3eac762ed46f1eb165f666916ed52abd2ab3f.zip
Test::Unit Railtie
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/all.rb1
-rw-r--r--railties/lib/rails/generators.rb3
-rw-r--r--railties/lib/rails/tasks.rb1
-rw-r--r--railties/lib/rails/test_unit/railtie.rb11
4 files changed, 13 insertions, 3 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb
index b8292a9b7e..1a0b4a8d73 100644
--- a/railties/lib/rails/all.rb
+++ b/railties/lib/rails/all.rb
@@ -8,6 +8,7 @@ require "rails"
action_view
action_mailer
active_resource
+ rails/test_unit
).each do |framework|
begin
require "#{framework}/railtie"
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 2281746b00..ccf338bb6c 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -58,8 +58,7 @@ module Rails
:scaffold_controller => :scaffold_controller,
:singleton => false,
:stylesheets => true,
- :template_engine => :erb,
- :test_framework => :test_unit
+ :template_engine => :erb
},
:test_unit => {
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb
index 44c014efe8..9807000578 100644
--- a/railties/lib/rails/tasks.rb
+++ b/railties/lib/rails/tasks.rb
@@ -10,7 +10,6 @@ $VERBOSE = nil
misc
routes
statistics
- testing
tmp
).each do |task|
load "rails/tasks/#{task}.rake"
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
new file mode 100644
index 0000000000..6858e8ebbd
--- /dev/null
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -0,0 +1,11 @@
+module Rails
+ class TestUnitRailtie < Rails::Railtie
+ railtie_name :test_unit
+
+ config.generators.test_framework :test_unit
+
+ rake_tasks do
+ load "rails/tasks/testing.rake"
+ end
+ end
+end \ No newline at end of file