Ticket #6808: json_layout_patch.diff

test/controller/render_test.rb

@@ -47 +47 @@
-    render_json({:hello => 'world'}.to_json, 'alert')
-  end
-
+  def render_symbol_json
+    render :json => {:hello => 'world'}.to_json
+  end
+
-  def render_custom_code
-    render_text "hello world", "404 Moved"
-  end
@@ -125 +129 @@
-      case action_name
-        when "layout_test":         "layouts/standard"
-        when "builder_layout_test": "layouts/builder"
+        when "render_symbol_json":  "layouts/standard"  # to make sure layouts don't interfere
-      end
-    end
-end
@@ -184 +189 @@
-    assert_equal 'application/json', @response.content_type
-  end
-
+  def test_do_with_render_symbol_json
+    get :render_symbol_json
+    assert_equal '{hello: "world"}', @response.body
+    assert_equal 'application/json', @response.content_type
+  end
+
-  def test_do_with_render_custom_code
-    get :render_custom_code
-    assert_response 404

lib/action_controller/layout.rb

@@ -266 +266 @@
-
-      def candidate_for_layout?(options)
-        (options.has_key?(:layout) && options[:layout] != false) || 
-
+json, :
-        !template_exempt_from_layout?(default_template_name(options[:action] || options[:template]))
-      end
-