simple_form 3.0.4 → 5.0.3

data/test/inputs/collection_select_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -6,14 +7,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,67 +22,67 @@ class CollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should allow overriding collection for select types' do
-    with_input_for @user, :name, :select, collection: ['Jose', 'Carlos']
+  test 'input allows overriding collection for select types' do
+    with_input_for @user, :name, :select, collection: %w[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
-      with_input_for @user, :gender, :select, collection: [:male, :female]
+      gender: { male: 'Male', female: 'Female' }
+    } } }) do
+      with_input_for @user, :gender, :select, collection: %i[male female]
       assert_select 'select.select#user_gender'
       assert_select 'select option', 'Male'
       assert_select 'select option', 'Female'
     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
-      with_input_for @user, :gender, :select, collection: [:male, :female]
+      gender: { male: 'Male', female: 'Female' }
+    } } }) do
+      with_input_for @user, :gender, :select, collection: %i[male female]
       assert_select 'select.select#user_gender'
       assert_select 'select option', 'Male'
       assert_select 'select option', 'Female'
     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']
+    with_input_for @user, :name, :select, collection: %w[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,179 +93,290 @@ 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=]', ''
+    assert_select 'select option[value=""]', ''
   end
 
-  test 'input should not set include blank if otherwise is told' do
+  test 'input translates 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 translates 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 does 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 does 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 does 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 does 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 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=]', ''
+    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=]', ''
+    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=]', ''
+    assert_no_select 'select option[value=""]', ''
+  end
+
+  test 'input translates 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 detect label and value on collections' do
+  test 'input translates 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 does 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 does 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 uses 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 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'
+    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
-    with_input_for @user, :description, :select, collection: ["Jose", "Carlos"], disabled: true
+  test 'input disables the anothers components when the option is a object' do
+    with_input_for @user, :description, :select, collection: %w[Jose Carlos], disabled: true
     assert_no_select 'select option[value=Jose][disabled=disabled]', 'Jose'
     assert_no_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
     assert_select 'select[disabled=disabled]'
     assert_select 'div.disabled'
   end
 
-  test 'input should not disable the anothers components when the option is a object' do
-    with_input_for @user, :description, :select, collection: ["Jose", "Carlos"], disabled: 'Jose'
+  test 'input does not disable the anothers components when the option is a object' do
+    with_input_for @user, :description, :select, collection: %w[Jose Carlos], disabled: 'Jose'
     assert_select 'select option[value=Jose][disabled=disabled]', 'Jose'
     assert_no_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
     assert_no_select 'select[disabled=disabled]'
     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 },
-                          value_method: lambda { |i| i.downcase }
+                          collection: %w[Jose Carlos],
+                          label_method: ->(i) { i.upcase },
+                          value_method: ->(i) { i.downcase }
     assert_select 'select option[value=jose]', "JOSE"
     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 }
+                          collection: %w[Jose Carlos],
+                          label_method: ->(i) { i.upcase }
     assert_select 'select option[value=Jose]', "JOSE"
     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 }
+                          collection: %w[Jose Carlos],
+                          value_method: ->(i) { i.downcase }
     assert_select 'select option[value=jose]', "Jose"
     assert_select 'select option[value=carlos]', "Carlos"
   end
 
-  test 'input should allow symbols for collections' do
-    with_input_for @user, :name, :select, collection: [:jose, :carlos]
+  test 'input allows symbols for collections' do
+    with_input_for @user, :name, :select, collection: %i[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
-    with_input_for @user, :name, :select, include_blank: true, collection: ['Jose', 'Carlos']
+  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: %w[Jose Carlos]
+    assert_select 'select.required'
+    assert_select 'select[required]'
+  end
+
+  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: %w[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']
+  test "collection input generated aria-label should contain 'true'" do
+    with_input_for @user, :age, :select, collection: 18..30, prompt: "Please select foo"
+    assert_select 'select.required'
+    assert_select 'select[aria-required=true]'
+  end
+
+  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: %w[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
-    with_input_for @user, :name, :select, include_blank: false, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
+  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: %w[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
-    with_input_for @user, :name, :select, include_blank: true, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
+  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: %w[Jose Carlos]
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
   test 'with a blank option, a collection input of type select has an aria-required html attribute' do
-    with_input_for @user, :name, :select, include_blank: true, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :select, include_blank: true, collection: %w[Jose Carlos]
     assert_select 'select.required'
     assert_select 'select[aria-required=true]'
   end
 
   test 'without a blank option, a collection input of type select does not have an aria-required html attribute' do
-    with_input_for @user, :name, :select, include_blank: false, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :select, include_blank: false, collection: %w[Jose Carlos]
     assert_select 'select.required'
     assert_no_select 'select[aria-required]'
   end
 
   test 'without a blank option and with a multiple option, a collection input of type select has an aria-required html attribute' do
-    with_input_for @user, :name, :select, include_blank: false, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :select, include_blank: false, input_html: { multiple: true }, collection: %w[Jose Carlos]
     assert_select 'select.required'
     assert_select 'select[aria-required=true]'
   end
 
   test 'with a blank option and a multiple option, a collection input of type select has an aria-required html attribute' do
-    with_input_for @user, :name, :select, include_blank: true, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
+    with_input_for @user, :name, :select, include_blank: true, input_html: { multiple: true }, collection: %w[Jose Carlos]
     assert_select 'select.required'
     assert_select 'select[aria-required]'
   end
 
-  test 'input should allow disabled options with a lambda for collection select' do
-    with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
-      disabled: lambda { |x| x == "Carlos" }
+  test 'input allows disabled options with a lambda for collection select' do
+    with_input_for @user, :name, :select, collection: %w[Carlos Antonio],
+      disabled: ->(x) { x == "Carlos" }
     assert_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
     assert_select 'select option[value=Antonio]', 'Antonio'
     assert_no_select 'select option[value=Antonio][disabled]'
   end
 
-  test 'input should allow 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 }
+  test 'input allows disabled and label method with lambdas for collection select' do
+    with_input_for @user, :name, :select, collection: %w[Carlos Antonio],
+      disabled: ->(x) { x == "Carlos" }, label_method: ->(x) { x.upcase }
     assert_select 'select option[value=Carlos][disabled=disabled]', 'CARLOS'
     assert_select 'select option[value=Antonio]', 'ANTONIO'
     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
-    with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
-      disabled: "Carlos", label_method: lambda { |x| x.upcase }
+  test 'input allows a non lambda disabled option with lambda label method for collections' do
+    with_input_for @user, :name, :select, collection: %w[Carlos Antonio],
+      disabled: "Carlos", label_method: ->(x) { x.upcase }
     assert_select 'select option[value=Carlos][disabled=disabled]', 'CARLOS'
     assert_select 'select option[value=Antonio]', 'ANTONIO'
     assert_no_select 'select option[value=Antonio][disabled]'
   end
 
-  test 'input should allow 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 }
+  test 'input allows selected and label method with lambdas for collection select' do
+    with_input_for @user, :name, :select, collection: %w[Carlos Antonio],
+      selected: ->(x) { x == "Carlos" }, label_method: ->(x) { x.upcase }
     assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
     assert_select 'select option[value=Antonio]', 'ANTONIO'
     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
-    with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
-      selected: "Carlos", label_method: lambda { |x| x.upcase }
+  test 'input allows a non lambda selected option with lambda label method for collection select' do
+    with_input_for @user, :name, :select, collection: %w[Carlos Antonio],
+      selected: "Carlos", label_method: ->(x) { x.upcase }
     assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
     assert_select 'select option[value=Antonio]', 'ANTONIO'
     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 }
+    with_input_for @user, :name, :select, collection: %w[Carlos Antonio],
+      label_method: ->(x) { x.upcase }
     assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
     assert_select 'select option[value=Antonio]', 'ANTONIO'
     assert_no_select 'select option[value=Antonio][selected]'

data/test/inputs/color_input_test.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class ColorInputTest < ActionView::TestCase
+  test 'input generates a color field' do
+    with_input_for @user, :favorite_color, :color
+    assert_select 'input[type=color].color#user_favorite_color'
+  end
+end