1 files changed, 39 insertions, 5 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 300c2ebf81..5f5614e58f 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -23,26 +22,59 @@ task :default => [ :test ]
 # Run the unit tests
 
 desc "Run all unit tests"
-task :test => [:test_action_pack, :test_active_record_integration]
+task :test => [:test_action_pack, :test_active_record_integration, :test_new_base, :test_new_base_on_old_tests]
 
+test_lib_dirs = [ENV["NEW"] ? "test/new_base" : "test", "test/lib"]
 Rake::TestTask.new(:test_action_pack) do |t|
-  t.libs << "test"
+  t.libs.concat test_lib_dirs
 
   # 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/[cdft]*/**/*_test.rb" ).sort
+  t.test_files = Dir.glob( "test/{controller,dispatch,template,html-scanner}/**/*_test.rb" ).sort
 
   t.verbose = true
   #t.warning = true
 end
+task :isolated_test do
+  ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+  Dir.glob("test/{controller,dispatch,template}/**/*_test.rb").all? do |file|
+    system(ruby, "-Ilib:#{test_lib_dirs * ':'}", file)
+  end or raise "Failures"
+end
 
 desc 'ActiveRecord Integration Tests'
 Rake::TestTask.new(:test_active_record_integration) do |t|
-  t.libs << "test"
+  t.libs.concat test_lib_dirs
   t.test_files = Dir.glob("test/activerecord/*_test.rb")
   t.verbose = true
 end
 
+desc 'New Controller Tests'
+Rake::TestTask.new(:test_new_base) do |t|
+  t.libs << "test/new_base" << "test/lib"
+  t.test_files = Dir.glob("test/{abstract_controller,new_base}/*_test.rb")
+  t.verbose = true
+end
+
+desc 'Old Controller Tests on New Base'
+Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
+  t.libs << "test/new_base" << "test/lib"
+
+  t.verbose = true
+  # ==== Not ported
+  # * filters
+
+  t.test_files = Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort + %w(
+    action_pack_assertions addresses_render assert_select
+    base benchmark caching capture content_type cookie dispatcher
+    filter_params flash helper http_basic_authentication
+    http_digest_authentication integration layout logging mime_responds
+    record_identifier redirect render render_js render_json
+    render_other render_xml request_forgery_protection rescue
+    resources routing selector send_file test url_rewriter
+    verification view_paths webservice
+  ).map { |name| "test/controller/#{name}_test.rb" }
+end
 
 # Genereate the RDoc documentation
 
@@ -136,12 +168,14 @@ task :update_js => [ :update_scriptaculous ]
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ap", "doc").upload
 end