aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_render_test.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-06-27 21:24:21 +0300
committerMichael Koziarski <michael@koziarski.com>2008-07-03 19:43:06 +0300
commit12cf8f348b591b7bb0dc899345293a8e37ddad7c (patch)
treedeed5125fe33f677413b15d242431b32ae39b156 /actionpack/test/controller/new_render_test.rb
parentdc2d754d60378b529c239e1291932503d4d8fca5 (diff)
downloadrails-12cf8f348b591b7bb0dc899345293a8e37ddad7c.tar.gz
rails-12cf8f348b591b7bb0dc899345293a8e37ddad7c.tar.bz2
rails-12cf8f348b591b7bb0dc899345293a8e37ddad7c.zip
Move template_format logic out to the request so it's alongside the 'regular' request format.
Use xhr? instead of the expensive trip through Request#accepts.
Diffstat (limited to 'actionpack/test/controller/new_render_test.rb')
-rw-r--r--actionpack/test/controller/new_render_test.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index d60bacd52a..b2691d981b 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -605,8 +605,7 @@ EOS
end
def test_render_with_default_from_accept_header
- @request.env["HTTP_ACCEPT"] = "text/javascript"
- get :greeting
+ xhr :get, :greeting
assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
end