aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-02-19 00:27:19 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-02-19 00:27:19 +0000
commit7ec0204ecd7557a63267ff64cc412338176a0805 (patch)
tree82ba2ca3e3e1d5367267db828581a096a425eb04 /actionpack/test/controller
parentaad7fbde68684547959dcccc2102c978d5347a78 (diff)
downloadrails-7ec0204ecd7557a63267ff64cc412338176a0805.tar.gz
rails-7ec0204ecd7557a63267ff64cc412338176a0805.tar.bz2
rails-7ec0204ecd7557a63267ff64cc412338176a0805.zip
Move etagging down to response, so renders with layouts dont screw it up [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/render_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 21f5fb1f51..495e48a34a 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -337,6 +337,7 @@ class RenderTest < Test::Unit::TestCase
def test_etag_should_govern_renders_with_layouts_too
get :builder_layout_test
+ assert_equal "<wrapper>\n<html>\n <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body
assert_equal etag_for("<wrapper>\n<html>\n <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n"), @response.headers['Etag']
end