Rename AbstractResponse to Response and inheirt from Rack::Response

4 files changed, 16 insertions, 16 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 87c12ee4ee..cb7922efd2 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -500,17 +500,17 @@ class ActionPackHeaderTest < ActionController::TestCase
 
   def test_rendering_xml_sets_content_type
     process :hello_xml_world
-    assert_equal('application/xml; charset=utf-8', @response.headers['type'])
+    assert_equal('application/xml; charset=utf-8', @response.headers['Content-Type'])
   end
 
   def test_rendering_xml_respects_content_type
     @response.headers['type'] = 'application/pdf'
     process :hello_xml_world
-    assert_equal('application/pdf; charset=utf-8', @response.headers['type'])
+    assert_equal('application/pdf; charset=utf-8', @response.headers['Content-Type'])
   end
 
   def test_render_text_with_custom_content_type
     get :render_text_with_custom_content_type
-    assert_equal 'application/rss+xml; charset=utf-8', @response.headers['type']
+    assert_equal 'application/rss+xml; charset=utf-8', @response.headers['Content-Type']
   end
 end
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index cfe5726253..4b969519c6 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -59,7 +59,7 @@ class CookieTest < Test::Unit::TestCase
     get :authenticate_for_fourteen_days
     assert_equal ["user_name=david; path=/; expires=Mon, 10 Oct 2005 05:00:00 GMT"], @response.headers["Set-Cookie"]
     assert_equal({"user_name" => ["david"]}, @response.cookies)
- end
+  end
 
   def test_setting_cookie_for_fourteen_days_with_symbols
     get :authenticate_for_fourteen_days_with_symbols
@@ -71,7 +71,7 @@ class CookieTest < Test::Unit::TestCase
     get :authenticate_with_http_only
     assert_equal ["user_name=david; path=/; HttpOnly"], @response.headers["Set-Cookie"]
     assert_equal({"user_name" => ["david"]}, @response.cookies)
- end
+  end
 
   def test_multiple_cookies
     get :set_multiple_cookies
@@ -79,7 +79,7 @@ class CookieTest < Test::Unit::TestCase
     assert_equal "user_name=david; path=/; expires=Mon, 10 Oct 2005 05:00:00 GMT", @response.headers["Set-Cookie"][0]
     assert_equal "login=XJ-122; path=/", @response.headers["Set-Cookie"][1]
     assert_equal({"login" => ["XJ-122"], "user_name" => ["david"]}, @response.cookies)
- end
+  end
 
   def test_setting_test_cookie
     assert_nothing_raised { get :access_frozen_cookies }
@@ -89,7 +89,7 @@ class CookieTest < Test::Unit::TestCase
     get :logout
     assert_equal ["user_name=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT"], @response.headers["Set-Cookie"]
     assert_equal({"user_name" => []}, @response.cookies)
- end
+  end
 
   def test_cookiejar_accessor
     @request.cookies["user_name"] = CGI::Cookie.new("name" => "user_name", "value" => "david", "expires" => Time.local(2025, 10, 10))
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 51f43290d2..81d103f0f9 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -229,7 +229,7 @@ end
 class RackResponseTest < BaseRackTest
   def setup
     super
-    @response = ActionController::RackResponse.new
+    @response = ActionController::Response.new
   end
 
   def test_simple_output
@@ -237,7 +237,7 @@ class RackResponseTest < BaseRackTest
     @response.prepare!
 
     status, headers, body = @response.to_a
-    assert_equal "200 OK", status
+    assert_equal 200, status
     assert_equal({
       "Content-Type" => "text/html; charset=utf-8",
       "Cache-Control" => "private, max-age=0, must-revalidate",
@@ -258,7 +258,7 @@ class RackResponseTest < BaseRackTest
     @response.prepare!
 
     status, headers, body = @response.to_a
-    assert_equal "200 OK", status
+    assert_equal 200, status
     assert_equal({"Content-Type" => "text/html; charset=utf-8", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
 
     parts = []
@@ -270,7 +270,7 @@ end
 class RackResponseHeadersTest < BaseRackTest
   def setup
     super
-    @response = ActionController::RackResponse.new
+    @response = ActionController::Response.new
     @response.status = "200 OK"
   end
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index e0f05d654c..8e08a5a8e9 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -208,7 +208,7 @@ class TestController < ActionController::Base
   def greeting
     # let's just rely on the template
   end
-  
+
   def blank_response
     render :text => ' '
   end
@@ -1099,14 +1099,14 @@ class RenderTest < ActionController::TestCase
   def test_update_page
     get :update_page
     assert_template nil
-    assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers['Content-Type']
     assert_equal 2, @response.body.split($/).length
   end
 
   def test_update_page_with_instance_variables
     get :update_page_with_instance_variables
     assert_template nil
-    assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers["Content-Type"]
     assert_match /balance/, @response.body
     assert_match /\$37/, @response.body
   end
@@ -1114,7 +1114,7 @@ class RenderTest < ActionController::TestCase
   def test_update_page_with_view_method
     get :update_page_with_view_method
     assert_template nil
-    assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers["Content-Type"]
     assert_match /2 people/, @response.body
   end
 
@@ -1384,7 +1384,7 @@ class EtagRenderTest < ActionController::TestCase
     @request.host = "www.nextangle.com"
     @expected_bang_etag = etag_for(expand_key([:foo, 123]))
   end
-  
+
   def test_render_blank_body_shouldnt_set_etag
     get :blank_response
     assert !@response.etag?