simple_form 3.1.0.rc1 → 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,7 +53,7 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     end
   end
 
-  test 'input that uses automatic collection translation for check_boxes should properly set checked values' do
+  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
@@ -245,6 +245,23 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     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]

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -6,19 +6,19 @@ 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 generate internal labels with accurate `for` values with nested boolean style' 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'
@@ -26,7 +26,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'nested label should not duplicate input id' do
+  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'
@@ -34,7 +34,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'input as radio should use i18n to translate internal labels' do
+  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'
@@ -42,25 +42,25 @@ 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]'
@@ -68,7 +68,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     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
@@ -80,7 +80,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     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
@@ -92,7 +92,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should do automatic collection translation and preserve html markup' do
+  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>' }
@@ -106,7 +106,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should do automatic collection translation with keys prefixed with _html and a string value' do
+  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' }
@@ -120,18 +120,18 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     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]'
@@ -139,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
@@ -153,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
@@ -161,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,
@@ -172,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 },
@@ -183,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]'
@@ -368,6 +368,23 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     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]

data/test/inputs/collection_select_input_test.rb

@@ -6,14 +6,14 @@ class CollectionSelectInputTest < ActionView::TestCase
     SimpleForm::Inputs::CollectionSelectInput.reset_i18n_cache :boolean_collection
   end
 
-  test 'input should generate a boolean select with options by default for select types' do
+  test 'input generates a boolean select with options by default for select types' do
     with_input_for @user, :active, :select
     assert_select 'select.select#user_active'
     assert_select 'select option[value=true]', 'Yes'
     assert_select 'select option[value=false]', 'No'
   end
 
-  test 'input as select should use i18n to translate select boolean options' do
+  test 'input as select uses i18n to translate select boolean options' do
     store_translations(:en, simple_form: { yes: 'Sim', no: 'Não' }) do
       with_input_for @user, :active, :select
       assert_select 'select option[value=true]', 'Sim'
@@ -21,14 +21,14 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should allow overriding collection for select types' do
+  test 'input allows overriding collection for select types' do
     with_input_for @user, :name, :select, collection: ['Jose', 'Carlos']
     assert_select 'select.select#user_name'
     assert_select 'select option', 'Jose'
     assert_select 'select option', 'Carlos'
   end
 
-  test 'input should do automatic collection translation for select types using defaults key' do
+  test 'input does automatic collection translation for select types using defaults key' do
     store_translations(:en, simple_form: { options: { defaults: {
       gender: { male: 'Male', female: 'Female'}
     } } }) do
@@ -39,7 +39,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should do automatic collection translation for select types using specific object key' do
+  test 'input does automatic collection translation for select types using specific object key' do
     store_translations(:en, simple_form: { options: { user: {
       gender: { male: 'Male', female: 'Female'}
     } } }) do
@@ -50,38 +50,38 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should mark the selected value by default' do
+  test 'input marks the selected value by default' do
     @user.name = "Carlos"
     with_input_for @user, :name, :select, collection: ['Jose', 'Carlos']
     assert_select 'select option[selected=selected]', 'Carlos'
   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, :select, collection: [['Jose', class: 'foo']]
     assert_select 'select.select#user_name'
     assert_select 'select option.foo', 'Jose'
   end
 
-  test 'input should mark the selected value also when using integers' do
+  test 'input marks the selected value also when using integers' do
     @user.age = 18
     with_input_for @user, :age, :select, collection: 18..60
     assert_select 'select option[selected=selected]', '18'
   end
 
-  test 'input should mark the selected value when using booleans and select' do
+  test 'input marks the selected value when using booleans and select' do
     @user.active = false
     with_input_for @user, :active, :select
     assert_no_select 'select option[selected][value=true]', 'Yes'
     assert_select 'select option[selected][value=false]', 'No'
   end
 
-  test 'input should set the correct value when using a collection that includes floats' do
+  test 'input sets the correct value when using a collection that includes floats' do
     with_input_for @user, :age, :select, collection: [2.0, 2.5, 3.0, 3.5, 4.0, 4.5]
     assert_select 'select option[value="2.0"]'
     assert_select 'select option[value="2.5"]'
   end
 
-  test 'input should set the correct values when using a collection that uses mixed values' do
+  test 'input sets the correct values when using a collection that uses mixed values' do
     with_input_for @user, :age, :select, collection: ["Hello Kitty", 2, 4.5, :johnny, nil, true, false]
     assert_select 'select option[value="Hello Kitty"]'
     assert_select 'select option[value="2"]'
@@ -92,17 +92,17 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[value="false"]'
   end
 
-  test 'input should include a blank option even if :include_blank is set to false if the collection includes a nil value' do
+  test 'input includes a blank option even if :include_blank is set to false if the collection includes a nil value' do
     with_input_for @user, :age, :select, collection: [nil], include_blank: false
     assert_select 'select option[value=""]'
   end
 
-  test 'input should automatically set include blank' do
+  test 'input automatically sets include blank' do
     with_input_for @user, :age, :select, collection: 18..30
     assert_select 'select option[value=]', ''
   end
 
-  test 'input should translate include blank when set to :translate' do
+  test 'input translates include blank when set to :translate' do
     store_translations(:en, simple_form: { include_blanks: { user: {
       age: 'Rather not say'
     } } }) do
@@ -111,7 +111,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should translate include blank with a default' do
+  test 'input translates include blank with a default' do
     store_translations(:en, simple_form: { include_blanks: { defaults: {
       age: 'Rather not say',
     } } }) do
@@ -120,7 +120,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not translate include blank when set to a string' do
+  test 'input does not translate include blank when set to a string' do
     store_translations(:en, simple_form: { include_blanks: { user: {
       age: 'Rather not say'
     } } }) do
@@ -129,7 +129,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not translate include blank when automatically set' do
+  test 'input does not translate include blank when automatically set' do
     store_translations(:en, simple_form: { include_blanks: { user: {
       age: 'Rather not say'
     } } }) do
@@ -138,7 +138,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not translate include blank when set to true' do
+  test 'input does not translate include blank when set to true' do
     store_translations(:en, simple_form: { include_blanks: { user: {
       age: 'Rather not say'
     } } }) do
@@ -147,7 +147,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not translate include blank when set to false' do
+  test 'input does not translate include blank when set to false' do
     store_translations(:en, simple_form: { include_blanks: { user: {
       age: 'Rather not say'
     } } }) do
@@ -156,22 +156,22 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not set include blank if otherwise is told' do
+  test 'input does 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=]'
   end
 
-  test 'input should not set include blank if prompt is given' do
+  test 'input does not set include blank if prompt is given' do
     with_input_for @user, :age, :select, collection: 18..30, prompt: "Please select foo"
     assert_no_select 'select option[value=]', ''
   end
 
-  test 'input should not set include blank if multiple is given' do
+  test 'input does not set include blank if multiple is given' do
     with_input_for @user, :age, :select, collection: 18..30, input_html: { multiple: true }
     assert_no_select 'select option[value=]', ''
   end
 
-  test 'input should translate prompt when set to :translate' do
+  test 'input translates prompt when set to :translate' do
     store_translations(:en, simple_form: { prompts: { user: {
       age: 'Select age:'
     } } }) do
@@ -180,7 +180,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should translate prompt with a default' do
+  test 'input translates prompt with a default' do
     store_translations(:en, simple_form: { prompts: { defaults: {
       age: 'Select age:',
     } } }) do
@@ -189,7 +189,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not translate prompt when set to a string' do
+  test 'input does not translate prompt when set to a string' do
     store_translations(:en, simple_form: { prompts: { user: {
       age: 'Select age:'
     } } }) do
@@ -198,7 +198,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should not translate prompt when set to false' do
+  test 'input does not translate prompt when set to false' do
     store_translations(:en, simple_form: { prompts: { user: {
       age: 'Select age:'
     } } }) do
@@ -207,7 +207,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should use Rails prompt translation as a fallback' do
+  test 'input uses Rails prompt translation as a fallback' do
     store_translations(:en, helpers: { select: {
       prompt: 'Select value:'
     } }) do
@@ -216,14 +216,14 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should detect label and value on collections' do
+  test 'input detects 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
     assert_select 'select option[value=1]', 'Jose'
     assert_select 'select option[value=2]', 'Carlos'
   end
 
-  test 'input should disable the anothers components when the option is a object' do
+  test 'input disables the anothers components when the option is a object' do
     with_input_for @user, :description, :select, collection: ["Jose", "Carlos"], disabled: true
     assert_no_select 'select option[value=Jose][disabled=disabled]', 'Jose'
     assert_no_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
@@ -231,7 +231,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'div.disabled'
   end
 
-  test 'input should not disable the anothers components when the option is a object' do
+  test 'input does not disable the anothers components when the option is a object' do
     with_input_for @user, :description, :select, collection: ["Jose", "Carlos"], disabled: 'Jose'
     assert_select 'select option[value=Jose][disabled=disabled]', 'Jose'
     assert_no_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
@@ -239,7 +239,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'div.disabled'
   end
 
-  test 'input should allow overriding label and value method using a lambda for collection selects' do
+  test 'input allows overriding label and value method using a lambda for collection selects' do
     with_input_for @user, :name, :select,
                           collection: ['Jose', 'Carlos'],
                           label_method: lambda { |i| i.upcase },
@@ -248,7 +248,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[value=carlos]', "CARLOS"
   end
 
-  test 'input should allow overriding only label but not value method using a lambda for collection select' do
+  test 'input allows overriding only label but not value method using a lambda for collection select' do
     with_input_for @user, :name, :select,
                           collection: ['Jose', 'Carlos'],
                           label_method: lambda { |i| i.upcase }
@@ -256,7 +256,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[value=Carlos]', "CARLOS"
   end
 
-  test 'input should allow overriding only value but not label method using a lambda for collection select' do
+  test 'input allows overriding only value but not label method using a lambda for collection select' do
     with_input_for @user, :name, :select,
                           collection: ['Jose', 'Carlos'],
                           value_method: lambda { |i| i.downcase }
@@ -264,39 +264,39 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[value=carlos]', "Carlos"
   end
 
-  test 'input should allow symbols for collections' do
+  test 'input allows symbols for collections' do
     with_input_for @user, :name, :select, collection: [:jose, :carlos]
     assert_select 'select.select#user_name'
     assert_select 'select option[value=jose]', 'jose'
     assert_select 'select option[value=carlos]', 'carlos'
   end
 
-  test 'collection input with select type should generate required html attribute only with blank option' do
+  test 'collection input with select type generates required html attribute only with blank option' do
     with_input_for @user, :name, :select, include_blank: true, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
-  test 'collection input with select type should generate required html attribute only with blank option or prompt' do
+  test 'collection input with select type generates 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
+  test 'collection input with select type does 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'
     assert_no_select 'select[required]'
     assert_no_select 'select[aria-required=true]'
   end
 
-  test 'collection input with select type with multiple attribute should generate required html attribute without blank option' do
+  test 'collection input with select type with multiple attribute generates required html attribute without blank option' do
     with_input_for @user, :name, :select, include_blank: false, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
-  test 'collection input with select type with multiple attribute should generate required html attribute with blank option' do
+  test 'collection input with select type with multiple attribute generates required html attribute with blank option' do
     with_input_for @user, :name, :select, include_blank: true, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_select 'select[required]'
@@ -326,7 +326,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select[aria-required]'
   end
 
-  test 'input should allow disabled options with a lambda for collection select' do
+  test 'input allows disabled options with a lambda for collection select' do
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       disabled: lambda { |x| x == "Carlos" }
     assert_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
@@ -334,7 +334,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'select option[value=Antonio][disabled]'
   end
 
-  test 'input should allow disabled and label method with lambdas for collection select' do
+  test 'input allows disabled and label method with lambdas for collection select' do
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       disabled: lambda { |x| x == "Carlos" }, label_method: lambda { |x| x.upcase }
     assert_select 'select option[value=Carlos][disabled=disabled]', 'CARLOS'
@@ -342,7 +342,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'select option[value=Antonio][disabled]'
   end
 
-  test 'input should allow a non lambda disabled option with lambda label method for collections' do
+  test 'input allows a non lambda disabled option with lambda label method for collections' do
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       disabled: "Carlos", label_method: lambda { |x| x.upcase }
     assert_select 'select option[value=Carlos][disabled=disabled]', 'CARLOS'
@@ -350,7 +350,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'select option[value=Antonio][disabled]'
   end
 
-  test 'input should allow selected and label method with lambdas for collection select' do
+  test 'input allows selected and label method with lambdas for collection select' do
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       selected: lambda { |x| x == "Carlos" }, label_method: lambda { |x| x.upcase }
     assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
@@ -358,7 +358,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'select option[value=Antonio][selected]'
   end
 
-  test 'input should allow a non lambda selected option with lambda label method for collection select' do
+  test 'input allows a non lambda selected option with lambda label method for collection select' do
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       selected: "Carlos", label_method: lambda { |x| x.upcase }
     assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
@@ -366,7 +366,7 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_no_select 'select option[value=Antonio][selected]'
   end
 
-  test 'input should not override default selection through attribute value with label method as lambda for collection select' do
+  test 'input does not override default selection through attribute value with label method as lambda for collection select' do
     @user.name = "Carlos"
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       label_method: lambda { |x| x.upcase }