1 files changed, 41 insertions, 7 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 981d820ccf..cd385982d9 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -5,6 +5,7 @@ require 'rack/content_length'
 class ResponseTest < ActiveSupport::TestCase
   def setup
     @response = ActionDispatch::Response.create
+    @response.request = ActionDispatch::Request.empty
   end
 
   def test_can_wait_until_commit
@@ -36,9 +37,31 @@ class ResponseTest < ActiveSupport::TestCase
     assert_equal "closed stream", e.message
   end
 
+  def test_read_body_during_action
+    @response.body = "Hello, World!"
+
+    # even though there's no explicitly set content-type,
+    assert_equal nil, @response.content_type
+
+    # after the action reads back @response.body,
+    assert_equal "Hello, World!", @response.body
+
+    # the response can be built.
+    status, headers, body = @response.to_a
+    assert_equal 200, status
+    assert_equal({
+      "Content-Type" => "text/html; charset=utf-8"
+    }, headers)
+
+    parts = []
+    body.each { |part| parts << part }
+    assert_equal ["Hello, World!"], parts
+  end
+
   def test_response_body_encoding
     body = ["hello".encode(Encoding::UTF_8)]
     response = ActionDispatch::Response.new 200, {}, body
+    response.request = ActionDispatch::Request.empty
     assert_equal Encoding::UTF_8, response.body.encoding
   end
 
@@ -174,11 +197,11 @@ class ResponseTest < ActiveSupport::TestCase
     }
     resp.to_a
 
-    assert_equal('"202cb962ac59075b964b07152d234b70"', resp.etag)
+    assert_equal('W/"202cb962ac59075b964b07152d234b70"', resp.etag)
     assert_equal({:public => true}, resp.cache_control)
 
     assert_equal('public', resp.headers['Cache-Control'])
-    assert_equal('"202cb962ac59075b964b07152d234b70"', resp.headers['ETag'])
+    assert_equal('W/"202cb962ac59075b964b07152d234b70"', resp.headers['ETag'])
   end
 
   test "read charset and content type" do
@@ -261,6 +284,7 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "can be explicitly destructured into status, headers and an enumerable body" do
     response = ActionDispatch::Response.new(404, { 'Content-Type' => 'text/plain' }, ['Not Found'])
+    response.request = ActionDispatch::Request.empty
     status, headers, body = *response
 
     assert_equal 404, status
@@ -356,6 +380,7 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
         resp.cache_control[:public] = true
         resp.etag = '123'
         resp.body = 'Hello'
+        resp.request = ActionDispatch::Request.empty
       }.to_a
     }
 
@@ -363,16 +388,16 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     assert_equal('public', @response.headers['Cache-Control'])
-    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+    assert_equal('W/"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
 
-    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+    assert_equal('W/"202cb962ac59075b964b07152d234b70"', @response.etag)
     assert_equal({:public => true}, @response.cache_control)
   end
 
   test "response cache control from rackish app" do
     @app = lambda { |env|
       [200,
-        {'ETag' => '"202cb962ac59075b964b07152d234b70"',
+        {'ETag' => 'W/"202cb962ac59075b964b07152d234b70"',
           'Cache-Control' => 'public'}, ['Hello']]
     }
 
@@ -380,9 +405,9 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     assert_equal('public', @response.headers['Cache-Control'])
-    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+    assert_equal('W/"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
 
-    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+    assert_equal('W/"202cb962ac59075b964b07152d234b70"', @response.etag)
     assert_equal({:public => true}, @response.cache_control)
   end
 
@@ -392,6 +417,7 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
         resp.charset = 'utf-16'
         resp.content_type = Mime[:xml]
         resp.body = 'Hello'
+        resp.request = ActionDispatch::Request.empty
       }.to_a
     }
 
@@ -419,4 +445,12 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
 
     assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
   end
+
+  test "we can set strong ETag by directly adding it as header" do
+    @response = ActionDispatch::Response.create
+    @response.add_header "ETag", '"202cb962ac59075b964b07152d234b70"'
+
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+  end
 end