1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Reinstate pending tests that were supposed to be fixed before the

beta.

Shout louder this time so they actually get fixed.
This commit is contained in:
Joshua Peek 2010-02-19 09:31:10 -06:00
parent be35a1510d
commit 7d7f9ccfdf
2 changed files with 18 additions and 28 deletions

View file

@ -51,19 +51,17 @@ class SendFileTest < ActionController::TestCase
end end
def test_file_stream def test_file_stream
pending do response = nil
response = nil assert_nothing_raised { response = process('file') }
assert_nothing_raised { response = process('file') } assert_not_nil response
assert_not_nil response assert_kind_of Array, response.body_parts
assert_kind_of Array, response.body_parts
require 'stringio' require 'stringio'
output = StringIO.new output = StringIO.new
output.binmode output.binmode
output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding) output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding)
assert_nothing_raised { response.body_parts.each { |part| output << part.to_s } } assert_nothing_raised { response.body_parts.each { |part| output << part.to_s } }
assert_equal file_data, output.string assert_equal file_data, output.string
end
end end
def test_file_url_based_filename def test_file_url_based_filename

View file

@ -165,10 +165,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
assert_equal('public', @response.headers['Cache-Control']) assert_equal('public', @response.headers['Cache-Control'])
assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag']) assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
pending do assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag) assert_equal({:public => true}, @response.cache_control)
assert_equal({:public => true}, @response.cache_control)
end
end end
test "response cache control from rackish app" do test "response cache control from rackish app" do
@ -184,10 +182,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
assert_equal('public', @response.headers['Cache-Control']) assert_equal('public', @response.headers['Cache-Control'])
assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag']) assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
pending do assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag) assert_equal({:public => true}, @response.cache_control)
assert_equal({:public => true}, @response.cache_control)
end
end end
test "response charset and content type from railsish app" do test "response charset and content type from railsish app" do
@ -202,10 +198,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
get '/' get '/'
assert_response :success assert_response :success
pending do assert_equal('utf-16', @response.charset)
assert_equal('utf-16', @response.charset) assert_equal(Mime::XML, @response.content_type)
assert_equal(Mime::XML, @response.content_type)
end
assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type']) assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
end end
@ -220,10 +214,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
get '/' get '/'
assert_response :success assert_response :success
pending do assert_equal('utf-16', @response.charset)
assert_equal('utf-16', @response.charset) assert_equal(Mime::XML, @response.content_type)
assert_equal(Mime::XML, @response.content_type)
end
assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type']) assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
end end