Permalink
Browse files

Fix tests depending too deep

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6169 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 94fa0ed commit 9e4c8b88584ba09c46abcd484969da6244416946 @dhh dhh committed Feb 19, 2007
@@ -41,9 +41,10 @@ def prepare!
set_content_length!
end
+
private
def handle_conditional_get!
- if body.is_a?(String) && headers['Status'][0..2] == '200' && !body.empty?
+ if body.is_a?(String) && (headers['Status'] ? headers['Status'][0..2] == '200' : true) && !body.empty?
self.headers['ETag'] ||= %("#{Digest::MD5.hexdigest(body)}")
self.headers['Cache-Control'] = 'private' if headers['Cache-Control'] == DEFAULT_HEADERS['Cache-Control']
@@ -462,18 +462,18 @@ def setup
def test_rendering_xml_sets_content_type
assert_deprecated(/render/) { process :hello_xml_world }
- assert_equal('application/xml; charset=utf-8', @controller.headers['Content-Type'])
+ assert_equal('application/xml; charset=utf-8', @response.headers['type'])
end
def test_rendering_xml_respects_content_type
- @response.headers['Content-Type'] = 'application/pdf'
+ @response.headers['type'] = 'application/pdf'
assert_deprecated(/render/) { process :hello_xml_world }
- assert_equal('application/pdf; charset=utf-8', @controller.headers['Content-Type'])
+ assert_equal('application/pdf; charset=utf-8', @response.headers['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['Content-Type']
+ assert_equal 'application/rss+xml; charset=utf-8', @response.headers['type']
end
end
@@ -669,14 +669,14 @@ def test_render_text_with_assigns
def test_update_page
get :update_page
assert_template nil
- assert_equal 'text/javascript; charset=utf-8', @response.headers['Content-Type']
+ assert_equal 'text/javascript; charset=utf-8', @response.headers['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['Content-Type']
+ assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
assert_match /balance/, @response.body
assert_match /\$37/, @response.body
end
@@ -73,10 +73,10 @@ def test_data
def test_headers_after_send_shouldnt_include_charset
response = process('data')
- assert_equal "application/octet-stream", response.headers["Content-Type"]
+ assert_equal "application/octet-stream", response.content_type
response = process('file')
- assert_equal "application/octet-stream", response.headers["Content-Type"]
+ assert_equal "application/octet-stream", response.content_type
end
# Test that send_file_headers! is setting the correct HTTP headers.
@@ -113,13 +113,13 @@ def test_send_file_headers!
define_method "test_send_#{method}_status" do
@controller.options = { :stream => false, :status => 500 }
assert_nothing_raised { assert_not_nil process(method) }
- assert_equal '500 Internal Server Error', @controller.headers['Status']
+ assert_equal '500 Internal Server Error', @response.headers['Status']
end
define_method "test_default_send_#{method}_status" do
@controller.options = { :stream => false }
assert_nothing_raised { assert_not_nil process(method) }
- assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @controller.headers['Status']
+ assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @response.headers['Status']
end
end
end

0 comments on commit 9e4c8b8

Please sign in to comment.