Changeset 6875

Timestamp:

05/27/07 23:48:28 (1 year ago)

Author:

bitsweat

Message:

Don't prepare response when rendering a component. Closes #8493.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/components_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Don't prepare response when rendering a component.  #8493 [jsierles]
-
-* Reduce file stat calls when checking for template changes.  #7736 [alex]

trunk/actionpack/lib/action_controller/base.rb

@@ -497 +497 @@
-
-        response.request = request
-
+ unless component_request?
-        response
-      ensure

trunk/actionpack/test/controller/components_test.rb

@@ -97 +97 @@
-  end
-
+  def test_etag_is_set_for_parent_template_when_calling_from_template
+    get :calling_from_template
+    expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
+    assert_equal expected_etag, @response.headers['ETag']
+  end
+
-  def test_internal_calling
-    get :internal_caller
@@ -127 +133 @@
-    assert_equal "Lady of the House, speaking", @response.body
-  end
+
+  protected
+    def etag_for(text)
+      %("#{Digest::MD5.hexdigest(text)}")
+    end
-end