aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/send_file_test.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-19 19:19:20 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-19 19:19:20 -0800
commita3c6ad7d5e567cf4d688147357c5de134763599d (patch)
tree9f17a4cdc3b24a6f316e94617aeb5a2bf57ff55f /actionpack/test/controller/send_file_test.rb
parentbf8898b49b5a8c03d328bde7b6ee30edb02d873b (diff)
downloadrails-a3c6ad7d5e567cf4d688147357c5de134763599d.tar.gz
rails-a3c6ad7d5e567cf4d688147357c5de134763599d.tar.bz2
rails-a3c6ad7d5e567cf4d688147357c5de134763599d.zip
Fix a bunch of pending tests by providing an introspection mode for the Response object that does up-front parsing of the headers to populate things like @etag
Diffstat (limited to 'actionpack/test/controller/send_file_test.rb')
-rw-r--r--actionpack/test/controller/send_file_test.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index aebbd893a8..31177223e4 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -102,7 +102,7 @@ class SendFileTest < ActionController::TestCase
end
# Test that send_file_headers! is setting the correct HTTP headers.
- def test_send_file_headers!
+ def test_send_file_headers_bang
options = {
:length => 1,
:type => Mime::PNG,
@@ -125,7 +125,6 @@ class SendFileTest < ActionController::TestCase
assert_equal 'binary', h['Content-Transfer-Encoding']
# test overriding Cache-Control: no-cache header to fix IE open/save dialog
- @controller.headers = { 'Cache-Control' => 'no-cache' }
@controller.send(:send_file_headers!, options)
@controller.response.prepare!
assert_equal 'private', h['Cache-Control']