let the superclass build the request and response

We should leverage the request / response objects that the superclass
has already allocated for us.

11 files changed, 14 insertions, 48 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index c94eea9134..4ea0cd68ac 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -183,7 +183,7 @@ module ActionDispatch
           end
 
           # Assume given controller
-          request = ActionController::TestRequest.new
+          request = build_request
 
           if path =~ %r{://}
             fail_on(URI::InvalidURIError, msg) do
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 3240185414..b7fe253de7 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -127,8 +127,6 @@ class PerformActionTest < ActionController::TestCase
     # a more accurate simulation of what happens in "real life".
     @controller.logger = ActiveSupport::Logger.new(nil)
 
-    @request     = ActionController::TestRequest.new
-    @response    = ActionController::TestResponse.new
     @request.host = "www.nextangle.com"
   end
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 4f5af85fea..abb004d528 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -22,8 +22,6 @@ class FragmentCachingMetalTest < ActionController::TestCase
     @controller.perform_caching = true
     @controller.cache_store = @store
     @params = { controller: 'posts', action: 'index' }
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
     @controller.params = @params
     @controller.request = @request
     @controller.response = @response
@@ -52,8 +50,6 @@ class FragmentCachingTest < ActionController::TestCase
     @controller.perform_caching = true
     @controller.cache_store = @store
     @params = {:controller => 'posts', :action => 'index'}
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
     @controller.params = @params
     @controller.request = @request
     @controller.response = @response
@@ -183,8 +179,6 @@ class FunctionalFragmentCachingTest < ActionController::TestCase
     @controller = FunctionalCachingController.new
     @controller.perform_caching = true
     @controller.cache_store = @store
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
   end
 
   def test_fragment_caching
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 9b0487841f..8a6a51c263 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -757,9 +757,8 @@ class FilterTest < ActionController::TestCase
 
   def test_dynamic_dispatch
     %w(foo bar baz).each do |action|
-      request = ActionController::TestRequest.new
-      request.query_parameters[:choose] = action
-      response = DynamicDispatchController.action(action).call(request.env).last
+      @request.query_parameters[:choose] = action
+      response = DynamicDispatchController.action(action).call(@request.env).last
       assert_equal action, response.body
     end
   end
@@ -839,8 +838,6 @@ class FilterTest < ActionController::TestCase
   private
     def test_process(controller, action = "show")
       @controller = controller.is_a?(Class) ? controller.new : controller
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
 
       process(action)
     end
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index e263ed341f..a96cfa3bf4 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -73,14 +73,8 @@ module LocalAbcHelper
 end
 
 class HelperPathsTest < ActiveSupport::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
   def test_helpers_paths_priority
-    request  = ActionController::TestRequest.new
-    responses = HelpersPathsController.action(:index).call(request.env)
+    responses = HelpersPathsController.action(:index).call(ActionController::TestRequest::DEFAULT_ENV.dup)
 
     # helpers1_pack was given as a second path, so pack1_helper should be
     # included as the second one
@@ -141,8 +135,7 @@ class HelperTest < ActiveSupport::TestCase
   end
 
   def call_controller(klass, action)
-    request  = ActionController::TestRequest.new
-    klass.action(action).call(request.env)
+    klass.action(action).call(ActionController::TestRequest::DEFAULT_ENV.dup)
   end
 
   def test_helper_for_nested_controller
@@ -249,7 +242,7 @@ class HelperTest < ActiveSupport::TestCase
 end
 
 
-class IsolatedHelpersTest < ActiveSupport::TestCase
+class IsolatedHelpersTest < ActionController::TestCase
   class A < ActionController::Base
     def index
       render :inline => '<%= shout %>'
@@ -273,13 +266,11 @@ class IsolatedHelpersTest < ActiveSupport::TestCase
   end
 
   def call_controller(klass, action)
-    request  = ActionController::TestRequest.new
-    klass.action(action).call(request.env)
+    klass.action(action).call(@request.env)
   end
 
   def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    super
     @request.action = 'index'
   end
 
diff --git a/actionpack/test/controller/request/test_request_test.rb b/actionpack/test/controller/request/test_request_test.rb
index 77a2f68b1c..e5d698d5c2 100644
--- a/actionpack/test/controller/request/test_request_test.rb
+++ b/actionpack/test/controller/request/test_request_test.rb
@@ -1,11 +1,7 @@
 require 'abstract_unit'
 require 'stringio'
 
-class ActionController::TestRequestTest < ActiveSupport::TestCase
-
-  def setup
-    @request = ActionController::TestRequest.new
-  end
+class ActionController::TestRequestTest < ActionController::TestCase
 
   def test_test_request_has_session_options_initialized
     assert @request.session_options
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 82c808754c..7c17aed632 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -484,11 +484,10 @@ end
 class FreeCookieControllerTest < ActionController::TestCase
   def setup
     @controller = FreeCookieController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @token      = "cf50faa3fe97702ca1ae"
 
     SecureRandom.stubs(:base64).returns(@token)
+    super
   end
 
   def test_should_not_render_form_with_token_tag
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index f3da2df3ef..5a279639cc 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1207,8 +1207,6 @@ class ResourcesTest < ActionController::TestCase
 
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
       @controller.singleton_class.include(@routes.url_helpers)
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
       get :index, params: options[:options]
       options[:options].delete :action
 
@@ -1277,8 +1275,6 @@ class ResourcesTest < ActionController::TestCase
       (options[:options] ||= {})[:controller] ||= singleton_name.to_s.pluralize
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
       @controller.singleton_class.include(@routes.url_helpers)
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
       get :show, params: options[:options]
       options[:options].delete :action
 
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 36c57ec9b2..c0ddcf7f50 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -34,8 +34,6 @@ class SendFileTest < ActionController::TestCase
 
   def setup
     @controller = SendFileController.new
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
   end
 
   def test_file_nostream
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 86ffb898ad..ffb505da06 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -158,8 +158,6 @@ XML
   def setup
     super
     @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @request.env['PATH_INFO'] = nil
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
       r.draw do
@@ -957,10 +955,11 @@ class ResponseDefaultHeadersTest < ActionController::TestCase
     end
   end
 
-  setup do
+  def before_setup
     @original = ActionDispatch::Response.default_headers
     @defaults = { 'A' => '1', 'B' => '2' }
     ActionDispatch::Response.default_headers = @defaults
+    super
   end
 
   teardown do
@@ -970,8 +969,6 @@ class ResponseDefaultHeadersTest < ActionController::TestCase
   def setup
     super
     @controller = TestController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @request.env['PATH_INFO'] = nil
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
       r.draw do
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index d9a1ae7d4f..3632559684 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 
-class UrlRewriterTests < ActiveSupport::TestCase
+class UrlRewriterTests < ActionController::TestCase
   class Rewriter
     def initialize(request)
       @options = {
@@ -16,7 +16,7 @@ class UrlRewriterTests < ActiveSupport::TestCase
   end
 
   def setup
-    @request = ActionController::TestRequest.new
+    @request = build_request
     @params = {}
     @rewriter = Rewriter.new(@request) #.new(@request, @params)
     @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|