Merge check box fixes from remote-tracking branch 'cantonio/checkbox-…

…hidden-backport' into 3-2-stable

actionpack/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Rails 3.2.2 (unreleased) ##
+
+*   check_box helper with :disabled => true will generate a disabled hidden field to conform with the HTML convention where disabled fields are not submitted with the form.
+    This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
+    *Tadas Tamosauskas*
+
 ## Rails 3.2.1 (January 26, 2012) ##
 
 *   Documentation improvements.

actionpack/lib/action_view/helpers/form_helper.rb

@@ -1092,7 +1092,7 @@ def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
         else
           add_default_name_and_id(options)
         end
-        hidden = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
+        hidden = unchecked_value ? tag("input", "name" => options["name"], "type" => "hidden", "value" => unchecked_value, "disabled" => options["disabled"]) : ""
         checkbox = tag("input", options)
         (hidden + checkbox).html_safe
       end

actionpack/test/template/form_helper_test.rb

@@ -373,6 +373,14 @@ def test_check_box_with_explicit_checked_and_unchecked_values
     )
   end
 
+  def test_check_box_with_nil_unchecked_value
+    @post.secret = "on"
+    assert_dom_equal(
+      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" />',
+      check_box("post", "secret", {}, "on", nil)
+    )
+  end
+
   def test_check_box_with_multiple_behavior
     @post.comment_ids = [2,3]
     assert_dom_equal(
@@ -385,11 +393,10 @@ def test_check_box_with_multiple_behavior
     )
   end
 
-
-  def test_checkbox_disabled_still_submits_checked_value
+  def test_checkbox_disabled_disables_hidden_field
     assert_dom_equal(
-      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
-      check_box("post", "secret", { :disabled => :true })
+      '<input name="post[secret]" type="hidden" value="0" disabled="disabled"/><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
+      check_box("post", "secret", { :disabled => true })
     )
   end