From 8a4e77b4200946ba4ed42fe5927a7400a846063a Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 27 Apr 2009 18:21:26 -0700
Subject: OMG, a lot of work

---
 actionpack/Rakefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 300c2ebf81..18610ed773 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -23,14 +23,14 @@ 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]
 
 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/[cdft]*/**/*_test.rb" ).sort
+  t.test_files = Dir.glob( "test/{controller,dispatch,template}/**/*_test.rb" ).sort
 
   t.verbose = true
   #t.warning = true
@@ -43,6 +43,13 @@ 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_controller,new_base}/*_test.rb")
+  t.verbose = true
+end
+
 
 # Genereate the RDoc documentation
 
-- 
cgit v1.2.3


From 22c5667c2ef46d6723c1805d3adc52dc8e92429b Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 11 May 2009 19:49:11 -0700
Subject: Defer rake/contrib/sshpublisher require so we can use the stdlib rake
 instead of the full gem

---
 actionpack/Rakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 18610ed773..ef76eedfd7 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'] : ''
@@ -143,12 +142,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
 
-- 
cgit v1.2.3


From fa5da8ad54d68ea0484825845eb6f6a8e8bca361 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 13 May 2009 01:06:53 -0700
Subject: isolated_test task

---
 actionpack/Rakefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index ef76eedfd7..6ce8179646 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -34,6 +34,12 @@ Rake::TestTask.new(:test_action_pack) do |t|
   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', file)
+  end or raise "Failures"
+end
 
 desc 'ActiveRecord Integration Tests'
 Rake::TestTask.new(:test_active_record_integration) do |t|
-- 
cgit v1.2.3


From a9e8c4b37480564d27883dffe9134a9f95796a15 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sun, 17 May 2009 14:31:54 +0200
Subject: Ensure rake test does not run new base tests as that requires
 rack/test

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 6ce8179646..41b190130e 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -22,7 +22,7 @@ task :default => [ :test ]
 # 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"
-- 
cgit v1.2.3


From 07f733c6315980bde120c98c6b8a25e2773ee6bf Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 18 May 2009 16:15:43 -0700
Subject: Ported simple benchmarking in new base

---
 actionpack/Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 41b190130e..57c3276cb9 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -21,8 +21,8 @@ task :default => [ :test ]
 
 # Run the unit tests
 
-desc "Run all unit tests"
-task :test => [:test_action_pack, :test_active_record_integration]
+desc "Run all unit tests" # Do not remove :test_new_base
+task :test => [:test_action_pack, :test_active_record_integration, :test_new_base]
 
 Rake::TestTask.new(:test_action_pack) do |t|
   t.libs << "test"
-- 
cgit v1.2.3


From d8fffe7b23acce42bc3941d7bba47e07a66aed67 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Wed, 20 May 2009 00:06:14 +0200
Subject: Replace ad hoc Rack::Test with ActionController::IntegrationTest

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 57c3276cb9..6ce8179646 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -21,7 +21,7 @@ task :default => [ :test ]
 
 # Run the unit tests
 
-desc "Run all unit tests" # Do not remove :test_new_base
+desc "Run all unit tests"
 task :test => [:test_action_pack, :test_active_record_integration, :test_new_base]
 
 Rake::TestTask.new(:test_action_pack) do |t|
-- 
cgit v1.2.3


From 77d955c51740216131fc0b130d5cb37fcd18d071 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 20 May 2009 15:54:29 -0700
Subject: Added passing old tests on new base to the main test runner

---
 actionpack/Rakefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 6ce8179646..f1f407c008 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -22,7 +22,7 @@ task :default => [ :test ]
 # 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, :test_new_base, :test_new_base_on_old_tests]
 
 Rake::TestTask.new(:test_action_pack) do |t|
   t.libs << "test"
@@ -55,6 +55,17 @@ Rake::TestTask.new(:test_new_base) do |t|
   t.verbose = true
 end
 
+desc 'Old Controller Tests on New Base'
+Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
+  ENV['new_base'] = "true"
+  t.libs << "test"
+  # content_type mime_responds layout
+  t.test_files = %w(
+    addresses_render base benchmark caching capture dispatcher record_identifier
+    redirect render rescue url_rewriter webservice
+  ).map { |name| "test/controller/#{name}_test.rb" }
+end
+
 
 # Genereate the RDoc documentation
 
-- 
cgit v1.2.3


From 205cfe2163d9eb6ee801a23f550e960136b5680e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 20 May 2009 16:23:55 -0700
Subject: Massage setup for old tests on new base

---
 actionpack/Rakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index f1f407c008..af14e592c0 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -57,8 +57,7 @@ end
 
 desc 'Old Controller Tests on New Base'
 Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
-  ENV['new_base'] = "true"
-  t.libs << "test"
+  t.libs << "test/new_base" << "test"
   # content_type mime_responds layout
   t.test_files = %w(
     addresses_render base benchmark caching capture dispatcher record_identifier
-- 
cgit v1.2.3


From 8e7a87d299483fce6af3be89e50deae43055a96f Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 21 May 2009 01:38:48 +0200
Subject: Make ActionController::Flash work with new_base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index af14e592c0..2a456ebb05 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -61,7 +61,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # content_type mime_responds layout
   t.test_files = %w(
     addresses_render base benchmark caching capture dispatcher record_identifier
-    redirect render rescue url_rewriter webservice
+    redirect render rescue url_rewriter webservice flash
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From c4a6109286909c394e8c5bfc471a1eb9de245d2b Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 20 May 2009 16:52:56 -0700
Subject: Got controller/mime_responds_test.rb running on the new base

---
 actionpack/Rakefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 2a456ebb05..86f7adaee3 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -58,10 +58,11 @@ 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"
-  # content_type mime_responds layout
+  # content_type layout
+  # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
-    addresses_render base benchmark caching capture dispatcher record_identifier
-    redirect render rescue url_rewriter webservice flash
+    addresses_render base benchmark caching capture dispatcher flash mime_responds
+    record_identifier redirect render rescue url_rewriter webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 7f7fdc407a90c9ce75ce0a77bc0f631115514d2f Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 20 May 2009 17:42:04 -0700
Subject: Make controller/content_type_test.rb pass on new base

---
 actionpack/Rakefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 86f7adaee3..684b828254 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -58,11 +58,12 @@ 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"
-  # content_type layout
+  # layout
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
-    addresses_render base benchmark caching capture dispatcher flash mime_responds
-    record_identifier redirect render rescue url_rewriter webservice
+    addresses_render base benchmark caching capture content_type dispatcher
+    flash mime_responds record_identifier redirect render rescue url_rewriter
+    webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From e21d1614bb9006e69bf4bb2467b823aa12e64485 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 21 May 2009 02:55:25 +0200
Subject: Made ActionController::Verification work with new_base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 684b828254..3a6a54768e 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -63,7 +63,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
     flash mime_responds record_identifier redirect render rescue url_rewriter
-    webservice
+    webservice verification
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 59b32f2883b58a1e7bf2c246801a605b673e3fb6 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 21 May 2009 11:50:34 +0200
Subject: RequestForgeryProtection now works with the new base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 3a6a54768e..84b42b4eb3 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -63,7 +63,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
     flash mime_responds record_identifier redirect render rescue url_rewriter
-    webservice verification
+    webservice verification request_forgery_protection
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 386ff66e5ed4fbe1e060610d4226a4eb22dca766 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 21 May 2009 21:48:26 +0200
Subject: Add Streaming to new base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 84b42b4eb3..5968317c60 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -63,7 +63,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
     flash mime_responds record_identifier redirect render rescue url_rewriter
-    webservice verification request_forgery_protection
+    webservice verification request_forgery_protection send_file
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 2daac47d585c5b8f37e4749d6a9a3aea4b989bd0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 21 May 2009 14:34:42 -0700
Subject: Added the ability to register methods to handle specific render
 option keys and render :json

---
 actionpack/Rakefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 5968317c60..2041f5a844 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -62,8 +62,9 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
-    flash mime_responds record_identifier redirect render rescue url_rewriter
-    webservice verification request_forgery_protection send_file
+    flash mime_responds record_identifier redirect
+    render render_json
+    send_file request_forgery_protection rescue url_rewriter verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From ad1c90de3a766d12a0906c7cf3772f3bc0e1b445 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 21 May 2009 14:51:29 -0700
Subject: Added the :xml render option

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 2041f5a844..d192a2e3bf 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -63,7 +63,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
     flash mime_responds record_identifier redirect
-    render render_json
+    render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
-- 
cgit v1.2.3


From 1a52b246eb245d159a1c331417a4b14923e9bc4e Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 22 May 2009 00:26:58 +0200
Subject: Add HTTP Authentication to the new base

---
 actionpack/Rakefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index d192a2e3bf..012f5384e2 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -65,6 +65,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     flash mime_responds record_identifier redirect
     render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter verification webservice
+    http_basic_authentication http_digest_authentication
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 9d08f86cd45ed939ecf2e24e81655371910c8045 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 22 May 2009 18:40:26 +0200
Subject: Make assertion tests pass with the new base

---
 actionpack/Rakefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 012f5384e2..494286fa4c 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -66,6 +66,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter verification webservice
     http_basic_authentication http_digest_authentication
+    action_pack_assertions
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From faaff383e6f52e1c077684bfa49619139db728fb Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 22 May 2009 19:03:27 +0200
Subject: Add assert_select tests to the new base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 494286fa4c..bc30fc7308 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -66,7 +66,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter verification webservice
     http_basic_authentication http_digest_authentication
-    action_pack_assertions
+    action_pack_assertions assert_select
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 1d168afcb146872cb7e49b6d513629fbb19e39b0 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 22 May 2009 19:51:11 +0200
Subject: Move FilterParameterLogging to a stand alone module and make it work
 on new base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index bc30fc7308..c9ed9ac532 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -66,7 +66,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter verification webservice
     http_basic_authentication http_digest_authentication
-    action_pack_assertions assert_select
+    action_pack_assertions assert_select filter_params
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From e976c489e6416cdc4714721df78dd43dd6d13d99 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 23 May 2009 00:17:05 +0200
Subject: Add all the existing helpers related features to the new base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index c9ed9ac532..0ce6f7823b 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -66,7 +66,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter verification webservice
     http_basic_authentication http_digest_authentication
-    action_pack_assertions assert_select filter_params
+    action_pack_assertions assert_select filter_params helper
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 72a574b5073b1debd58c954b34c54d3bdee7749f Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 22 May 2009 15:16:28 -0700
Subject: Get controller/layout_test.rb running on new base except for
 ActionController::Base.exempt_from_layout which is going to be deprecated.

---
 actionpack/Rakefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 0ce6f7823b..6c820636d5 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -61,12 +61,13 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # layout
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
-    addresses_render base benchmark caching capture content_type dispatcher
-    flash mime_responds record_identifier redirect
-    render render_json render_xml
-    send_file request_forgery_protection rescue url_rewriter verification webservice
-    http_basic_authentication http_digest_authentication
-    action_pack_assertions assert_select filter_params helper
+    action_pack_assertions addresses_render assert_select
+    base benchmark caching capture content_type dispatcher
+    filter_params flash helper http_basic_authentication
+    http_digest_authentication layout mime_responds
+    record_identifier redirect render render_json render_xml
+    send_file request_forgery_protection rescue url_rewriter
+    verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-- 
cgit v1.2.3


From 98f856d7723bd8aa8ccc05dfb7219c897b4dcab7 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 22 May 2009 11:13:34 -0700
Subject: Set ENV['NEW'] to run any test task with the new Base.

---
 actionpack/Rakefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 6c820636d5..79a582033a 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -24,8 +24,9 @@ task :default => [ :test ]
 desc "Run all unit tests"
 task :test => [:test_action_pack, :test_active_record_integration, :test_new_base, :test_new_base_on_old_tests]
 
+test_lib_dir = ENV["NEW"] ? "test/new_base" : "test"
 Rake::TestTask.new(:test_action_pack) do |t|
-  t.libs << "test"
+  t.libs << test_lib_dir
 
   # 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
@@ -37,27 +38,27 @@ 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', file)
+    system(ruby, "-Ilib:#{test_lib_dir}", file)
   end or raise "Failures"
 end
 
 desc 'ActiveRecord Integration Tests'
 Rake::TestTask.new(:test_active_record_integration) do |t|
-  t.libs << "test"
+  t.libs << test_lib_dir
   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"
+  t.libs << "test/new_base"
   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"
+  t.libs << "test/new_base"
   # layout
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
@@ -71,7 +72,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
-
 # Genereate the RDoc documentation
 
 Rake::RDocTask.new { |rdoc|
-- 
cgit v1.2.3


From ca7207838844f02f50afbb18beb0f535903f7929 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 22 May 2009 16:11:54 -0700
Subject: Move fake controllers and models to a common load path

---
 actionpack/Rakefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 79a582033a..6ad061b0b1 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -24,9 +24,9 @@ task :default => [ :test ]
 desc "Run all unit tests"
 task :test => [:test_action_pack, :test_active_record_integration, :test_new_base, :test_new_base_on_old_tests]
 
-test_lib_dir = ENV["NEW"] ? "test/new_base" : "test"
+test_lib_dirs = [ENV["NEW"] ? "test/new_base" : "test", "test/lib"]
 Rake::TestTask.new(:test_action_pack) do |t|
-  t.libs << test_lib_dir
+  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
@@ -38,27 +38,27 @@ 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_dir}", 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_lib_dir
+  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"
+  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"
+  t.libs << "test/new_base" << "test/lib"
   # layout
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
-- 
cgit v1.2.3


From 444480c9a5d9c75568a243bb73a040b3cf050814 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 22 May 2009 16:23:48 -0700
Subject: Verbose test_new_base_on_old_tests

---
 actionpack/Rakefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 6ad061b0b1..18e5b3d96a 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -70,6 +70,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     send_file request_forgery_protection rescue url_rewriter
     verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
+  t.verbose = true
 end
 
 # Genereate the RDoc documentation
-- 
cgit v1.2.3


From f766f669464fa9900197d6b3559c2e00e53de9cd Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 23 May 2009 01:36:09 +0200
Subject: Make logging_test pass with the new base

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 18e5b3d96a..2b48b2cad5 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -68,7 +68,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     http_digest_authentication layout mime_responds
     record_identifier redirect render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter
-    verification webservice
+    verification webservice logging
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
-- 
cgit v1.2.3


From b77602824afe07dfd8fd8e48407a6086802ec7ef Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 23 May 2009 01:40:50 +0200
Subject: Add some more tests to the test_new_base_on_old_tests task

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 2b48b2cad5..448acf20cb 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -68,7 +68,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     http_digest_authentication layout mime_responds
     record_identifier redirect render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter
-    verification webservice logging
+    verification webservice logging resources routing
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
-- 
cgit v1.2.3


From 63ed43cb9901cc7adc352a51fa256c3ba7b6637f Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 22 May 2009 15:50:31 -0700
Subject: Added render_other_test.rb to the new base test runner

---
 actionpack/Rakefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 448acf20cb..99ef542f3e 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -61,14 +61,24 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   t.libs << "test/new_base" << "test/lib"
   # layout
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
+
+  # ==== Not ported
+  # * cookie
+  # * filters
+  # * integration
+  # * render_js
+  # * selector
+  # * test
+  # * translation
+  # * view_paths
   t.test_files = %w(
     action_pack_assertions addresses_render assert_select
     base benchmark caching capture content_type dispatcher
     filter_params flash helper http_basic_authentication
-    http_digest_authentication layout mime_responds
-    record_identifier redirect render render_json render_xml
-    send_file request_forgery_protection rescue url_rewriter
-    verification webservice logging resources routing
+    http_digest_authentication layout logging mime_responds
+    record_identifier redirect render render_json render_other render_xml
+    request_forgery_protection rescue resources routing send_file
+    url_rewriter verification webservice  
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
-- 
cgit v1.2.3


From f9dde8fe4e14e7750e9a00c666b052bb409ead05 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 22 May 2009 16:57:45 -0700
Subject: Port cookies to new base

---
 actionpack/Rakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 99ef542f3e..c31d11503c 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -63,7 +63,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
 
   # ==== Not ported
-  # * cookie
   # * filters
   # * integration
   # * render_js
@@ -73,7 +72,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # * view_paths
   t.test_files = %w(
     action_pack_assertions addresses_render assert_select
-    base benchmark caching capture content_type dispatcher
+    base benchmark caching capture content_type cookie dispatcher
     filter_params flash helper http_basic_authentication
     http_digest_authentication layout logging mime_responds
     record_identifier redirect render render_json render_other render_xml
-- 
cgit v1.2.3


From 3a72b55229f63d2cba3337c39cd118cf532ebbbc Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 23 May 2009 02:07:50 +0200
Subject: Add missing selector_test to the list

---
 actionpack/Rakefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index c31d11503c..ea12adb921 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -66,9 +66,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # * filters
   # * integration
   # * render_js
-  # * selector
   # * test
-  # * translation
   # * view_paths
   t.test_files = %w(
     action_pack_assertions addresses_render assert_select
@@ -76,8 +74,8 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     filter_params flash helper http_basic_authentication
     http_digest_authentication layout logging mime_responds
     record_identifier redirect render render_json render_other render_xml
-    request_forgery_protection rescue resources routing send_file
-    url_rewriter verification webservice  
+    request_forgery_protection rescue resources routing selector send_file
+    translation url_rewriter verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
-- 
cgit v1.2.3


From 7b3fb1d43f57d6ebe3edb75434cae01e140483d0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 22 May 2009 17:07:40 -0700
Subject: Got controller/render_js_test.rb to pass on new base

---
 actionpack/Rakefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index ea12adb921..b9819d4a83 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -65,7 +65,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # ==== Not ported
   # * filters
   # * integration
-  # * render_js
   # * test
   # * view_paths
   t.test_files = %w(
@@ -73,9 +72,9 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     base benchmark caching capture content_type cookie dispatcher
     filter_params flash helper http_basic_authentication
     http_digest_authentication layout logging mime_responds
-    record_identifier redirect render render_json render_other render_xml
-    request_forgery_protection rescue resources routing selector send_file
-    translation url_rewriter verification webservice
+    record_identifier redirect render render_js render_json
+    render_other render_xml request_forgery_protection rescue
+    resources routing selector send_file url_rewriter verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
-- 
cgit v1.2.3


From 595107f22e6a26e20860d0023478437a51daa5c6 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Sat, 23 May 2009 02:20:28 +0200
Subject: Move html-scanner tests one dir up

---
 actionpack/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index b9819d4a83..9ce897aae8 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -30,7 +30,7 @@ Rake::TestTask.new(:test_action_pack) do |t|
 
   # 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}/**/*_test.rb" ).sort
+  t.test_files = Dir.glob( "test/{controller,dispatch,template,html-scanner}/**/*_test.rb" ).sort
 
   t.verbose = true
   #t.warning = true
-- 
cgit v1.2.3


From 09907d1b933d202333280fb2efc079f8bf969e16 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 26 May 2009 12:14:50 -0700
Subject: Get controller/view_paths_test.rb to pass on new base

---
 actionpack/Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 9ce897aae8..d10e8b94a7 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -66,7 +66,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # * filters
   # * integration
   # * test
-  # * view_paths
   t.test_files = %w(
     action_pack_assertions addresses_render assert_select
     base benchmark caching capture content_type cookie dispatcher
@@ -74,7 +73,8 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     http_digest_authentication 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 url_rewriter verification webservice
+    resources routing selector send_file url_rewriter
+    verification view_paths webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
-- 
cgit v1.2.3


From a3ca5638d365113028610141f025839bb3ed738b Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 26 May 2009 14:13:35 -0700
Subject: Get controller/test_test.rb to pass on new base

---
 actionpack/Rakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index d10e8b94a7..41882e99f1 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -65,7 +65,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # ==== Not ported
   # * filters
   # * integration
-  # * test
   t.test_files = %w(
     action_pack_assertions addresses_render assert_select
     base benchmark caching capture content_type cookie dispatcher
@@ -73,7 +72,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     http_digest_authentication 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 url_rewriter
+    resources routing selector send_file test url_rewriter
     verification view_paths webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
-- 
cgit v1.2.3


From 1358f77745c7a4afab0dab7796aa63072c9d323a Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 26 May 2009 14:24:22 -0700
Subject: Add controller/integration_test.rb to the new base test runner

---
 actionpack/Rakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 41882e99f1..a70d4834c0 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -64,12 +64,11 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
 
   # ==== Not ported
   # * filters
-  # * integration
   t.test_files = %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 layout logging mime_responds
+    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
-- 
cgit v1.2.3


From a1f280e83d2b134e23897d4de457d76fb0095768 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 26 May 2009 15:03:09 -0700
Subject: Got all the dispatch tests running on new base

---
 actionpack/Rakefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index a70d4834c0..c44c88f638 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -59,12 +59,13 @@ 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"
-  # layout
-  # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
 
+  t.verbose = true
   # ==== Not ported
   # * filters
-  t.test_files = %w(
+
+  # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
+  t.test_files = Dir.glob( "test/{dispatch}/**/*_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
@@ -74,7 +75,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     resources routing selector send_file test url_rewriter
     verification view_paths webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
-  t.verbose = true
 end
 
 # Genereate the RDoc documentation
-- 
cgit v1.2.3


From 7211048b2b1d640c4f33587b57261bdfe9c77b93 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 26 May 2009 15:19:39 -0700
Subject: Get all template tests passing on new base

---
 actionpack/Rakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/Rakefile')

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index c44c88f638..5f5614e58f 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -64,8 +64,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # ==== Not ported
   # * filters
 
-  # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
-  t.test_files = Dir.glob( "test/{dispatch}/**/*_test.rb" ).sort + %w(
+  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
-- 
cgit v1.2.3