From d175ab2bd628dd97f85776d5066a095308dde6cb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 23 Sep 2015 15:47:00 -0700
Subject: stop directly setting headers on the controller

again, since we are going through the test harness, all this is done
for us.
---
 actionpack/lib/action_controller/metal/testing.rb |  5 -----
 actionpack/test/controller/send_file_test.rb      | 10 +---------
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index 4b570ba8e1..b2b3b4283f 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -2,11 +2,6 @@ module ActionController
   module Testing
     extend ActiveSupport::Concern
 
-    # TODO : Rewrite tests using controller.headers= to use Rack env
-    def headers=(new_headers)
-      @_response.headers.replace(new_headers)
-    end
-
     # Behavior specific to functional tests
     module Functional # :nodoc:
       def set_response!(request)
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 1eda2a010e..c712c75c88 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -27,7 +27,6 @@ class SendFileController < ActionController::Base
       :filename => 'filename'
     }
 
-    self.headers = {}
     send_data "foo", options
   end
 
@@ -38,34 +37,27 @@ class SendFileController < ActionController::Base
       :filename => 'filename'
     }
 
-    self.headers = {}
     send_data "foo", options
   end
 
   def test_send_file_headers_with_mime_lookup_with_symbol
-    options = {
-      :type => :png
-    }
+    options = { :type => :png }
 
-    self.headers = {}
     send_data "foo", options
   end
 
   def test_send_file_headers_with_bad_symbol
     options = { :type => :this_type_is_not_registered }
-    self.headers = {}
     send_data "foo", options
   end
 
   def test_send_file_headers_with_nil_content_type
     options = { :type => nil }
-    self.headers = {}
     send_data "foo", options
   end
 
   def test_send_file_headers_guess_type_from_extension
     options = { :filename => params[:filename] }
-    self.headers = {}
     send_data "foo", options
   end
 
-- 
cgit v1.2.3