aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-02-18 00:47:18 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-02-18 00:47:18 +0000
commit4fd84aae90e940b1a33429c4c5f9872fec777b80 (patch)
treeb847f0984f2b84550f8d28bffc6fa60a0aab712f /actionpack/test/controller
parent392c7f7314d196c54912a65981d79002d032f896 (diff)
downloadrails-4fd84aae90e940b1a33429c4c5f9872fec777b80.tar.gz
rails-4fd84aae90e940b1a33429c4c5f9872fec777b80.tar.bz2
rails-4fd84aae90e940b1a33429c4c5f9872fec777b80.zip
Etagging ignores appended and block responses.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/render_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index fc40d0ae7f..dd5255ce35 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -311,13 +311,13 @@ class RenderTest < Test::Unit::TestCase
def test_render_with_etag
get :render_hello_world_from_variable
- expected_etag = "\"#{MD5.new("hello david").to_s}\""
+ expected_etag = etag_for('hello david')
assert_equal expected_etag, @response.headers['Etag']
-
+
@request.headers["HTTP_IF_NONE_MATCH"] = expected_etag
get :render_hello_world_from_variable
assert_equal "304 Not Modified", @response.headers['Status']
-
+
@request.headers["HTTP_IF_NONE_MATCH"] = "\"diftag\""
get :render_hello_world_from_variable
assert_equal "200 OK", @response.headers['Status']
@@ -332,8 +332,8 @@ class RenderTest < Test::Unit::TestCase
def assert_deprecated_render(&block)
assert_deprecated(/render/, &block)
end
-
+
def etag_for(text)
- "\"#{MD5.new(text).to_s}\""
+ %("#{Digest::MD5.hexdigest(text)}")
end
end