Merge "test_new_base" runner into standard "test_action_pack"

1 files changed, 2 insertions, 9 deletions

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index aaf1c7f926..113118bfc9 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -32,14 +32,14 @@ end
 # Run the unit tests
 
 desc "Run all unit tests"
-task :test => [:test_action_pack, :test_active_record_integration, :test_new_base]
+task :test => [:test_action_pack, :test_active_record_integration]
 
 Rake::TestTask.new(:test_action_pack) do |t|
   t.libs << 'test'
 
   # make sure we include the tests in alphabetical order as on some systems
   # this will not happen automatically and the tests (as a whole) will error
-  t.test_files = Dir.glob( "test/{controller,dispatch,template,html-scanner}/**/*_test.rb" ).sort
+  t.test_files = Dir.glob( "test/{abstract,controller,dispatch,new_base,template,html-scanner}/**/*_test.rb" ).sort
 
   t.verbose = true
   #t.warning = true
@@ -59,13 +59,6 @@ Rake::TestTask.new(:test_active_record_integration) do |t|
   t.verbose = true
 end
 
-desc 'New Controller Tests'
-Rake::TestTask.new(:test_new_base) do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob("test/{abstract,new_base}/*_test.rb")
-  t.verbose = true
-end
-
 # Genereate the RDoc documentation
 
 Rake::RDocTask.new { |rdoc|