Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Reinstate pending tests that were supposed to be fixed before the

beta.

Shout louder this time so they actually get fixed.
  • Loading branch information...
commit 7d7f9ccfdf986099e3c5abf05af37a886daba0b5 1 parent be35a15
@josh josh authored
View
24 actionpack/test/controller/send_file_test.rb
@@ -51,19 +51,17 @@ def test_file_nostream
end
def test_file_stream
- pending do
- response = nil
- assert_nothing_raised { response = process('file') }
- assert_not_nil response
- assert_kind_of Array, response.body_parts
-
- require 'stringio'
- output = StringIO.new
- output.binmode
- 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_equal file_data, output.string
- end
+ response = nil
+ assert_nothing_raised { response = process('file') }
+ assert_not_nil response
+ assert_kind_of Array, response.body_parts
+
+ require 'stringio'
+ output = StringIO.new
+ output.binmode
+ 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_equal file_data, output.string
end
def test_file_url_based_filename
View
24 actionpack/test/dispatch/response_test.rb
@@ -165,10 +165,8 @@ def app
assert_equal('public', @response.headers['Cache-Control'])
assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
- pending do
- assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
- assert_equal({:public => true}, @response.cache_control)
- end
+ assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+ assert_equal({:public => true}, @response.cache_control)
end
test "response cache control from rackish app" do
@@ -184,10 +182,8 @@ def app
assert_equal('public', @response.headers['Cache-Control'])
assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
- pending do
- assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
- assert_equal({:public => true}, @response.cache_control)
- end
+ assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+ assert_equal({:public => true}, @response.cache_control)
end
test "response charset and content type from railsish app" do
@@ -202,10 +198,8 @@ def app
get '/'
assert_response :success
- pending do
- assert_equal('utf-16', @response.charset)
- assert_equal(Mime::XML, @response.content_type)
- end
+ assert_equal('utf-16', @response.charset)
+ assert_equal(Mime::XML, @response.content_type)
assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
end
@@ -220,10 +214,8 @@ def app
get '/'
assert_response :success
- pending do
- assert_equal('utf-16', @response.charset)
- assert_equal(Mime::XML, @response.content_type)
- end
+ assert_equal('utf-16', @response.charset)
+ assert_equal(Mime::XML, @response.content_type)
assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
end
Please sign in to comment.
Something went wrong with that request. Please try again.