Changeset 8811

Timestamp:

02/07/08 16:46:50 (7 months ago)

Author:

rick

Message:

Fix bug with setting Request#format= after the getter has cached the value. Closes #10889 [cch1]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix bug with setting Request#format= after the getter has cached the value.  #10889 [cch1]
-
-* Correct inconsistencies in RequestForgeryProtection docs.  #11032 [mislav]

trunk/actionpack/lib/action_controller/request.rb

@@ -114 +114 @@
-    def format=(extension)
-      parameters[:format] = extension.to_s
-format
+@format = Mime::Type.lookup_by_extension(parameters[:format])
-    end
-

trunk/actionpack/test/controller/request_test.rb

@@ -370 +370 @@
-    @request.env["CONTENT_TYPE"] = "text/html"
-    assert_equal Mime::HTML, @request.content_type
+  end
+
+  def test_format_assignment_should_set_format
+    @request.instance_eval { self.format = :txt }
+    assert !@request.format.xml?
+    @request.instance_eval { self.format = :xml }
+    assert @request.format.xml?
-  end
-