simple_form 3.0.1 → 3.1.0.rc2

data/test/inputs/collection_check_boxes_input_test.rb

@@ -6,30 +6,30 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     SimpleForm::Inputs::CollectionCheckBoxesInput.reset_i18n_cache :boolean_collection
   end
 
-  test 'input check boxes should not include for attribute by default' do
+  test 'input check boxes does not include for attribute by default' do
     with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
     assert_select 'label'
     assert_no_select 'label[for=user_gender]'
   end
 
-  test 'input check boxes should include for attribute when giving as html option' do
+  test 'input check boxes includes for attribute when giving as html option' do
     with_input_for @user, :gender, :check_boxes, collection: [:male, :female], label_html: { for: 'gender' }
     assert_select 'label[for=gender]'
   end
 
-  test 'collection input with check_boxes type should not generate required html attribute' do
+  test 'collection input with check_boxes type does not generate required html attribute' do
     with_input_for @user, :name, :check_boxes, collection: ['Jose', 'Carlos']
     assert_select 'input.required'
     assert_no_select 'input[required]'
   end
 
-  test 'collection input with check_boxes type should not generate aria-required html attribute' do
+  test 'collection input with check_boxes type does not generate aria-required html attribute' do
     with_input_for @user, :name, :check_boxes, collection: ['Jose', 'Carlos']
     assert_select 'input.required'
     assert_no_select 'input[aria-required]'
   end
 
-  test 'input should do automatic collection translation for check_box types using defaults key' do
+  test 'input does automatic collection translation for check_box types using defaults key' do
     store_translations(:en, simple_form: { options: { defaults: {
       gender: { male: 'Male', female: 'Female'}
     } } } ) do
@@ -41,7 +41,7 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should do automatic collection translation for check_box types using specific object key' do
+  test 'input does automatic collection translation for check_box types using specific object key' do
     store_translations(:en, simple_form: { options: { user: {
       gender: { male: 'Male', female: 'Female'}
     } } } ) do
@@ -53,6 +53,20 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     end
   end
 
+  test 'input that uses automatic collection translation for check_boxes properly sets 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,41 @@ 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 with nested style renders item labels with specified class' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :check_boxes, item_label_class: "test"
+
+      assert_select 'span.checkbox > label.test > input'
+    end
+  end
+
+  test 'input check boxes with nested style and falsey input wrapper renders item labels with specified class' do
+    swap SimpleForm, boolean_style: :nested, item_wrapper_tag: false do
+      with_input_for @user, :active, :check_boxes, item_label_class: "checkbox-inline"
+
+      assert_select 'label.checkbox-inline > input'
+      assert_no_select 'span.checkbox'
+    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

@@ -6,19 +6,35 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     SimpleForm::Inputs::CollectionRadioButtonsInput.reset_i18n_cache :boolean_collection
   end
 
-  test 'input should generate boolean radio buttons by default for radio types' do
+  test 'input generates boolean radio buttons by default for radio types' do
     with_input_for @user, :active, :radio_buttons
     assert_select 'input[type=radio][value=true].radio_buttons#user_active_true'
     assert_select 'input[type=radio][value=false].radio_buttons#user_active_false'
   end
 
-  test 'input as radio should generate internal labels by default' do
+  test 'input as radio generates internal labels by default' 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
 
-  test 'input as radio should use i18n to translate internal labels' do
+  test 'input as radio generates 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 does 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 uses i18n to translate internal labels' do
     store_translations(:en, simple_form: { yes: 'Sim', no: 'Não' }) do
       with_input_for @user, :active, :radio_buttons
       assert_select 'label[for=user_active_true]', 'Sim'
@@ -26,68 +42,96 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'input radio should not include for attribute by default' do
+  test 'input radio does not include for attribute by default' do
     with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
     assert_select 'label'
     assert_no_select 'label[for=user_gender]'
   end
 
-  test 'input radio should include for attribute when giving as html option' do
+  test 'input radio includes for attribute when giving as html option' do
     with_input_for @user, :gender, :radio_buttons, collection: [:male, :female], label_html: { for: 'gender' }
     assert_select 'label[for=gender]'
   end
 
-  test 'input should mark the checked value when using boolean and radios' do
+  test 'input marks the checked value when using boolean and radios' do
     @user.active = false
     with_input_for @user, :active, :radio_buttons
     assert_no_select 'input[type=radio][value=true][checked]'
     assert_select 'input[type=radio][value=false][checked]'
   end
 
-  test 'input should allow overriding collection for radio types' do
+  test 'input allows overriding collection for radio types' do
     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
+  test 'input does automatic collection translation for radio types using defaults key' do
     store_translations(:en, simple_form: { options: { defaults: {
       gender: { male: 'Male', female: '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.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 for radio types using specific object key' do
+  test 'input does automatic collection translation for radio types using specific object key' do
     store_translations(:en, simple_form: { options: { user: {
       gender: { male: 'Male', female: '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.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 does 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 does 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
 
-  test 'input should mark the current radio value by default' do
+  test 'input marks the current radio value by default' do
     @user.name = "Carlos"
     with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
     assert_select 'input[type=radio][value=Carlos][checked=checked]'
   end
 
-  test 'input should accept html options as the last element of collection' do
+  test 'input accepts html options as the last element of collection' do
     with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose', class: 'foo']]
     assert_select 'input.foo[type=radio][value=jose]'
   end
 
-  test 'input should allow using a collection with text/value arrays' do
+  test 'input allows using a collection with text/value arrays' do
     with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose'], ['Carlos', 'carlos']]
     assert_select 'input[type=radio][value=jose]'
     assert_select 'input[type=radio][value=carlos]'
@@ -95,13 +139,13 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'label.collection_radio_buttons', 'Carlos'
   end
 
-  test 'input should allow using a collection with a Proc' do
+  test 'input allows using a collection with a Proc' do
     with_input_for @user, :name, :radio_buttons, collection: Proc.new { ['Jose', 'Carlos' ] }
     assert_select 'label.collection_radio_buttons', 'Jose'
     assert_select 'label.collection_radio_buttons', 'Carlos'
   end
 
-  test 'input should allow overriding only label method for collections' do
+  test 'input allows overriding only label method for collections' do
     with_input_for @user, :name, :radio_buttons,
                           collection: ['Jose', 'Carlos'],
                           label_method: :upcase
@@ -109,7 +153,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'label.collection_radio_buttons', 'CARLOS'
   end
 
-  test 'input should allow overriding only value method for collections' do
+  test 'input allows overriding only value method for collections' do
     with_input_for @user, :name, :radio_buttons,
                           collection: ['Jose', 'Carlos'],
                           value_method: :upcase
@@ -117,7 +161,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'input[type=radio][value=CARLOS]'
   end
 
-  test 'input should allow overriding label and value method for collections' do
+  test 'input allows overriding label and value method for collections' do
     with_input_for @user, :name, :radio_buttons,
                           collection: ['Jose', 'Carlos'],
                           label_method: :upcase,
@@ -128,7 +172,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'label.collection_radio_buttons', 'CARLOS'
   end
 
-  test 'input should allow overriding label and value method using a lambda for collections' do
+  test 'input allows overriding label and value method using a lambda for collections' do
     with_input_for @user, :name, :radio_buttons,
                           collection: ['Jose', 'Carlos'],
                           label_method: lambda { |i| i.upcase },
@@ -139,13 +183,13 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'label.collection_radio_buttons', 'CARLOS'
   end
 
-  test 'collection input with radio type should generate required html attribute' do
+  test 'collection input with radio type generates required html attribute' do
     with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
     assert_select 'input[type=radio].required'
     assert_select 'input[type=radio][required]'
   end
 
-  test 'collection input with radio type should generate aria-required html attribute' do
+  test 'collection input with radio type generates aria-required html attribute' do
     with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
     assert_select 'input[type=radio].required'
     assert_select 'input[type=radio][aria-required=true]'
@@ -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,41 @@ 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 with nested style renders item labels with specified class' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :radio_buttons, item_label_class: "test"
+
+      assert_select 'span.radio > label.test > input'
+    end
+  end
+
+  test 'input radio with nested style and falsey input wrapper renders item labels with specified class' do
+    swap SimpleForm, boolean_style: :nested, item_wrapper_tag: false do
+      with_input_for @user, :active, :radio_buttons, item_label_class: "radio-inline"
+
+      assert_select 'label.radio-inline > input'
+      assert_no_select 'span.radio'
+    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