simple_form 3.0.4 → 3.1.0.rc1

data/test/form_builder/label_test.rb

@@ -73,9 +73,32 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'builder allows label order to be changed' do
-    swap SimpleForm, label_text: lambda { |l, r| "#{l}:" } do
+    swap SimpleForm, label_text: proc { |l, r| "#{l}:" } do
       with_label_for @user, :age
       assert_select 'label.integer[for=user_age]', "Age:"
     end
   end
+
+  test 'configuration allow set label text for wrappers' do
+    swap_wrapper :default, self.custom_wrapper_with_label_text do
+      with_concat_form_for(@user) do |f|
+        concat f.input :age
+      end
+      assert_select "label.integer[for=user_age]", "**Age**"
+    end
+  end
+
+  test 'builder should allow 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
+    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:'
+    end
+  end
 end

data/test/form_builder/wrapper_test.rb

@@ -128,6 +128,21 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
+  test 'custom wrappers can have additional attributes' do
+    swap_wrapper :default, self.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, self.custom_wrapper_with_full_error do
+      with_form_for @user, :name
+      assert_select 'span.error', "Name can't be blank"
+    end
+  end
+
   test 'custom wrappers on a form basis' do
     swap_wrapper :another do
       with_concat_form_for(@user) do |f|
@@ -200,4 +215,56 @@ class WrapperTest < ActionView::TestCase
       end
     end
   end
+
+  test 'use 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 'input accepts attributes in the DSL' do
+    swap_wrapper :default, self.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, self.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, self.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, self.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
 end

data/test/generators/simple_form_generator_test.rb

@@ -21,8 +21,8 @@ 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

data/test/inputs/boolean_input_test.rb

@@ -50,14 +50,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.'
-      assert_select 'label.checkbox', text: '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;'
+    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
+      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'
+      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' }
+      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>' }
+      assert_select 'label.checkbox', text: ' New Active'
     end
   end
 
@@ -128,6 +156,16 @@ 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
@@ -138,6 +176,16 @@ class BooleanInputTest < ActionView::TestCase
     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 should add "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

data/test/inputs/collection_check_boxes_input_test.rb

@@ -53,6 +53,20 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     end
   end
 
+  test 'input that uses automatic collection translation for check_boxes should properly set checked values' do
+    store_translations(:en, simple_form: { options: { defaults: {
+      gender: { male: 'Male', female: 'Female'}
+    } } } ) do
+      @user.gender = 'male'
+
+      with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
+      assert_select 'input[type=checkbox][value=male][checked=checked]'
+      assert_select 'input[type=checkbox][value=female]'
+      assert_select 'label.collection_check_boxes', 'Male'
+      assert_select 'label.collection_check_boxes', 'Female'
+    end
+  end
+
   test 'input check boxes does not wrap the collection by default' do
     with_input_for @user, :active, :check_boxes
 
@@ -199,29 +213,27 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :check_boxes
 
-      assert_select 'label.checkbox > input#user_active_true[type=checkbox]'
-      assert_select 'label.checkbox', 'Yes'
-      assert_select 'label.checkbox > input#user_active_false[type=checkbox]'
-      assert_select 'label.checkbox', 'No'
+      assert_select 'span.checkbox > label > input#user_active_true[type=checkbox]'
+      assert_select 'span.checkbox > label', 'Yes'
+      assert_select 'span.checkbox > label > input#user_active_false[type=checkbox]'
+      assert_select 'span.checkbox > label', 'No'
       assert_no_select 'label.collection_radio_buttons'
     end
   end
 
-  test 'input check boxes with nested style overrides configured item wrapper tag, forcing the :label' do
+  test 'input check boxes with nested style does not overrides configured item wrapper tag' do
     swap SimpleForm, boolean_style: :nested, item_wrapper_tag: :li do
       with_input_for @user, :active, :check_boxes
 
-      assert_select 'label.checkbox > input'
-      assert_no_select 'li'
+      assert_select 'li.checkbox > label > input'
     end
   end
 
-  test 'input check boxes with nested style overrides given item wrapper tag, forcing the :label' do
+  test 'input check boxes with nested style does not overrides given item wrapper tag' do
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :check_boxes, item_wrapper_tag: :li
 
-      assert_select 'label.checkbox > input'
-      assert_no_select 'li'
+      assert_select 'li.checkbox > label > input'
     end
   end
 
@@ -229,7 +241,24 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :check_boxes, item_wrapper_class: "inline"
 
-      assert_select 'label.checkbox.inline > input'
+      assert_select 'span.checkbox.inline > label > input'
+    end
+  end
+
+  test 'input check boxes wrapper class are not included when set to falsey' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
+
+      assert_no_select 'label.checkbox'
+    end
+  end
+
+  test 'input check boxes 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, :check_boxes, collection: [:male, :female], item_wrapper_class: 'custom'
+
+      assert_no_select 'label.checkbox'
+      assert_select 'span.custom'
     end
   end
 end

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -18,6 +18,22 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'label[for=user_active_false]', 'No'
   end
 
+  test 'input as radio should generate internal labels with accurate `for` values with nested boolean style' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :radio_buttons
+      assert_select 'label[for=user_active_true]', 'Yes'
+      assert_select 'label[for=user_active_false]', 'No'
+    end
+  end
+
+  test 'nested label should not duplicate input id' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :radio_buttons, id: 'nested_id'
+      assert_select 'input#user_active_true'
+      assert_no_select 'label#user_active_true'
+    end
+  end
+
   test 'input as radio should use i18n to translate internal labels' do
     store_translations(:en, simple_form: { yes: 'Sim', no: 'Não' }) do
       with_input_for @user, :active, :radio_buttons
@@ -48,8 +64,8 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
     assert_select 'input[type=radio][value=Jose]'
     assert_select 'input[type=radio][value=Carlos]'
-    assert_select 'label.collection_radio_buttons', 'Jose'
-    assert_select 'label.collection_radio_buttons', 'Carlos'
+    assert_select 'label.collection_radio_buttons[for=user_name_jose]', 'Jose'
+    assert_select 'label.collection_radio_buttons[for=user_name_carlos]', 'Carlos'
   end
 
   test 'input should do automatic collection translation for radio types using defaults key' do
@@ -59,8 +75,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.collection_radio_buttons', 'Male'
-      assert_select 'label.collection_radio_buttons', 'Female'
+      assert_select 'label.collection_radio_buttons[for=user_gender_male]', 'Male'
+      assert_select 'label.collection_radio_buttons[for=user_gender_female]', 'Female'
     end
   end
 
@@ -71,8 +87,36 @@ 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.collection_radio_buttons', 'Male'
-      assert_select 'label.collection_radio_buttons', 'Female'
+      assert_select 'label.collection_radio_buttons[for=user_gender_male]', 'Male'
+      assert_select 'label.collection_radio_buttons[for=user_gender_female]', 'Female'
+    end
+  end
+
+  test 'input should do automatic collection translation and preserve html markup' do
+    swap SimpleForm, boolean_style: :nested do
+      store_translations(:en, simple_form: { options: { user: {
+        gender: { male_html: '<strong>Male</strong>', female_html: '<strong>Female</strong>' }
+      } } } ) do
+        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'
+      end
+    end
+  end
+
+  test 'input should do automatic collection translation with keys prefixed with _html and a string value' do
+    swap SimpleForm, boolean_style: :nested do
+      store_translations(:en, simple_form: { options: { user: {
+        gender: { male_html: 'Male', female_html: 'Female' }
+      } } } ) do
+        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'
+      end
     end
   end
 
@@ -292,29 +336,27 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :radio_buttons
 
-      assert_select 'label.radio > input#user_active_true[type=radio]'
-      assert_select 'label.radio', 'Yes'
-      assert_select 'label.radio > input#user_active_false[type=radio]'
-      assert_select 'label.radio', 'No'
+      assert_select 'span.radio > label > input#user_active_true[type=radio]'
+      assert_select 'span.radio > label', 'Yes'
+      assert_select 'span.radio > label > input#user_active_false[type=radio]'
+      assert_select 'span.radio > label', 'No'
       assert_no_select 'label.collection_radio_buttons'
     end
   end
 
-  test 'input radio with nested style overrides configured item wrapper tag, forcing the :label' do
+  test 'input radio with nested style does not overrides configured item wrapper tag' do
     swap SimpleForm, boolean_style: :nested, item_wrapper_tag: :li do
       with_input_for @user, :active, :radio_buttons
 
-      assert_select 'label.radio > input'
-      assert_no_select 'li'
+      assert_select 'li.radio > label > input'
     end
   end
 
-  test 'input radio with nested style overrides given item wrapper tag, forcing the :label' do
+  test 'input radio with nested style does not overrides given item wrapper tag' do
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :radio_buttons, item_wrapper_tag: :li
 
-      assert_select 'label.radio > input'
-      assert_no_select 'li'
+      assert_select 'li.radio > label > input'
     end
   end
 
@@ -322,7 +364,24 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :radio_buttons, item_wrapper_class: "inline"
 
-      assert_select 'label.radio.inline > input'
+      assert_select 'span.radio.inline > label > input'
+    end
+  end
+
+  test 'input radio wrapper class are not included when set to falsey' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
+
+      assert_no_select 'label.radio'
+    end
+  end
+
+  test 'input check boxes 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'
+
+      assert_no_select 'label.radio'
+      assert_select 'span.custom'
     end
   end
 end

data/test/inputs/collection_select_input_test.rb

@@ -31,7 +31,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   test 'input should do automatic collection translation for select types using defaults key' do
     store_translations(:en, simple_form: { options: { defaults: {
       gender: { male: 'Male', female: 'Female'}
-    } } } ) do
+    } } }) do
       with_input_for @user, :gender, :select, collection: [:male, :female]
       assert_select 'select.select#user_gender'
       assert_select 'select option', 'Male'
@@ -42,7 +42,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   test 'input should do automatic collection translation for select types using specific object key' do
     store_translations(:en, simple_form: { options: { user: {
       gender: { male: 'Male', female: 'Female'}
-    } } } ) do
+    } } }) do
       with_input_for @user, :gender, :select, collection: [:male, :female]
       assert_select 'select.select#user_gender'
       assert_select 'select option', 'Male'
@@ -102,9 +102,63 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[value=]', ''
   end
 
+  test 'input should translate include blank when set to :translate' do
+    store_translations(:en, simple_form: { include_blanks: { user: {
+      age: 'Rather not say'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, include_blank: :translate
+      assert_select 'select option[value=]', 'Rather not say'
+    end
+  end
+
+  test 'input should translate include blank with a default' do
+    store_translations(:en, simple_form: { include_blanks: { defaults: {
+      age: 'Rather not say',
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, include_blank: :translate
+      assert_select 'select option[value=]', 'Rather not say'
+    end
+  end
+
+  test 'input should not translate include blank when set to a string' do
+    store_translations(:en, simple_form: { include_blanks: { user: {
+      age: 'Rather not say'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, include_blank: 'Young at heart'
+      assert_select 'select option[value=]', 'Young at heart'
+    end
+  end
+
+  test 'input should not translate include blank when automatically set' do
+    store_translations(:en, simple_form: { include_blanks: { user: {
+      age: 'Rather not say'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30
+      assert_select 'select option[value=]', ''
+    end
+  end
+
+  test 'input should not translate include blank when set to true' do
+    store_translations(:en, simple_form: { include_blanks: { user: {
+      age: 'Rather not say'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, include_blank: true
+      assert_select 'select option[value=]', ''
+    end
+  end
+
+  test 'input should not translate include blank when set to false' do
+    store_translations(:en, simple_form: { include_blanks: { user: {
+      age: 'Rather not say'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, include_blank: false
+      assert_no_select 'select option[value=]'
+    end
+  end
+
   test 'input should not set include blank if otherwise is told' do
     with_input_for @user, :age, :select, collection: 18..30, include_blank: false
-    assert_no_select 'select option[value=]', ''
+    assert_no_select 'select option[value=]'
   end
 
   test 'input should not set include blank if prompt is given' do
@@ -117,6 +171,51 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'select option[value=]', ''
   end
 
+  test 'input should translate prompt when set to :translate' do
+    store_translations(:en, simple_form: { prompts: { user: {
+      age: 'Select age:'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
+      assert_select 'select option[value=]', 'Select age:'
+    end
+  end
+
+  test 'input should translate prompt with a default' do
+    store_translations(:en, simple_form: { prompts: { defaults: {
+      age: 'Select age:',
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
+      assert_select 'select option[value=]', 'Select age:'
+    end
+  end
+
+  test 'input should not translate prompt when set to a string' do
+    store_translations(:en, simple_form: { prompts: { user: {
+      age: 'Select age:'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, prompt: 'Do it:'
+      assert_select 'select option[value=]', 'Do it:'
+    end
+  end
+
+  test 'input should not translate prompt when set to false' do
+    store_translations(:en, simple_form: { prompts: { user: {
+      age: 'Select age:'
+    } } }) do
+      with_input_for @user, :age, :select, collection: 18..30, prompt: false
+      assert_no_select 'select option[value=]'
+    end
+  end
+
+  test 'input should use Rails prompt translation as a fallback' do
+    store_translations(:en, helpers: { select: {
+      prompt: 'Select value:'
+    } }) do
+      with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
+      assert_select 'select option[value=]', "Select value:"
+    end
+  end
+
   test 'input should detect label and value on collections' do
     users = [User.build(id: 1, name: "Jose"), User.build(id: 2, name: "Carlos")]
     with_input_for @user, :description, :select, collection: users
@@ -178,6 +277,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select[required]'
   end
 
+  test 'collection input with select type should generate required html attribute only with blank option or prompt' do
+    with_input_for @user, :name, :select, prompt: 'Name...', collection: ['Jose', 'Carlos']
+    assert_select 'select.required'
+    assert_select 'select[required]'
+  end
+
   test 'collection input with select type should not generate required html attribute without blank option' do
     with_input_for @user, :name, :select, include_blank: false, collection: ['Jose', 'Carlos']
     assert_select 'select.required'