RJS doesn't render with an HTML layout by default
This commit is contained in:
parent
4fad953f90
commit
487312515c
|
@ -124,6 +124,7 @@ module ActionController
|
||||||
super
|
super
|
||||||
rescue ActionView::MissingTemplate
|
rescue ActionView::MissingTemplate
|
||||||
_find_by_parts(_layout({}), {})
|
_find_by_parts(_layout({}), {})
|
||||||
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def performed?
|
def performed?
|
||||||
|
|
|
@ -375,12 +375,10 @@ class MimeControllerTest < ActionController::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_rjs_type_skips_layout
|
def test_rjs_type_skips_layout
|
||||||
pending(:new_base) do
|
|
||||||
@request.accept = "text/javascript"
|
@request.accept = "text/javascript"
|
||||||
get :all_types_with_layout
|
get :all_types_with_layout
|
||||||
assert_equal 'RJS for all_types_with_layout', @response.body
|
assert_equal 'RJS for all_types_with_layout', @response.body
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
def test_html_type_with_layout
|
def test_html_type_with_layout
|
||||||
@request.accept = "text/html"
|
@request.accept = "text/html"
|
||||||
|
|
Loading…
Reference in New Issue