aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/send_file_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-02-19 09:31:10 -0600
committerJoshua Peek <josh@joshpeek.com>2010-02-19 09:34:22 -0600
commit7d7f9ccfdf986099e3c5abf05af37a886daba0b5 (patch)
tree9dacbefbc1a3d05ec4d22516bd5b1cd3f943fce5 /actionpack/test/controller/send_file_test.rb
parentbe35a1510d065fc8575524e1b6b9f2bebd3e138c (diff)
downloadrails-7d7f9ccfdf986099e3c5abf05af37a886daba0b5.tar.gz
rails-7d7f9ccfdf986099e3c5abf05af37a886daba0b5.tar.bz2
rails-7d7f9ccfdf986099e3c5abf05af37a886daba0b5.zip
Reinstate pending tests that were supposed to be fixed before the
beta. Shout louder this time so they actually get fixed.
Diffstat (limited to 'actionpack/test/controller/send_file_test.rb')
-rw-r--r--actionpack/test/controller/send_file_test.rb24
1 files changed, 11 insertions, 13 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 0afebac68c..aebbd893a8 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -51,19 +51,17 @@ class SendFileTest < ActionController::TestCase
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