simple_form 3.1.0.rc1 → 3.1.0

data/test/form_builder/input_field_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 # Tests for f.input_field
 class InputFieldTest < ActionView::TestCase
-  test "builder input_field should only render the input tag, nothing else" do
+  test "builder input_field only renders the input tag, nothing else" do
     with_concat_form_for(@user) do |f|
       f.input_field :name
     end
@@ -12,7 +12,7 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select '.hint'
   end
 
-  test 'builder input_field should allow overriding default input type' do
+  test 'builder input_field allows overriding default input type' do
     with_concat_form_for(@user) do |f|
       f.input_field :name, as: :text
     end
@@ -21,7 +21,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'textarea#user_name.text'
   end
 
-  test 'builder input_field should generate input type based on column type' do
+  test 'builder input_field generates input type based on column type' do
     with_concat_form_for(@user) do |f|
       f.input_field :age
     end
@@ -29,7 +29,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input[type=number].integer#user_age'
   end
 
-  test 'builder input_field should be able to disable any component' do
+  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
@@ -38,7 +38,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input[type=text].integer#user_age'
   end
 
-  test 'builder input_field should allow passing options to input tag' do
+  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
@@ -46,7 +46,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input.string.name#name_input'
   end
 
-  test 'builder input_field should not modify the options hash' do
+  test 'builder input_field does not modify the options hash' do
     options = { id: 'name_input', class: 'name' }
 
     with_concat_form_for(@user) do |f|
@@ -58,7 +58,7 @@ class InputFieldTest < ActionView::TestCase
   end
 
 
-  test 'builder input_field should generate an input tag with a clean HTML' do
+  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
@@ -67,7 +67,7 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'input.integer[as]'
   end
 
-  test 'builder input_field should use i18n to translate placeholder text' do
+  test 'builder input_field uses i18n to translate placeholder text' do
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
@@ -76,19 +76,19 @@ class InputFieldTest < ActionView::TestCase
         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 should use min_max component' do
+  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
 
-    assert_select 'input[min=18]'
+    assert_select 'input[min="18"]'
   end
 
-  test 'builder input_field should not use pattern component by default' do
+  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
@@ -96,7 +96,7 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'input[pattern="\w+"]'
   end
 
-  test 'builder input_field should infer pattern from attributes' do
+  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
@@ -104,7 +104,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input[pattern="\w+"]'
   end
 
-  test 'builder input_field should accept custom patter' do
+  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
@@ -112,7 +112,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input[pattern="\d+"]'
   end
 
-  test 'builder input_field should use readonly component' do
+  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
@@ -120,15 +120,15 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input.integer.readonly[readonly]'
   end
 
-  test 'builder input_field should use maxlength component' do
+  test 'builder input_field uses maxlength component' do
     with_concat_form_for(@validating_user) do |f|
       f.input_field :name, as: :string
     end
 
-    assert_select 'input.string[maxlength=25]'
+    assert_select 'input.string[maxlength="25"]'
   end
 
-  test 'builder collection input_field should generate input tag with a clean HTML' do
+  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
@@ -139,11 +139,51 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'select.status[value_method]'
   end
 
-  test 'build input_field does not treat "boolean_style" as an HTML attribute' do
+  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
 
     assert_no_select 'input.boolean[boolean_style]'
   end
+
+  test 'build input_field without pattern component use the pattern string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, pattern: '\w+'
+      end
+
+      assert_select 'input[pattern="\w+"]'
+    end
+  end
+
+  test 'build input_field without placeholder component use the placeholder string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, placeholder: 'Placeholder'
+      end
+
+      assert_select 'input[placeholder="Placeholder"]'
+    end
+  end
+
+  test 'build input_field without maxlength component use the maxlength string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, maxlength: 5
+      end
+
+      assert_select 'input[maxlength="5"]'
+    end
+  end
+
+  test 'build input_field without readonly component use the readonly string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, readonly: true
+      end
+
+      assert_select 'input[readonly="readonly"]'
+    end
+  end
 end

data/test/form_builder/label_test.rb

@@ -8,63 +8,63 @@ class LabelTest < ActionView::TestCase
     end
   end
 
-  test 'builder should generate a label for the attribute' do
+  test 'builder generates a label for the attribute' do
     with_label_for @user, :name
     assert_select 'label.string[for=user_name]', /Name/
   end
 
-  test 'builder should generate a label for the boolean attrbiute' do
+  test 'builder generates a label for the boolean attrbiute' do
     with_label_for @user, :name, as: :boolean
     assert_select 'label.boolean[for=user_name]', /Name/
     assert_no_select 'label[as=boolean]'
   end
 
-  test 'builder should generate a label component tag with a clean HTML' do
+  test 'builder generates a label component tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'
   end
 
-  test 'builder should add a required class to label if the attribute is required' do
+  test 'builder adds a required class to label if the attribute is required' do
     with_label_for @validating_user, :name
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
-  test 'builder should escape label text' do
+  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 should not escape label text if it is safe' do
+  test 'builder does not escape label text if it is safe' do
     with_label_for @user, :name, label: '<script>alert(1337)</script>'.html_safe, required: false
     assert_select 'label.string script', "alert(1337)"
   end
 
-  test 'builder should allow passing options to label tag' do
+  test 'builder allows passing options to label tag' do
     with_label_for @user, :name, label: 'My label', id: 'name_label'
     assert_select 'label.string#name_label', /My label/
   end
 
-  test 'builder label should generate label tag with clean HTML' do
+  test 'builder label generates label tag with clean HTML' do
     with_label_for @user, :name, label: 'My label', required: true, id: 'name_label'
     assert_select 'label.string#name_label', /My label/
     assert_no_select 'label[label]'
     assert_no_select 'label[required]'
   end
 
-  test 'builder should not modify the options hash' do
+  test 'builder does not modify the options hash' do
     options = { label: 'My label', id: 'name_label' }
     with_label_for @user, :name, options
     assert_select 'label.string#name_label', /My label/
     assert_equal({ label: 'My label', id: 'name_label' }, options)
   end
 
-  test 'builder should fallback to default label when string is given' do
+  test 'builder fallbacks to default label when string is given' do
     with_label_for @user, :name, 'Nome do usuário'
     assert_select 'label', 'Nome do usuário'
     assert_no_select 'label.string'
   end
 
-  test 'builder should fallback to default label when block is given' do
+  test 'builder fallbacks to default label when block is given' do
     with_label_for @user, :name do
       'Nome do usuário'
     end
@@ -88,14 +88,23 @@ class LabelTest < ActionView::TestCase
     end
   end
 
-  test 'builder should allow custom formatting when label is explicitly specified' do
+  test 'configuration allow set rewrited label tag for wrappers' do
+    swap_wrapper :default, self.custom_wrapper_with_custom_label_component do
+      with_concat_form_for(@user) do |f|
+        concat f.input :age
+      end
+      assert_select "span.integer.user_age", /Age/
+    end
+  end
+
+  test 'builder allows custom formatting when label is explicitly specified' do
     swap SimpleForm, label_text: lambda { |l, r, explicit_label| explicit_label ? l : "#{l.titleize}:" } do
       with_label_for @user, :time_zone, 'What is your home time zone?'
       assert_select 'label[for=user_time_zone]', 'What is your home time zone?'
     end
   end
 
-  test 'builder should allow custom formatting when label is generated' do
+  test 'builder allows custom formatting when label is generated' do
     swap SimpleForm, label_text: lambda { |l, r, explicit_label| explicit_label ? l : "#{l.titleize}:" } do
       with_label_for @user, :time_zone
       assert_select 'label[for=user_time_zone]', 'Time Zone:'

data/test/form_builder/wrapper_test.rb

@@ -1,22 +1,22 @@
 require 'test_helper'
 
 class WrapperTest < ActionView::TestCase
-  test 'wrapper should not have error class for attribute without errors' do
+  test 'wrapper does not have error class for attribute without errors' do
     with_form_for @user, :active
     assert_no_select 'div.field_with_errors'
   end
 
-  test 'wrapper should not have error class when object is not present' do
+  test 'wrapper does not have error class when object is not present' do
     with_form_for :project, :name
     assert_no_select 'div.field_with_errors'
   end
 
-  test 'wrapper should add the attribute name class' do
+  test 'wrapper adds the attribute name class' do
     with_form_for @user, :name
     assert_select 'div.user_name'
   end
 
-  test 'wrapper should add the attribute name class for nested forms' do
+  test 'wrapper adds the attribute name class for nested forms' do
     @user.company = Company.new(1, 'Empresa')
     with_concat_form_for @user do |f|
       concat(f.simple_fields_for(:company) do |company_form|
@@ -27,44 +27,44 @@ class WrapperTest < ActionView::TestCase
     assert_select 'div.user_company_name'
   end
 
-  test 'wrapper should add the association name class' do
+  test 'wrapper adds the association name class' do
     with_form_for @user, :company
     assert_select 'div.user_company'
   end
 
-  test 'wrapper should add error class for attribute with errors' do
+  test 'wrapper adds error class for attribute with errors' do
     with_form_for @user, :name
     assert_select 'div.field_with_errors'
   end
 
-  test 'wrapper should add hint class for attribute with a hint' do
+  test 'wrapper adds hint class for attribute with a hint' do
     with_form_for @user, :name, hint: 'hint'
     assert_select 'div.field_with_hint'
   end
 
-  test 'wrapper should not have disabled class by default' do
+  test 'wrapper does not have disabled class by default' do
     with_form_for @user, :active
     assert_no_select 'div.disabled'
   end
 
-  test 'wrapper should have disabled class when input is disabled' do
+  test 'wrapper has disabled class when input is disabled' do
     with_form_for @user, :active, disabled: true
     assert_select 'div.disabled'
   end
 
-  test 'wrapper should support no wrapping when wrapper is false' do
+  test 'wrapper supports no wrapping when wrapper is false' do
     with_form_for @user, :name, wrapper: false
     assert_select 'form > label[for=user_name]'
     assert_select 'form > input#user_name.string'
   end
 
-  test 'wrapper should support no wrapping when wrapper tag is false' do
+  test 'wrapper supports no wrapping when wrapper tag is false' do
     with_form_for @user, :name, wrapper: custom_wrapper_without_top_level
     assert_select 'form > label[for=user_name]'
     assert_select 'form > input#user_name.string'
   end
 
-  test 'wrapper should wrapping tag adds required/optional css classes' do
+  test 'wrapper wraps tag adds required/optional css classes' do
     with_form_for @user, :name
     assert_select 'form div.input.required.string'
 
@@ -72,22 +72,22 @@ class WrapperTest < ActionView::TestCase
     assert_select 'form div.input.optional.integer'
   end
 
-  test 'wrapper should allow custom options to be given' do
+  test 'wrapper allows custom options to be given' do
     with_form_for @user, :name, wrapper_html: { id: "super_cool", class: 'yay' }
     assert_select 'form #super_cool.required.string.yay'
   end
 
-  test 'wrapper should allow tag to be given on demand' do
+  test 'wrapper allows tag to be given on demand' do
     with_form_for @user, :name, wrapper_tag: :b
     assert_select 'form b.required.string'
   end
 
-  test 'wrapper should allow wrapper class to be given on demand' do
+  test 'wrapper allows wrapper class to be given on demand' do
     with_form_for @user, :name, wrapper_class: :wrapper
     assert_select 'form div.wrapper.required.string'
   end
 
-  test 'wrapper should skip additional classes when configured' do
+  test 'wrapper skips additional classes when configured' do
     swap SimpleForm, generate_additional_classes_for: [:input, :label] do
       with_form_for @user, :name, wrapper_class: :wrapper
       assert_select 'form div.wrapper'
@@ -97,7 +97,7 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
-  test 'wrapper should not generate empty css class' do
+  test 'wrapper does not generate empty css class' do
     swap SimpleForm, generate_additional_classes_for: [:input, :label] do
       swap_wrapper :default, custom_wrapper_without_class do
         with_form_for @user, :name
@@ -139,7 +139,7 @@ class WrapperTest < ActionView::TestCase
   test 'custom wrappers can have full error message on attributes' do
     swap_wrapper :default, self.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
 
@@ -187,7 +187,7 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
-  test 'do not duplicate label classes for different inputs' do
+  test 'does not duplicate label classes for different inputs' do
     swap_wrapper :default, self.custom_wrapper_with_label_html_option do
       with_concat_form_for(@user) do |f|
         concat f.input :name, required: false
@@ -206,7 +206,7 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
-  test 'use wrapper for specified in config mapping' do
+  test 'uses wrapper for specified in config mapping' do
     swap_wrapper :another do
       swap SimpleForm, wrapper_mappings: { string: :another } do
         with_form_for @user, :name
@@ -216,7 +216,7 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
-  test 'use custom wrapper mapping per form basis' do
+  test 'uses custom wrapper mapping per form basis' do
     swap_wrapper :another do
       with_concat_form_for @user, wrapper_mappings: { string: :another } do |f|
         concat f.input :name
@@ -227,6 +227,21 @@ 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
       with_concat_form_for @user do |f|
@@ -267,4 +282,38 @@ class WrapperTest < ActionView::TestCase
 
     assert_select "div.custom_wrapper input.string[data-modal=true]"
   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: "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
+      with_form_for @user, :name
+      assert_select 'section.custom_wrapper div.no_output_wrapper'
+      assert_no_select 'p.omg_hint'
+    end
+  end
+
+  test 'optional wrapper does not display when there is content' do
+    swap_wrapper :default, self.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'
+      assert_select 'p.omg_hint'
+    end
+  end
+
+  test 'optional wrapper does not display when there is no content' do
+    swap_wrapper :default, self.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'
+      assert_no_select 'p.omg_hint'
+    end
+  end
 end

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

@@ -2,7 +2,7 @@
 require 'test_helper'
 
 class BooleanInputTest < ActionView::TestCase
-  test 'input should generate a checkbox by default for boolean attributes' do
+  test 'input generates a checkbox by default for boolean attributes' do
     with_input_for @user, :active, :boolean
     assert_select 'input[type=checkbox].boolean#user_active'
     assert_select 'label.boolean.optional', 'Active'
@@ -49,42 +49,42 @@ class BooleanInputTest < ActionView::TestCase
 
   test 'input boolean with nested allows :inline_label' do
     swap SimpleForm, boolean_style: :nested do
-      with_input_for @user, :active, :boolean, label: false, inline_label: 'I am so inline.'
+      with_input_for @user, :active, :boolean, inline_label: 'I am so inline.'
       assert_select 'label.checkbox', text: ' I am so inline.'
     end
   end
 
   test 'input boolean with nested escapes :inline_label with HTML' do
     swap SimpleForm, boolean_style: :nested do
-      with_input_for @user, :active, :boolean, label: false, inline_label: '<b>I am so inline.</b>'
-      assert_select 'label.checkbox', text: ' &lt;b&gt;I am so inline.&lt;/b&gt;'
+      with_input_for @user, :active, :boolean, inline_label: '<b>I am so inline.</b>'
+      assert_no_select 'label.checkbox b'
     end
   end
 
   test 'input boolean with nested allows :inline_label with HTML when safe' do
     swap SimpleForm, boolean_style: :nested do
-      with_input_for @user, :active, :boolean, label: false, inline_label: '<b>I am so inline.</b>'.html_safe
+      with_input_for @user, :active, :boolean, inline_label: '<b>I am so inline.</b>'.html_safe
       assert_select 'label.checkbox b', text: 'I am so inline.'
     end
   end
 
   test 'input boolean with nested style creates an inline label using the default label text when inline_label option set to true' do
     swap SimpleForm, boolean_style: :nested do
-      with_input_for @user, :active, :boolean, label: false, inline_label: true
+      with_input_for @user, :active, :boolean, inline_label: true
       assert_select 'label.checkbox', text: ' Active'
     end
   end
 
   test 'input boolean with nested style creates an inline label using the label text when inline_label option set to true' do
     swap SimpleForm, boolean_style: :nested do
-      with_input_for @user, :active, :boolean, label: false, inline_label: true, label_text: proc { 'New Active' }
+      with_input_for @user, :active, :boolean, inline_label: true, label_text: proc { 'New Active' }
       assert_select 'label.checkbox', text: ' New Active'
     end
   end
 
   test 'input boolean with nested style creates an inline label using the label html when inline_label option set to true' do
     swap SimpleForm, boolean_style: :nested do
-      with_input_for @user, :active, :boolean, label: false, inline_label: true, label_text: proc { '<b>New Active</b>' }
+      with_input_for @user, :active, :boolean, inline_label: true, label_text: proc { '<b>New Active</b>' }
       assert_select 'label.checkbox', text: ' New Active'
     end
   end
@@ -186,7 +186,7 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
-  test 'input boolean without additional classes should add "checkbox" class to label' do
+  test 'input boolean without additional classes adds "checkbox" class to label' do
     swap_wrapper :default, self.custom_wrapper_without_top_level do
       swap SimpleForm, boolean_style: :nested, generate_additional_classes_for: [:input] do
         with_input_for @user, :active, :boolean
@@ -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