aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-02-29 18:09:23 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-02-29 18:09:23 +0000
commit7dcd0d7d967c613f4e447ba6330e1f616b93c1a3 (patch)
tree36b52049215ce5addbe7092c0d682d23e4ff32ba /actionpack/test/controller
parent18aa19c68a0ff2dbb3ab77eb35343b2e2a145441 (diff)
downloadrails-7dcd0d7d967c613f4e447ba6330e1f616b93c1a3.tar.gz
rails-7dcd0d7d967c613f4e447ba6330e1f616b93c1a3.tar.bz2
rails-7dcd0d7d967c613f4e447ba6330e1f616b93c1a3.zip
Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8956 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/new_render_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 4d62647e8b..928c46cb6d 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -550,6 +550,12 @@ EOS
assert_equal "<p>This is grand!</p>\n", @response.body
end
+ def test_render_with_default_from_accept_header
+ @request.env["HTTP_ACCEPT"] = "text/javascript"
+ get :greeting
+ assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
+ end
+
def test_render_rjs_with_default
get :delete_with_js
assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body