aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-19 17:15:22 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-19 17:15:22 -0600
commitfda62ecf707b4023b30303dd0baf303f1ef8d344 (patch)
tree7329cd55304c2f5b092817171805fa7cf1088e97 /actionpack/test/controller/render_test.rb
parenta14bbd7a8574c3b485d4b71e0950b2b9ff4e90d7 (diff)
downloadrails-fda62ecf707b4023b30303dd0baf303f1ef8d344.tar.gz
rails-fda62ecf707b4023b30303dd0baf303f1ef8d344.tar.bz2
rails-fda62ecf707b4023b30303dd0baf303f1ef8d344.zip
Rename AbstractResponse to Response and inheirt from Rack::Response
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
-rw-r--r--actionpack/test/controller/render_test.rb10
1 files changed, 5 insertions, 5 deletions
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?