simple_form 3.1.0.rc2 → 3.1.1

data/test/form_builder/general_test.rb

@@ -46,6 +46,17 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder does not override custom input mappings for custom collection' do
+    swap SimpleForm, input_mappings: { /gender$/ => :check_boxes } do
+      with_concat_form_for @user do |f|
+        f.input :gender, collection: [:male, :female]
+      end
+
+      assert_no_select 'select option', 'Male'
+      assert_select 'input[type=checkbox][value=male]'
+    end
+  end
+
   test 'builder allows to skip input_type class' do
     swap SimpleForm, generate_additional_classes_for: [:label, :wrapper] do
       with_form_for @user, :post_count
@@ -217,10 +228,30 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # COMMON OPTIONS
+  # Remove this test when SimpleForm.form_class is removed in 4.x
   test 'builder adds chosen form class' do
-    swap SimpleForm, form_class: :my_custom_class do
+    ActiveSupport::Deprecation.silence do
+      swap SimpleForm, form_class: :my_custom_class do
+        with_form_for @user, :name
+        assert_select 'form.my_custom_class'
+      end
+    end
+  end
+
+  # Remove this test when SimpleForm.form_class is removed in 4.x
+  test 'builder adds chosen form class and default form class' do
+    ActiveSupport::Deprecation.silence do
+      swap SimpleForm, form_class: "my_custom_class", default_form_class: "my_default_class" do
+        with_form_for @user, :name
+        assert_select 'form.my_custom_class.my_default_class'
+      end
+    end
+  end
+
+  test 'builder adds default form class' do
+    swap SimpleForm, default_form_class: "default_class" do
       with_form_for @user, :name
-      assert_select 'form.my_custom_class'
+      assert_select 'form.default_class'
     end
   end
 
@@ -236,7 +267,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder does not propagate input options to wrapper with custom wrapper' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_input do
+    swap_wrapper :default, custom_wrapper_with_wrapped_input do
       with_form_for @user, :name, input_html: { class: 'my_input' }
       assert_no_select 'form div.input.my_input'
       assert_select 'form input.my_input.string'
@@ -244,7 +275,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder does not propagate label options to wrapper with custom wrapper' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_label do
+    swap_wrapper :default, custom_wrapper_with_wrapped_label do
       with_form_for @user, :name, label_html: { class: 'my_label' }
       assert_no_select 'form div.label.my_label'
       assert_select 'form label.my_label.string'
@@ -307,7 +338,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder generates errors for attribute with errors' do
     with_form_for @user, :name
-    assert_select 'span.error', "can't be blank"
+    assert_select 'span.error', "cannot be blank"
   end
 
   test 'builder is able to disable showing errors for an input' do
@@ -317,7 +348,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder passes options to errors' do
     with_form_for @user, :name, error_html: { id: "cool" }
-    assert_select 'span.error#cool', "can't be blank"
+    assert_select 'span.error#cool', "cannot be blank"
   end
 
   test 'placeholder does not be generated when set to false' do
@@ -333,15 +364,15 @@ class FormBuilderTest < ActionView::TestCase
   [:input, :input_field].each do |method|
     test "builder receives a default argument and pass it to the inputs when calling '#{method}'" do
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
-        f.send(method, :name)
+        f.public_send(method, :name)
       end
       assert_select 'input.default_class'
     end
 
     test "builder receives a default argument and pass it to the inputs without changing the defaults when calling '#{method}'" do
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
-        concat(f.send(method, :name))
-        concat(f.send(method, :credit_limit))
+        concat(f.public_send(method, :name))
+        concat(f.public_send(method, :credit_limit))
       end
 
       assert_select "input.string.default_class[name='user[name]']"
@@ -352,9 +383,9 @@ class FormBuilderTest < ActionView::TestCase
       @user.company = Company.new(1, 'Empresa')
 
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
-        concat(f.send(method, :name))
+        concat(f.public_send(method, :name))
         concat(f.simple_fields_for(:company) do |company_form|
-          concat(company_form.send(method, :name))
+          concat(company_form.public_send(method, :name))
         end)
       end
 

data/test/form_builder/hint_test.rb

@@ -50,7 +50,7 @@ class HintTest < ActionView::TestCase
 
   test 'builder escapes hint text' do
     with_hint_for @user, :name, hint: '<script>alert(1337)</script>'
-    assert_select 'span.hint', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+    assert_no_select 'span.hint script'
   end
 
   # Without attribute name
@@ -137,8 +137,8 @@ class HintTest < ActionView::TestCase
 
   test 'hint with custom wrappers works' do
     swap_wrapper do
-      with_hint_for @user, :name, hint: "can't be blank"
-      assert_select 'div.omg_hint', "can&#39;t be blank"
+      with_hint_for @user, :name, hint: "cannot be blank"
+      assert_select 'div.omg_hint', "cannot be blank"
     end
   end
 end

data/test/form_builder/input_field_test.rb

@@ -2,10 +2,15 @@ require 'test_helper'
 
 # Tests for f.input_field
 class InputFieldTest < ActionView::TestCase
-  test "builder input_field only renders the input tag, nothing else" do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name
+  def with_input_field_for(object, *args)
+    with_concat_form_for(object) do |f|
+      f.input_field(*args)
     end
+  end
+
+  test "builder input_field only renders the input tag, nothing else" do
+    with_input_field_for @user, :name
+
     assert_select 'form > input.required.string'
     assert_no_select 'div.string'
     assert_no_select 'label'
@@ -13,45 +18,34 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'builder input_field allows overriding default input type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, as: :text
-    end
+    with_input_field_for @user, :name, as: :text
 
     assert_no_select 'input#user_name'
     assert_select 'textarea#user_name.text'
   end
 
   test 'builder input_field generates input type based on column type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :age
-    end
+    with_input_field_for @user, :age
 
     assert_select 'input[type=number].integer#user_age'
   end
 
   test 'builder input_field is able to disable any component' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :age, html5: false
-    end
+    with_input_field_for @user, :age, html5: false
 
     assert_no_select 'input[html5=false]#user_age'
     assert_select 'input[type=text].integer#user_age'
   end
 
   test 'builder input_field allows passing options to input tag' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, id: 'name_input', class: 'name'
-    end
+    with_input_field_for @user, :name, id: 'name_input', class: 'name'
 
     assert_select 'input.string.name#name_input'
   end
 
   test 'builder input_field does not modify the options hash' do
     options = { id: 'name_input', class: 'name' }
-
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, options
-    end
+    with_input_field_for @user, :name, options
 
     assert_select 'input.string.name#name_input'
     assert_equal({ id: 'name_input', class: 'name' }, options)
@@ -59,9 +53,7 @@ class InputFieldTest < ActionView::TestCase
 
 
   test 'builder input_field generates an input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, as: :integer, class: 'name'
-    end
+    with_input_field_for @user, :name, as: :integer, class: 'name'
 
     assert_no_select 'input.integer[input_html]'
     assert_no_select 'input.integer[as]'
@@ -71,67 +63,51 @@ class InputFieldTest < ActionView::TestCase
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
+      with_input_field_for @user, :name
 
-      with_concat_form_for(@user) do |f|
-        f.input_field :name
-      end
-
-      assert_select 'input.string[placeholder=Name goes here]'
+      assert_select 'input.string[placeholder="Name goes here"]'
     end
   end
 
   test 'builder input_field uses min_max component' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :age, as: :integer
-    end
+    with_input_field_for @other_validating_user, :age, as: :integer
 
-    assert_select 'input[min=18]'
+    assert_select 'input[min="18"]'
   end
 
   test 'builder input_field does not use pattern component by default' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string
-    end
+    with_input_field_for @other_validating_user, :country, as: :string
 
     assert_no_select 'input[pattern="\w+"]'
   end
 
   test 'builder input_field infers pattern from attributes' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string, pattern: true
-    end
+    with_input_field_for @other_validating_user, :country, as: :string, pattern: true
 
     assert_select 'input[pattern="\w+"]'
   end
 
   test 'builder input_field accepts custom patter' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string, pattern: '\d+'
-    end
+    with_input_field_for @other_validating_user, :country, as: :string, pattern: '\d+'
 
     assert_select 'input[pattern="\d+"]'
   end
 
   test 'builder input_field uses readonly component' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :age, as: :integer, readonly: true
-    end
+    with_input_field_for @other_validating_user, :age, as: :integer, readonly: true
 
     assert_select 'input.integer.readonly[readonly]'
   end
 
   test 'builder input_field uses maxlength component' do
-    with_concat_form_for(@validating_user) do |f|
-      f.input_field :name, as: :string
-    end
+    with_input_field_for @validating_user, :name, as: :string
 
-    assert_select 'input.string[maxlength=25]'
+    assert_select 'input.string[maxlength="25"]'
   end
 
   test 'builder collection input_field generates input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :status, collection: ['Open', 'Closed'], class: 'status', label_method: :to_s, value_method: :to_s
-    end
+    with_input_field_for @user, :status, collection: ['Open', 'Closed'],
+      class: 'status', label_method: :to_s, value_method: :to_s
 
     assert_no_select 'select.status[input_html]'
     assert_no_select 'select.status[collection]'
@@ -140,10 +116,40 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'build input_field does not treat "boolean_style" as a HTML attribute' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :active, boolean_style: :nested
-    end
+    with_input_field_for @user, :active, boolean_style: :nested
 
     assert_no_select 'input.boolean[boolean_style]'
   end
+
+  test 'build input_field without pattern component use the pattern string' do
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, pattern: '\w+'
+
+      assert_select 'input[pattern="\w+"]'
+    end
+  end
+
+  test 'build input_field without placeholder component use the placeholder string' do
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, placeholder: 'Placeholder'
+
+      assert_select 'input[placeholder="Placeholder"]'
+    end
+  end
+
+  test 'build input_field without maxlength component use the maxlength string' do
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, maxlength: 5
+
+      assert_select 'input[maxlength="5"]'
+    end
+  end
+
+  test 'build input_field without readonly component use the readonly string' do
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, readonly: true
+
+      assert_select 'input[readonly="readonly"]'
+    end
+  end
 end

data/test/form_builder/label_test.rb

@@ -29,9 +29,19 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
+  test 'builder adds a disabled class to label if the attribute is disabled' do
+    with_label_for @validating_user, :name, disabled: true
+    assert_select 'label.string.disabled[for=validating_user_name]', /Name/
+  end
+
+  test 'builder does not add a disabled class to label if the attribute is not disabled' do
+    with_label_for @validating_user, :name, disabled: false
+    assert_no_select 'label.string.disabled[for=validating_user_name]', /Name/
+  end
+
   test 'builder escapes label text' do
     with_label_for @user, :name, label: '<script>alert(1337)</script>', required: false
-    assert_select 'label.string', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+    assert_no_select 'label.string script'
   end
 
   test 'builder does not escape label text if it is safe' do
@@ -80,7 +90,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'configuration allow set label text for wrappers' do
-    swap_wrapper :default, self.custom_wrapper_with_label_text do
+    swap_wrapper :default, custom_wrapper_with_label_text do
       with_concat_form_for(@user) do |f|
         concat f.input :age
       end
@@ -89,7 +99,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'configuration allow set rewrited label tag for wrappers' do
-    swap_wrapper :default, self.custom_wrapper_with_custom_label_component do
+    swap_wrapper :default, custom_wrapper_with_custom_label_component do
       with_concat_form_for(@user) do |f|
         concat f.input :age
       end

data/test/form_builder/wrapper_test.rb

@@ -129,7 +129,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'custom wrappers can have additional attributes' do
-    swap_wrapper :default, self.custom_wrapper_with_additional_attributes do
+    swap_wrapper :default, custom_wrapper_with_additional_attributes do
       with_form_for @user, :name
 
       assert_select "div.custom_wrapper[title='some title'][data-wrapper='test']"
@@ -137,9 +137,9 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'custom wrappers can have full error message on attributes' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :name
-      assert_select 'span.error', "Name can't be blank"
+      assert_select 'span.error', "Name cannot be blank"
     end
   end
 
@@ -188,7 +188,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'does not duplicate label classes for different inputs' do
-    swap_wrapper :default, self.custom_wrapper_with_label_html_option do
+    swap_wrapper :default, custom_wrapper_with_label_html_option do
       with_concat_form_for(@user) do |f|
         concat f.input :name, required: false
         concat f.input :email, as: :email, required: true
@@ -227,8 +227,23 @@ class WrapperTest < ActionView::TestCase
     assert_select "section.custom_wrapper div.another_wrapper input.string"
   end
 
+  test 'simple_fields_form reuses custom wrapper mapping per form basis' do
+    @user.company = Company.new(1, 'Empresa')
+
+    swap_wrapper :another do
+      with_concat_form_for @user, wrapper_mappings: { string: :another } do |f|
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input(:name))
+        end)
+      end
+    end
+
+    assert_select "section.custom_wrapper div.another_wrapper label"
+    assert_select "section.custom_wrapper div.another_wrapper input.string"
+  end
+
   test 'input accepts attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_input_class do
+    swap_wrapper :default, custom_wrapper_with_input_class do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -238,7 +253,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'label accepts attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_label_class do
+    swap_wrapper :default, custom_wrapper_with_label_class do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -248,7 +263,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'label_input accepts attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_label_input_class do
+    swap_wrapper :default, custom_wrapper_with_label_input_class do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -259,7 +274,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'input accepts data attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_input_attributes do
+    swap_wrapper :default, custom_wrapper_with_input_attributes do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -269,15 +284,15 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'inline wrapper displays when there is content' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_optional_component do
-      with_form_for @user, :name, hint: "can't be blank"
-      assert_select 'section.custom_wrapper div.no_output_wrapper p.omg_hint', "can&#39;t be blank"
+    swap_wrapper :default, custom_wrapper_with_wrapped_optional_component do
+      with_form_for @user, :name, hint: "cannot be blank"
+      assert_select 'section.custom_wrapper div.no_output_wrapper p.omg_hint', "cannot be blank"
       assert_select 'p.omg_hint'
     end
   end
 
   test 'inline wrapper does not display when there is no content' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_optional_component do
+    swap_wrapper :default, custom_wrapper_with_wrapped_optional_component do
       with_form_for @user, :name
       assert_select 'section.custom_wrapper div.no_output_wrapper'
       assert_no_select 'p.omg_hint'
@@ -285,7 +300,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'optional wrapper does not display when there is content' do
-    swap_wrapper :default, self.custom_wrapper_with_unless_blank do
+    swap_wrapper :default, custom_wrapper_with_unless_blank do
       with_form_for @user, :name, hint: "can't be blank"
       assert_select 'section.custom_wrapper div.no_output_wrapper'
       assert_select 'div.no_output_wrapper'
@@ -294,7 +309,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'optional wrapper does not display when there is no content' do
-    swap_wrapper :default, self.custom_wrapper_with_unless_blank do
+    swap_wrapper :default, custom_wrapper_with_unless_blank do
       with_form_for @user, :name
       assert_no_select 'section.custom_wrapper div.no_output_wrapper'
       assert_no_select 'div.no_output_wrapper'

data/test/generators/simple_form_generator_test.rb

@@ -29,8 +29,8 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
     run_generator %w(--foundation)
     assert_file 'config/initializers/simple_form.rb',
       /config\.default_wrapper = :default/, /config\.boolean_style = :nested/
-    assert_file 'config/initializers/simple_form_foundation.rb', /config\.wrappers :foundation/,
-      /config\.default_wrapper = :foundation/
+    assert_file 'config/initializers/simple_form_foundation.rb', /config\.wrappers :vertical_form/,
+      /config\.default_wrapper = :vertical_form/, /config\.item_wrapper_tag = :div/
   end
 
   %W(erb haml slim).each do |engine|

data/test/inputs/boolean_input_test.rb

@@ -57,7 +57,7 @@ class BooleanInputTest < ActionView::TestCase
   test 'input boolean with nested escapes :inline_label with HTML' do
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean, inline_label: '<b>I am so inline.</b>'
-      assert_select 'label.checkbox', text: ' &lt;b&gt;I am so inline.&lt;/b&gt;'
+      assert_no_select 'label.checkbox b'
     end
   end
 
@@ -197,4 +197,12 @@ class BooleanInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'input boolean works with wrapper config defining a class for the input' do
+    swap_wrapper :default, self.custom_wrapper_with_input_class do
+      with_input_for @user, :active, :boolean
+
+      assert_select 'input.boolean.inline-class'
+    end
+  end
 end

data/test/inputs/collection_check_boxes_input_test.rb

@@ -278,4 +278,26 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
       assert_select 'span.custom'
     end
   end
+
+  test 'input check boxes with nested style and namespace uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, namespace: :foo do |f|
+        concat f.input :gender, as: :check_boxes, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=foo_user_gender_male]'
+      assert_select 'label[for=foo_user_gender_female]'
+    end
+  end
+
+  test 'input check boxes with nested style and index uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, index: 1 do |f|
+        concat f.input :gender, as: :check_boxes, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=user_1_gender_male]'
+      assert_select 'label[for=user_1_gender_female]'
+    end
+  end
 end

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -100,8 +100,8 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
         with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
         assert_select 'input[type=radio][value=male]'
         assert_select 'input[type=radio][value=female]'
-        assert_select 'label[for=user_gender_male]', 'Male'
-        assert_select 'label[for=user_gender_female]', 'Female'
+        assert_select 'label[for=user_gender_male] strong', 'Male'
+        assert_select 'label[for=user_gender_female] strong', 'Female'
       end
     end
   end
@@ -393,7 +393,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'input check boxes custom wrapper class is included when include input wrapper class is falsey' do
+  test 'input radio custom wrapper class is included when include input wrapper class is falsey' do
     swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
       with_input_for @user, :gender, :radio_buttons, collection: [:male, :female], item_wrapper_class: 'custom'
 
@@ -401,4 +401,26 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
       assert_select 'span.custom'
     end
   end
+
+  test 'input radio with nested style and namespace uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, namespace: :foo do |f|
+        concat f.input :gender, as: :radio_buttons, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=foo_user_gender_male]'
+      assert_select 'label[for=foo_user_gender_female]'
+    end
+  end
+
+  test 'input radio with nested style and index uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, index: 1 do |f|
+        concat f.input :gender, as: :radio_buttons, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=user_1_gender_male]'
+      assert_select 'label[for=user_1_gender_female]'
+    end
+  end
 end