simple_form 3.4.0 → 5.1.0

data/test/generators/simple_form_generator_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class SimpleFormGeneratorTest < Rails::Generators::TestCase
@@ -18,7 +19,7 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
   end
 
   test 'generates the simple_form initializer with the bootstrap wrappers' do
-    run_generator %w(--bootstrap)
+    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 :vertical_form/,
@@ -26,14 +27,14 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
   end
 
   test 'generates the simple_form initializer with the foundation wrappers' do
-    run_generator %w(--foundation)
+    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 :vertical_form/,
       /config\.default_wrapper = :vertical_form/, /config\.item_wrapper_tag = :div/
   end
 
-  %W(erb haml slim).each do |engine|
+  %w[erb haml slim].each do |engine|
     test "generates the scaffold template when using #{engine}" do
       run_generator ['-e', engine]
       assert_file "lib/templates/#{engine}/scaffold/_form.html.#{engine}"

data/test/inputs/boolean_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -106,6 +107,14 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input boolean with nested generates a disabled hidden field with the form attribute when it is given' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, input_html: { form: 'form_id' }
+
+      assert_select "input[type=hidden][form=form_id]+ label.boolean > input.boolean"
+    end
+  end
+
   test 'input accepts changing boolean style to nested through given options' do
     with_input_for @user, :active, :boolean, boolean_style: :nested
     assert_select 'label[for=user_active]', 'Active'
@@ -145,6 +154,14 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input with nested style does not include hidden field when unchecked_value is false' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, unchecked_value: false
+      assert_select "label.boolean > input.boolean"
+      assert_no_select "input[type=hidden] + label.boolean"
+    end
+  end
+
   test 'input boolean works using :input only in wrapper config (no label_input)' do
     swap_wrapper do
       with_input_for @user, :active, :boolean

data/test/inputs/collection_check_boxes_input_test.rb

@@ -1,39 +1,36 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
 class CollectionCheckBoxesInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionCheckBoxesInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input check boxes does not include for attribute by default' do
-    with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
+    with_input_for @user, :gender, :check_boxes, collection: %i[male female]
     assert_select 'label'
     assert_no_select 'label[for=user_gender]'
   end
 
   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' }
+    with_input_for @user, :gender, :check_boxes, collection: %i[male female], label_html: { for: 'gender' }
     assert_select 'label[for=gender]'
   end
 
   test 'collection input with check_boxes type does not generate required html attribute' do
-    with_input_for @user, :name, :check_boxes, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :check_boxes, collection: %w[Jose Carlos]
     assert_select 'input.required'
     assert_no_select 'input[required]'
   end
 
   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']
+    with_input_for @user, :name, :check_boxes, collection: %w[Jose Carlos]
     assert_select 'input.required'
     assert_no_select 'input[aria-required]'
   end
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } } ) do
-      with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
+      with_input_for @user, :gender, :check_boxes, collection: %i[male female]
       assert_select 'input[type=checkbox][value=male]'
       assert_select 'input[type=checkbox][value=female]'
       assert_select 'label.collection_check_boxes', 'Male'
@@ -43,9 +40,9 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } } ) do
-      with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
+      with_input_for @user, :gender, :check_boxes, collection: %i[male female]
       assert_select 'input[type=checkbox][value=male]'
       assert_select 'input[type=checkbox][value=female]'
       assert_select 'label.collection_check_boxes', 'Male'
@@ -55,11 +52,11 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } } ) do
       @user.gender = 'male'
 
-      with_input_for @user, :gender, :check_boxes, collection: [:male, :female]
+      with_input_for @user, :gender, :check_boxes, collection: %i[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'
@@ -264,7 +261,7 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
 
   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]
+      with_input_for @user, :gender, :check_boxes, collection: %i[male female]
 
       assert_no_select 'label.checkbox'
     end
@@ -272,7 +269,7 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
 
   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'
+      with_input_for @user, :gender, :check_boxes, collection: %i[male female], item_wrapper_class: 'custom'
 
       assert_no_select 'label.checkbox'
       assert_select 'span.custom'
@@ -282,7 +279,7 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
   test 'input check boxes with nested style and namespace uses the right for attribute' do
     swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
       with_concat_form_for @user, namespace: :foo do |f|
-        concat f.input :gender, as: :check_boxes, collection: [:male, :female]
+        concat f.input :gender, as: :check_boxes, collection: %i[male female]
       end
 
       assert_select 'label[for=foo_user_gender_male]'
@@ -293,11 +290,34 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
   test 'input check boxes with nested style and index uses the right for attribute' do
     swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
       with_concat_form_for @user, index: 1 do |f|
-        concat f.input :gender, as: :check_boxes, collection: [:male, :female]
+        concat f.input :gender, as: :check_boxes, collection: %i[male female]
       end
 
       assert_select 'label[for=user_1_gender_male]'
       assert_select 'label[for=user_1_gender_female]'
     end
   end
+
+  test 'input check boxes with nested style accepts non-string attribute as label' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :amount,
+                            :check_boxes,
+                            collection: { 100 => 'hundred', 200 => 'two_hundred' },
+                            label_method: :first,
+                            value_method: :second
+
+      assert_select 'input[type=checkbox][value=hundred]'
+      assert_select 'input[type=checkbox][value=two_hundred]'
+      assert_select 'span.checkbox > label', '100'
+      assert_select 'span.checkbox > label', '200'
+    end
+  end
+
+  test 'input check boxes with inline style support label custom classes' do
+    swap SimpleForm, boolean_style: :inline do
+      with_input_for @user, :gender, :check_boxes, collection: %i[male female], item_label_class: 'beautiful-label'
+
+      assert_select 'label.beautiful-label', count: 2
+    end
+  end
 end

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -1,11 +1,8 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
 class CollectionRadioButtonsInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionRadioButtonsInput.reset_i18n_cache :boolean_collection
-  end
-
   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'
@@ -43,13 +40,13 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   end
 
   test 'input radio does not include for attribute by default' do
-    with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
+    with_input_for @user, :gender, :radio_buttons, collection: %i[male female]
     assert_select 'label'
     assert_no_select 'label[for=user_gender]'
   end
 
   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' }
+    with_input_for @user, :gender, :radio_buttons, collection: %i[male female], label_html: { for: 'gender' }
     assert_select 'label[for=gender]'
   end
 
@@ -61,7 +58,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   end
 
   test 'input allows overriding collection for radio types' do
-    with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :radio_buttons, collection: %w[Jose Carlos]
     assert_select 'input[type=radio][value=Jose]'
     assert_select 'input[type=radio][value=Carlos]'
     assert_select 'label.collection_radio_buttons[for=user_name_jose]', 'Jose'
@@ -70,9 +67,9 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } } ) do
-      with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
+      with_input_for @user, :gender, :radio_buttons, collection: %i[male female]
       assert_select 'input[type=radio][value=male]'
       assert_select 'input[type=radio][value=female]'
       assert_select 'label.collection_radio_buttons[for=user_gender_male]', 'Male'
@@ -82,9 +79,9 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } } ) do
-      with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
+      with_input_for @user, :gender, :radio_buttons, collection: %i[male female]
       assert_select 'input[type=radio][value=male]'
       assert_select 'input[type=radio][value=female]'
       assert_select 'label.collection_radio_buttons[for=user_gender_male]', 'Male'
@@ -97,7 +94,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
       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]
+        with_input_for @user, :gender, :radio_buttons, collection: %i[male female]
         assert_select 'input[type=radio][value=male]'
         assert_select 'input[type=radio][value=female]'
         assert_select 'label[for=user_gender_male] strong', 'Male'
@@ -111,7 +108,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
       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]
+        with_input_for @user, :gender, :radio_buttons, collection: %i[male female]
         assert_select 'input[type=radio][value=male]'
         assert_select 'input[type=radio][value=female]'
         assert_select 'label[for=user_gender_male]', 'Male'
@@ -122,7 +119,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input marks the current radio value by default' do
     @user.name = "Carlos"
-    with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :radio_buttons, collection: %w[Jose Carlos]
     assert_select 'input[type=radio][value=Carlos][checked=checked]'
   end
 
@@ -132,7 +129,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   end
 
   test 'input allows using a collection with text/value arrays' do
-    with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose'], ['Carlos', 'carlos']]
+    with_input_for @user, :name, :radio_buttons, collection: [%w[Jose jose], %w[Carlos carlos]]
     assert_select 'input[type=radio][value=jose]'
     assert_select 'input[type=radio][value=carlos]'
     assert_select 'label.collection_radio_buttons', 'Jose'
@@ -140,14 +137,14 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   end
 
   test 'input allows using a collection with a Proc' do
-    with_input_for @user, :name, :radio_buttons, collection: Proc.new { ['Jose', 'Carlos' ] }
+    with_input_for @user, :name, :radio_buttons, collection: proc { %w[Jose Carlos] }
     assert_select 'label.collection_radio_buttons', 'Jose'
     assert_select 'label.collection_radio_buttons', 'Carlos'
   end
 
   test 'input allows overriding only label method for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose', 'Carlos'],
+                          collection: %w[Jose Carlos],
                           label_method: :upcase
     assert_select 'label.collection_radio_buttons', 'JOSE'
     assert_select 'label.collection_radio_buttons', 'CARLOS'
@@ -155,7 +152,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input allows overriding only value method for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose', 'Carlos'],
+                          collection: %w[Jose Carlos],
                           value_method: :upcase
     assert_select 'input[type=radio][value=JOSE]'
     assert_select 'input[type=radio][value=CARLOS]'
@@ -163,7 +160,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input allows overriding label and value method for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose', 'Carlos'],
+                          collection: %w[Jose Carlos],
                           label_method: :upcase,
                           value_method: :downcase
     assert_select 'input[type=radio][value=jose]'
@@ -174,9 +171,9 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   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 },
-                          value_method: lambda { |i| i.downcase }
+                          collection: %w[Jose Carlos],
+                          label_method: ->(i) { i.upcase },
+                          value_method: ->(i) { i.downcase }
     assert_select 'input[type=radio][value=jose]'
     assert_select 'input[type=radio][value=carlos]'
     assert_select 'label.collection_radio_buttons', 'JOSE'
@@ -184,13 +181,13 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   end
 
   test 'collection input with radio type generates required html attribute' do
-    with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :radio_buttons, collection: %w[Jose Carlos]
     assert_select 'input[type=radio].required'
     assert_select 'input[type=radio][required]'
   end
 
   test 'collection input with radio type generates aria-required html attribute' do
-    with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :radio_buttons, collection: %w[Jose Carlos]
     assert_select 'input[type=radio].required'
     assert_select 'input[type=radio][aria-required=true]'
   end
@@ -387,7 +384,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   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]
+      with_input_for @user, :gender, :radio_buttons, collection: %i[male female]
 
       assert_no_select 'label.radio'
     end
@@ -395,7 +392,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input radio 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'
+      with_input_for @user, :gender, :radio_buttons, collection: %i[male female], item_wrapper_class: 'custom'
 
       assert_no_select 'label.radio'
       assert_select 'span.custom'
@@ -405,7 +402,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   test 'input radio with nested style and namespace uses the right for attribute' do
     swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
       with_concat_form_for @user, namespace: :foo do |f|
-        concat f.input :gender, as: :radio_buttons, collection: [:male, :female]
+        concat f.input :gender, as: :radio_buttons, collection: %i[male female]
       end
 
       assert_select 'label[for=foo_user_gender_male]'
@@ -416,11 +413,34 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   test 'input radio with nested style and index uses the right for attribute' do
     swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
       with_concat_form_for @user, index: 1 do |f|
-        concat f.input :gender, as: :radio_buttons, collection: [:male, :female]
+        concat f.input :gender, as: :radio_buttons, collection: %i[male female]
       end
 
       assert_select 'label[for=user_1_gender_male]'
       assert_select 'label[for=user_1_gender_female]'
     end
   end
+
+  test 'input radio with nested style accetps non-string attribute as label' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :amount,
+                            :radio_buttons,
+                            collection: { 100 => 'hundred', 200 => 'two_hundred' },
+                            label_method: :first,
+                            value_method: :second
+
+      assert_select 'input[type=radio][value=hundred]'
+      assert_select 'input[type=radio][value=two_hundred]'
+      assert_select 'span.radio > label', '100'
+      assert_select 'span.radio > label', '200'
+    end
+  end
+
+  test 'input check boxes with inline style support label custom classes' do
+    swap SimpleForm, boolean_style: :inline do
+      with_input_for @user, :gender, :radio_buttons, collection: %i[male female], item_label_class: 'beautiful-label'
+
+      assert_select 'label.beautiful-label', count: 2
+    end
+  end
 end