Fix a regression and also fix broken test.

ebd71fd0 · José Valim · 94dcbe81 · ebd71fd0 · ebd71fd0
2 changed file
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -64,10 +64,15 @@ def find_layout(layout, keys)
    def resolve_layout(layout, keys)
      case layout
      when String
-        if layout =~ /^\//
+        begin
-          with_fallbacks { find_template(layout, nil, false, keys, @details) }
+          if layout =~ /^\//
-        else
+            with_fallbacks { find_template(layout, nil, false, keys, @details) }
-          find_template(layout, nil, false, keys, @details)
+          else
+            find_template(layout, nil, false, keys, @details)
+          end
+        rescue ActionView::MissingTemplate
+          all_details = @details.merge(:formats => @lookup_context.default_formats)
+          raise unless template_exists?(layout, nil, false, keys, all_details)
        end
      when Proc
        resolve_layout(layout.call, keys)

--- a/actionpack/test/controller/new_base/render_layout_test.rb
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -71,7 +71,8 @@ class MismatchFormatController < ::ApplicationController
    self.view_paths = [ActionView::FixtureResolver.new(
      "layouts/application.html.erb" => "<html><%= yield %></html>",
      "controller_layouts/mismatch_format/index.xml.builder" => "xml.instruct!",
-      "controller_layouts/mismatch_format/implicit.builder" => "xml.instruct!"
+      "controller_layouts/mismatch_format/implicit.builder" => "xml.instruct!",
+      "controller_layouts/mismatch_format/explicit.js.erb" => "alert('foo');"
    )]
    def explicit
@@ -94,10 +95,9 @@ class MismatchFormatTest < Rack::TestCase
      assert_response XML_INSTRUCT
    end
-    test "if an HTML template is explicitly provides for a JS template, an error is raised" do
+    test "a layout for JS is ignored even if explicitly provided for HTML" do
-      assert_raises ActionView::MissingTemplate do
+      get :explicit, { :format => "js" }
-        get :explicit, {}, "action_dispatch.show_exceptions" => false
+      assert_response "alert('foo');"
-      end
    end
  end
 end