Changeset 5746

Timestamp:

12/19/06 04:41:57 (2 years ago)

Author:

rick

Message:

Ensure render :json => ... skips the layout. Closes #6808 [Josh Peek]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
• trunk/actionpack/test/controller/render_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure render :json => ... skips the layout.  Closes #6808 [Josh Peek]
-
-* Fix HTML::Node to output double quotes instead of single quotes.  Closes #6845 [mitreandy]

trunk/actionpack/lib/action_controller/layout.rb

@@ -267 +267 @@
-      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

trunk/actionpack/test/controller/render_test.rb

@@ -46 +46 @@
-  def render_json_hello_world_with_callback
-    render_json({:hello => 'world'}.to_json, 'alert')
+  end
+
+  def render_symbol_json
+    render :json => {:hello => 'world'}.to_json
-  end
-
@@ -126 +130 @@
-        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
@@ -185 +190 @@
-  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