Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #5320 from carlosantoniodasilva/test-render-js-no-…

…layout

Add test case for #5307
  • Loading branch information...
commit e6e591dffcb2364e0da0c0fa15b192d5a0c65864 2 parents 87a8f95 + 7876177
@spastorino spastorino authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 actionpack/test/controller/mime_responds_test.rb
View
8 actionpack/test/controller/mime_responds_test.rb
@@ -132,7 +132,6 @@ def all_types_with_layout
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 @@ def test_format_with_inherited_layouts
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
Please sign in to comment.
Something went wrong with that request. Please try again.