1 files changed, 195 insertions, 90 deletions

diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index 8cca43d7ca..7b680aac08 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -19,6 +19,9 @@ class FormHelperTest < ActionView::TestCase
         attributes: {
           post: {
             cost: "Total cost"
+          },
+          :"post/language" => {
+            spanish: "Espanol"
           }
         }
       },
@@ -143,75 +146,74 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_label_with_locales_strings
-    old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal('<label for="post_body">Write entire text here</label>', label("post", "body"))
-  ensure
-    I18n.locale = old_locale
+    with_locale :label do
+      assert_dom_equal('<label for="post_body">Write entire text here</label>', label("post", "body"))
+    end
   end
 
   def test_label_with_human_attribute_name
-    old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal('<label for="post_cost">Total cost</label>', label(:post, :cost))
-  ensure
-    I18n.locale = old_locale
+    with_locale :label do
+      assert_dom_equal('<label for="post_cost">Total cost</label>', label(:post, :cost))
+    end
+  end
+
+  def test_label_with_human_attribute_name_and_options
+    with_locale :label do
+      assert_dom_equal('<label for="post_language_spanish">Espanol</label>', label(:post, :language, value: "spanish"))
+    end
   end
 
   def test_label_with_locales_symbols
-    old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal('<label for="post_body">Write entire text here</label>', label(:post, :body))
-  ensure
-    I18n.locale = old_locale
+    with_locale :label do
+      assert_dom_equal('<label for="post_body">Write entire text here</label>', label(:post, :body))
+    end
   end
 
   def test_label_with_locales_and_options
-    old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal(
-      '<label for="post_body" class="post_body">Write entire text here</label>',
-      label(:post, :body, class: "post_body")
-    )
-  ensure
-    I18n.locale = old_locale
+    with_locale :label do
+      assert_dom_equal(
+        '<label for="post_body" class="post_body">Write entire text here</label>',
+        label(:post, :body, class: "post_body")
+      )
+    end
   end
 
   def test_label_with_locales_and_value
-    old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal('<label for="post_color_red">Rojo</label>', label(:post, :color, value: "red"))
-  ensure
-    I18n.locale = old_locale
+    with_locale :label do
+      assert_dom_equal('<label for="post_color_red">Rojo</label>', label(:post, :color, value: "red"))
+    end
   end
 
   def test_label_with_locales_and_nested_attributes
-    old_locale, I18n.locale = I18n.locale, :label
-    form_for(@post, html: { id: 'create-post' }) do |f|
-      f.fields_for(:comments) do |cf|
-        concat cf.label(:body)
+    with_locale :label do
+      form_for(@post, html: { id: 'create-post' }) do |f|
+        f.fields_for(:comments) do |cf|
+          concat cf.label(:body)
+        end
       end
-    end
 
-    expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
-      '<label for="post_comments_attributes_0_body">Write body here</label>'
-    end
+      expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
+        '<label for="post_comments_attributes_0_body">Write body here</label>'
+      end
 
-    assert_dom_equal expected, output_buffer
-  ensure
-    I18n.locale = old_locale
+      assert_dom_equal expected, output_buffer
+    end
   end
 
   def test_label_with_locales_fallback_and_nested_attributes
-    old_locale, I18n.locale = I18n.locale, :label
-    form_for(@post, html: { id: 'create-post' }) do |f|
-      f.fields_for(:tags) do |cf|
-        concat cf.label(:value)
+    with_locale :label do
+      form_for(@post, html: { id: 'create-post' }) do |f|
+        f.fields_for(:tags) do |cf|
+          concat cf.label(:value)
+        end
       end
-    end
 
-    expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
-      '<label for="post_tags_attributes_0_value">Tag</label>'
-    end
+      expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
+        '<label for="post_tags_attributes_0_value">Tag</label>'
+      end
 
-    assert_dom_equal expected, output_buffer
-  ensure
-    I18n.locale = old_locale
+      assert_dom_equal expected, output_buffer
+    end
   end
 
   def test_label_with_for_attribute_as_symbol
@@ -272,6 +274,13 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
+  def test_label_with_block_and_html
+    assert_dom_equal(
+      '<label for="post_terms">Accept <a href="/terms">Terms</a>.</label>',
+      label(:post, :terms) { 'Accept <a href="/terms">Terms</a>.'.html_safe }
+    )
+  end
+
   def test_label_with_block_and_options
     assert_dom_equal(
       '<label for="my_for">The title, please:</label>',
@@ -1282,6 +1291,42 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_with_namespace_and_with_collection_radio_buttons
+    post = Post.new
+    def post.active; false; end
+
+    form_for(post, namespace: 'foo') do |f|
+      concat f.collection_radio_buttons(:active, [true, false], :to_s, :to_s)
+    end
+
+    expected = whole_form("/posts", "foo_new_post", "new_post") do
+      "<input id='foo_post_active_true' name='post[active]' type='radio' value='true' />" +
+      "<label for='foo_post_active_true'>true</label>" +
+      "<input checked='checked' id='foo_post_active_false' name='post[active]' type='radio' value='false' />" +
+      "<label for='foo_post_active_false'>false</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_with_index_and_with_collection_radio_buttons
+    post = Post.new
+    def post.active; false; end
+
+    form_for(post, index: '1') do |f|
+      concat f.collection_radio_buttons(:active, [true, false], :to_s, :to_s)
+    end
+
+    expected = whole_form("/posts", "new_post", "new_post") do
+      "<input id='post_1_active_true' name='post[1][active]' type='radio' value='true' />" +
+      "<label for='post_1_active_true'>true</label>" +
+      "<input checked='checked' id='post_1_active_false' name='post[1][active]' type='radio' value='false' />" +
+      "<label for='post_1_active_false'>false</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_form_for_with_collection_check_boxes
     post = Post.new
     def post.tag_ids; [1, 3]; end
@@ -1361,6 +1406,42 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_with_namespace_and_with_collection_check_boxes
+    post = Post.new
+    def post.tag_ids; [1]; end
+    collection = [[1, "Tag 1"]]
+
+    form_for(post, namespace: 'foo') do |f|
+      concat f.collection_check_boxes(:tag_ids, collection, :first, :last)
+    end
+
+    expected = whole_form("/posts", "foo_new_post", "new_post") do
+      "<input checked='checked' id='foo_post_tag_ids_1' name='post[tag_ids][]' type='checkbox' value='1' />" +
+      "<label for='foo_post_tag_ids_1'>Tag 1</label>" +
+      "<input name='post[tag_ids][]' type='hidden' value='' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_with_index_and_with_collection_check_boxes
+    post = Post.new
+    def post.tag_ids; [1]; end
+    collection = [[1, "Tag 1"]]
+
+    form_for(post, index: '1') do |f|
+      concat f.collection_check_boxes(:tag_ids, collection, :first, :last)
+    end
+
+    expected = whole_form("/posts", "new_post", "new_post") do
+      "<input checked='checked' id='post_1_tag_ids_1' name='post[1][tag_ids][]' type='checkbox' value='1' />" +
+      "<label for='post_1_tag_ids_1'>Tag 1</label>" +
+      "<input name='post[1][tag_ids][]' type='hidden' value='' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_form_for_with_file_field_generate_multipart
     Post.send :attr_accessor, :file
 
@@ -1681,6 +1762,18 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_for_with_namespace_and_as_option
+    form_for(@post, namespace: 'namespace', as: 'custom_name') do |f|
+      concat f.text_field(:title)
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_custom_name', 'edit_custom_name', method: 'patch') do
+      "<input id='namespace_custom_name_title' name='custom_name[title]' type='text' value='Hello World' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_two_form_for_with_namespace
     form_for(@post, namespace: 'namespace_1') do |f|
       concat f.label(:title)
@@ -1727,69 +1820,61 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_submit_with_object_as_new_record_and_locale_strings
-    old_locale, I18n.locale = I18n.locale, :submit
+    with_locale :submit do
+      @post.persisted = false
+      @post.stubs(:to_key).returns(nil)
+      form_for(@post) do |f|
+        concat f.submit
+      end
 
-    @post.persisted = false
-    @post.stubs(:to_key).returns(nil)
-    form_for(@post) do |f|
-      concat f.submit
-    end
+      expected = whole_form('/posts', 'new_post', 'new_post') do
+        "<input name='commit' type='submit' value='Create Post' />"
+      end
 
-    expected = whole_form('/posts', 'new_post', 'new_post') do
-      "<input name='commit' type='submit' value='Create Post' />"
+      assert_dom_equal expected, output_buffer
     end
-
-    assert_dom_equal expected, output_buffer
-  ensure
-    I18n.locale = old_locale
   end
 
   def test_submit_with_object_as_existing_record_and_locale_strings
-    old_locale, I18n.locale = I18n.locale, :submit
+    with_locale :submit do
+      form_for(@post) do |f|
+        concat f.submit
+      end
 
-    form_for(@post) do |f|
-      concat f.submit
-    end
+      expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
+        "<input name='commit' type='submit' value='Confirm Post changes' />"
+      end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
-      "<input name='commit' type='submit' value='Confirm Post changes' />"
+      assert_dom_equal expected, output_buffer
     end
-
-    assert_dom_equal expected, output_buffer
-  ensure
-    I18n.locale = old_locale
   end
 
   def test_submit_without_object_and_locale_strings
-    old_locale, I18n.locale = I18n.locale, :submit
+    with_locale :submit do
+      form_for(:post) do |f|
+        concat f.submit class: "extra"
+      end
 
-    form_for(:post) do |f|
-      concat f.submit class: "extra"
-    end
+      expected = whole_form do
+        "<input name='commit' class='extra' type='submit' value='Save changes' />"
+      end
 
-    expected = whole_form do
-      "<input name='commit' class='extra' type='submit' value='Save changes' />"
+      assert_dom_equal expected, output_buffer
     end
-
-    assert_dom_equal expected, output_buffer
-  ensure
-    I18n.locale = old_locale
   end
 
   def test_submit_with_object_and_nested_lookup
-    old_locale, I18n.locale = I18n.locale, :submit
+    with_locale :submit do
+      form_for(@post, as: :another_post) do |f|
+        concat f.submit
+      end
 
-    form_for(@post, as: :another_post) do |f|
-      concat f.submit
-    end
+      expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', method: 'patch') do
+        "<input name='commit' type='submit' value='Update your Post' />"
+      end
 
-    expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', method: 'patch') do
-      "<input name='commit' type='submit' value='Update your Post' />"
+      assert_dom_equal expected, output_buffer
     end
-
-    assert_dom_equal expected, output_buffer
-  ensure
-    I18n.locale = old_locale
   end
 
   def test_nested_fields_for
@@ -2321,6 +2406,18 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_label_translation_with_more_than_10_records
+    @post.comments = Array.new(11) { |id| Comment.new(id + 1) }
+
+    I18n.expects(:t).with('post.comments.body', default: [:"comment.body", ''], scope: "helpers.label").times(11).returns "Write body here"
+
+    form_for(@post) do |f|
+      f.fields_for(:comments) do |cf|
+        concat cf.label(:body)
+      end
+    end
+  end
+
   def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection_different_from_record_one
     comments = Array.new(2) { |id| Comment.new(id + 1) }
     @post.comments = []
@@ -2939,12 +3036,13 @@ class FormHelperTest < ActionView::TestCase
   protected
 
   def hidden_fields(method = nil)
-    txt =  %{<div style="margin:0;padding:0;display:inline">}
-    txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
+    txt = %{<input name="utf8" type="hidden" value="&#x2713;" />}
+
     if method && !%w(get post).include?(method.to_s)
       txt << %{<input name="_method" type="hidden" value="#{method}" />}
     end
-    txt << %{</div>}
+
+    txt
   end
 
   def form_text(action = "/", id = nil, html_class = nil, remote = nil, multipart = nil, method = nil)
@@ -2968,4 +3066,11 @@ class FormHelperTest < ActionView::TestCase
   def protect_against_forgery?
     false
   end
+
+  def with_locale(testing_locale = :label)
+    old_locale, I18n.locale = I18n.locale, testing_locale
+    yield
+  ensure
+    I18n.locale = old_locale
+  end
 end