diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-07 04:37:46 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-07 04:37:46 -0800 |
| commit | e6e591dffcb2364e0da0c0fa15b192d5a0c65864 (patch) | |
| tree | c192925002383554584888a4b84f22697a7adfa6 /actionpack | |
| parent | 87a8f95f6cf4493f0cc73a236afad81267acef68 (diff) | |
| parent | 787617760cb63b46bc176b94d8ebbf59b5c848cc (diff) | |
| download | rails-e6e591dffcb2364e0da0c0fa15b192d5a0c65864.tar.gz rails-e6e591dffcb2364e0da0c0fa15b192d5a0c65864.tar.bz2 rails-e6e591dffcb2364e0da0c0fa15b192d5a0c65864.zip | |
Merge pull request #5320 from carlosantoniodasilva/test-render-js-no-layout
Add test case for #5307
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index f618d4889d..0e4099ddc6 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -132,7 +132,6 @@ class RespondToController < ActionController::Base end end - def iphone_with_html_response_type request.format = :iphone if request.env["HTTP_ACCEPT"] == "text/iphone" @@ -1135,7 +1134,7 @@ class PostController < AbstractPostController around_filter :with_iphone def index - respond_to(:html, :iphone) + respond_to(:html, :iphone, :js) end protected @@ -1182,6 +1181,11 @@ class MimeControllerLayoutsTest < ActionController::TestCase get :index assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body end + + def test_non_navigational_format_with_no_template_fallbacks_to_html_template_with_no_layout + get :index, :format => :js + assert_equal "Hello Firefox", @response.body + end end class FlashResponder < ActionController::Responder |