simple_form 2.1.0 → 3.2.0

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,69 +27,69 @@ 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
-    with_form_for @user, :name, :hint => 'hint'
+  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
-    with_form_for @user, :active, :disabled => true
+  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
-    with_form_for @user, :name, :wrapper => false
+  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
-    with_form_for @user, :name, :wrapper => custom_wrapper_without_top_level
+  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'
 
-    with_form_for @user, :age, :required => false
+    with_form_for @user, :age, required: false
     assert_select 'form div.input.optional.integer'
   end
 
-  test 'wrapper should allow custom options to be given' do
-    with_form_for @user, :name, :wrapper_html => { :id => "super_cool", :class => 'yay' }
+  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
-    with_form_for @user, :name, :wrapper_tag => :b
+  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
-    with_form_for @user, :name, :wrapper_class => :wrapper
+  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
-    swap SimpleForm, :generate_additional_classes_for => [:input, :label] do
-      with_form_for @user, :name, :wrapper_class => :wrapper
+  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'
       assert_no_select 'div.required'
       assert_no_select 'div.string'
@@ -97,8 +97,8 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
-  test 'wrapper should not generate empty css class' do
-    swap SimpleForm, :generate_additional_classes_for => [:input, :label] 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
         assert_no_select 'div#custom_wrapper_without_class[class]'
@@ -110,7 +110,7 @@ class WrapperTest < ActionView::TestCase
 
   test 'custom wrappers works' do
     swap_wrapper do
-      with_form_for @user, :name, :hint => "cool"
+      with_form_for @user, :name, hint: "cool"
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
       assert_no_select "section.custom_wrapper div.another_wrapper span.omg_error"
@@ -121,13 +121,28 @@ class WrapperTest < ActionView::TestCase
 
   test 'custom wrappers can be turned off' do
     swap_wrapper do
-      with_form_for @user, :name, :another => false
+      with_form_for @user, :name, another: false
       assert_no_select "section.custom_wrapper div.another_wrapper label"
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
       assert_select "section.custom_wrapper div.error_wrapper span.omg_error"
     end
   end
 
+  test 'custom wrappers can have 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']"
+    end
+  end
+
+  test 'custom wrappers can have full error message on attributes' do
+    swap_wrapper :default, custom_wrapper_with_full_error do
+      with_form_for @user, :name
+      assert_select 'span.error', "Name cannot be blank"
+    end
+  end
+
   test 'custom wrappers on a form basis' do
     swap_wrapper :another do
       with_concat_form_for(@user) do |f|
@@ -137,7 +152,7 @@ class WrapperTest < ActionView::TestCase
       assert_no_select "section.custom_wrapper div.another_wrapper label"
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
 
-      with_concat_form_for(@user, :wrapper => :another) do |f|
+      with_concat_form_for(@user, wrapper: :another) do |f|
         f.input :name
       end
 
@@ -153,30 +168,30 @@ class WrapperTest < ActionView::TestCase
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
       output_buffer.replace ""
 
-      with_form_for @user, :name, :wrapper => :another
+      with_form_for @user, :name, wrapper: :another
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
       output_buffer.replace ""
     end
 
-    with_form_for @user, :name, :wrapper => custom_wrapper
+    with_form_for @user, :name, wrapper: custom_wrapper
     assert_select "section.custom_wrapper div.another_wrapper label"
     assert_select "section.custom_wrapper div.another_wrapper input.string"
   end
 
   test 'access wrappers with indifferent access' do
     swap_wrapper :another do
-      with_form_for @user, :name, :wrapper => "another"
+      with_form_for @user, :name, wrapper: "another"
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
     end
   end
 
-  test 'do not duplicate label classes for different inputs' do
-    swap_wrapper :default, self.custom_wrapper_with_label_html_option do
+  test 'does not duplicate label classes for different inputs' 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
+        concat f.input :name, required: false
+        concat f.input :email, as: :email, required: true
       end
 
       assert_select "label.string.optional.extra-label-class[for='user_name']"
@@ -187,17 +202,118 @@ class WrapperTest < ActionView::TestCase
 
   test 'raise error when wrapper not found' do
     assert_raise SimpleForm::WrapperNotFound do
-      with_form_for @user, :name, :wrapper => :not_found
+      with_form_for @user, :name, wrapper: :not_found
     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
+      swap SimpleForm, wrapper_mappings: { string: :another } do
         with_form_for @user, :name
         assert_select "section.custom_wrapper div.another_wrapper label"
         assert_select "section.custom_wrapper div.another_wrapper input.string"
       end
     end
   end
+
+  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
+      end
+    end
+
+    assert_select "section.custom_wrapper div.another_wrapper label"
+    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, custom_wrapper_with_input_class do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+      end
+    end
+
+    assert_select "div.custom_wrapper input.string.inline-class"
+  end
+
+  test 'label accepts attributes in the DSL' do
+    swap_wrapper :default, custom_wrapper_with_label_class do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+      end
+    end
+
+    assert_select "div.custom_wrapper label.string.inline-class"
+  end
+
+  test 'label_input accepts attributes in the DSL' do
+    swap_wrapper :default, custom_wrapper_with_label_input_class do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+      end
+    end
+
+    assert_select "div.custom_wrapper label.string.inline-class"
+    assert_select "div.custom_wrapper input.string.inline-class"
+  end
+
+  test 'input accepts data attributes in the DSL' do
+    swap_wrapper :default, custom_wrapper_with_input_attributes do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+      end
+    end
+
+    assert_select "div.custom_wrapper input.string[data-modal=true]"
+  end
+
+  test 'inline wrapper displays when there is content' do
+    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, 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, 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, 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

@@ -21,16 +21,16 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
     run_generator %w(--bootstrap)
     assert_file 'config/initializers/simple_form.rb',
       /config\.default_wrapper = :default/, /config\.boolean_style = :nested/
-    assert_file 'config/initializers/simple_form_bootstrap.rb', /config\.wrappers :bootstrap/,
-      /config\.default_wrapper = :bootstrap/
+    assert_file 'config/initializers/simple_form_bootstrap.rb', /config\.wrappers :vertical_form/,
+      /config\.wrappers :horizontal_form/, /config\.default_wrapper = :vertical_form/
   end
 
   test 'generates the simple_form initializer with the foundation wrappers' do
     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,33 +2,33 @@
 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'
   end
 
   test 'input does not generate the label with the checkbox when label option is false' do
-    with_input_for @user, :active, :boolean, :label => false
+    with_input_for @user, :active, :boolean, label: false
     assert_select 'input[type=checkbox].boolean#user_active'
     assert_no_select 'label'
   end
 
   test 'input uses custom checked value' do
     @user.action = 'on'
-    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    with_input_for @user, :action, :boolean, checked_value: 'on', unchecked_value: 'off'
     assert_select 'input[type=checkbox][value=on][checked=checked]'
   end
 
   test 'input uses custom unchecked value' do
     @user.action = 'off'
-    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    with_input_for @user, :action, :boolean, checked_value: 'on', unchecked_value: 'off'
     assert_select 'input[type=checkbox][value=on]'
     assert_no_select 'input[checked=checked][value=on]'
   end
 
   test 'input generates hidden input with custom unchecked value' do
-    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    with_input_for @user, :action, :boolean, checked_value: 'on', unchecked_value: 'off'
     assert_select 'input[type=hidden][value=off]'
   end
 
@@ -39,7 +39,7 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input allows changing default boolean style config to nested, generating a default label and a manual hidden field for checkbox' do
-    swap SimpleForm, :boolean_style => :nested do
+    swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean
       assert_select 'label[for=user_active]', 'Active'
       assert_select 'label.boolean > input.boolean'
@@ -48,21 +48,49 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   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.'
-      assert_select 'label.checkbox', :text => 'I am so inline.'
+    swap SimpleForm, boolean_style: :nested do
+      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, 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, 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
-      assert_select 'label.checkbox', :text => 'Active'
+    swap SimpleForm, boolean_style: :nested do
+      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, 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, inline_label: true, label_text: proc { '<b>New Active</b>' }
+      assert_select 'label.checkbox', text: ' New Active'
     end
   end
 
   test 'input boolean with nested generates a manual hidden field for checkbox outside the label, to recreate Rails functionality with valid html5' do
-    swap SimpleForm, :boolean_style => :nested do
+    swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean
 
       assert_select "input[type=hidden][name='user[active]'] + label.boolean > input.boolean"
@@ -71,23 +99,23 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input boolean with nested generates a disabled hidden field for checkbox outside the label, if the field is disabled' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :disabled => true
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, disabled: true
 
       assert_select "input[type=hidden][name='user[active]'][disabled] + label.boolean > input.boolean[disabled]"
     end
   end
 
   test 'input accepts changing boolean style to nested through given options' do
-    with_input_for @user, :active, :boolean, :boolean_style => :nested
+    with_input_for @user, :active, :boolean, boolean_style: :nested
     assert_select 'label[for=user_active]', 'Active'
     assert_select 'label.boolean > input.boolean'
     assert_no_select 'input[type=checkbox] + label'
   end
 
   test 'input accepts changing boolean style to inline through given options, when default is nested' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :boolean_style => :inline
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, boolean_style: :inline
       assert_select 'label[for=user_active]', 'Active'
       assert_select 'input.boolean + label.boolean'
       assert_no_select 'label > input'
@@ -95,16 +123,16 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input with nested style allows disabling label' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :label => false
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, label: false
       assert_select 'input.boolean'
       assert_no_select 'label.boolean'
     end
   end
 
   test 'input with nested style allows customizing input_html' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :input_html => { :name => 'active_user' }
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, input_html: { name: 'active_user' }
       assert_select "input[type=hidden][name=active_user] + label.boolean > input.boolean[name=active_user]"
     end
   end
@@ -120,7 +148,7 @@ class BooleanInputTest < ActionView::TestCase
 
   test 'input boolean with nested style works using :input only in wrapper config (no label_input), adding the extra "checkbox" label wrapper' do
     swap_wrapper do
-      swap SimpleForm, :boolean_style => :nested do
+      swap SimpleForm, boolean_style: :nested do
         with_input_for @user, :active, :boolean
 
         assert_select 'label.boolean + input[type=hidden] + label.checkbox > input.boolean'
@@ -128,13 +156,53 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input boolean with nested style works using :input only in wrapper config (no label_input), adding the extra label wrapper with custom class' do
+    swap_wrapper do
+      swap SimpleForm, boolean_style: :nested, boolean_label_class: 'foo' do
+        with_input_for @user, :active, :boolean
+
+        assert_select 'label.boolean + input[type=hidden] + label.foo > input.boolean'
+      end
+    end
+  end
+
   test 'input boolean with nested style works using :label_input in wrapper config, adding "checkbox" class to label' do
     swap_wrapper :default, self.custom_wrapper_without_top_level do
-      swap SimpleForm, :boolean_style => :nested do
+      swap SimpleForm, boolean_style: :nested do
         with_input_for @user, :active, :boolean
 
         assert_select 'input[type=hidden] + label.boolean.checkbox > input.boolean'
       end
     end
   end
+
+  test 'input boolean with nested style works using :label_input in wrapper config, adding custom class to label' do
+    swap_wrapper :default, self.custom_wrapper_without_top_level do
+      swap SimpleForm, boolean_style: :nested, boolean_label_class: 'foo' do
+        with_input_for @user, :active, :boolean
+
+        assert_select 'input[type=hidden] + label.boolean.foo > input.boolean'
+      end
+    end
+  end
+
+  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
+
+        assert_select 'label'
+        assert_select 'label.checkbox'
+        assert_no_select 'label.boolean'
+      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