simple_form 3.4.0 → 4.1.0

data/test/inputs/collection_select_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -22,7 +23,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   end
 
   test 'input allows overriding collection for select types' do
-    with_input_for @user, :name, :select, collection: ['Jose', 'Carlos']
+    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'
@@ -30,9 +31,9 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } }) do
-      with_input_for @user, :gender, :select, collection: [:male, :female]
+      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'
@@ -41,9 +42,9 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   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'}
+      gender: { male: 'Male', female: 'Female' }
     } } }) do
-      with_input_for @user, :gender, :select, collection: [:male, :female]
+      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'
@@ -52,7 +53,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   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
 
@@ -113,7 +114,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   test 'input translates include blank with a default' do
     store_translations(:en, simple_form: { include_blanks: { defaults: {
-      age: 'Rather not say',
+      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'
@@ -182,7 +183,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   test 'input translates prompt with a default' do
     store_translations(:en, simple_form: { prompts: { defaults: {
-      age: 'Select age:',
+      age: 'Select age:'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
       assert_select 'select option[value=""]', 'Select age:'
@@ -224,7 +225,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   end
 
   test 'input disables the anothers components when the option is a object' do
-    with_input_for @user, :description, :select, collection: ["Jose", "Carlos"], disabled: true
+    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]'
@@ -232,7 +233,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   end
 
   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'
+    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]'
@@ -241,126 +242,126 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   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 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 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 allows symbols for collections' do
-    with_input_for @user, :name, :select, collection: [:jose, :carlos]
+    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 generates required html attribute only with blank option' 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[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: ['Jose', 'Carlos']
+    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 does not generate required html attribute without blank option' 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[required]'
     assert_no_select 'select[aria-required=true]'
   end
 
   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']
+    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 generates required html attribute with blank option' 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[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 allows disabled options with a lambda for collection select' do
-    with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
-      disabled: lambda { |x| x == "Carlos" }
+    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 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 }
+    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 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 }
+    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 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 }
+    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 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 }
+    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]'
@@ -368,8 +369,8 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   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

data/test/inputs/datetime_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -5,12 +6,7 @@ require 'test_helper'
 class DateTimeInputWithHtml5Test < ActionView::TestCase
   test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enbled' do
     with_input_for @user, :created_at, :datetime, html5: true
-
-    if ActionPack::VERSION::STRING >= '5'
-      assert_select 'input[type="datetime-local"]'
-    elsif ActionPack::VERSION::STRING < '5'
-      assert_select 'input[type="datetime"]'
-    end
+    assert_select 'input[type="datetime-local"]'
   end
 
   test 'input generates a datetime select for datetime attributes' do
@@ -79,12 +75,7 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
   test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enabled' do
     swap_wrapper do
       with_input_for @user, :created_at, :datetime, html5: true
-
-      if ActionPack::VERSION::STRING >= '5'
-        assert_select 'input[type="datetime-local"]'
-      elsif ActionPack::VERSION::STRING < '5'
-        assert_select 'input[type="datetime"]'
-      end
+      assert_select 'input[type="datetime-local"]'
     end
   end
 
@@ -150,26 +141,26 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
   end
 
   test 'label uses i18n to get target for date input type' do
-    store_translations(:en, date: { order: ['month', 'day', 'year'] }) do
+    store_translations(:en, date: { order: %w[month day year] }) do
       with_input_for :project, :created_at, :date, html5: false
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
   test 'label uses i18n to get target for datetime input type' do
-    store_translations(:en, date: { order: ['month', 'day', 'year'] }) do
+    store_translations(:en, date: { order: %w[month day year] }) do
       with_input_for :project, :created_at, :datetime, html5: false
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
   test 'label uses order to get target when date input type' do
-    with_input_for :project, :created_at, :date, order: ['month', 'year', 'day'], html5: false
+    with_input_for :project, :created_at, :date, order: %w[month year day], html5: false
     assert_select 'label[for=project_created_at_2i]'
   end
 
   test 'label uses order to get target when datetime input type' do
-    with_input_for :project, :created_at, :datetime, order: ['month', 'year', 'day'], html5: false
+    with_input_for :project, :created_at, :datetime, order: %w[month year day], html5: false
     assert_select 'label[for=project_created_at_2i]'
   end
 

data/test/inputs/disabled_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DisabledTest < ActionView::TestCase
@@ -75,4 +76,17 @@ class DisabledTest < ActionView::TestCase
     with_input_for @user, :created_at, :datetime
     assert_no_select 'select.datetime.disabled[disabled]'
   end
+
+  test 'input_field collection allows disabled select' do
+    with_input_field_for @user, :description, collection: ['foo', 'bar'], disabled: true
+    assert_select 'select[disabled]'
+    assert_no_select 'option[disabled]'
+  end
+
+  test 'input_field collection allows individual disabled options' do
+    with_input_field_for @user, :description, collection: ['foo', 'bar'], disabled: 'bar'
+    assert_no_select 'select[disabled]'
+    assert_no_select 'option[disabled][value=foo]'
+    assert_select 'option[disabled][value=bar]'
+  end
 end

data/test/inputs/discovery_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DiscoveryTest < ActionView::TestCase
@@ -14,6 +15,7 @@ class DiscoveryTest < ActionView::TestCase
         Object.send :remove_const, :CustomizedInput
         Object.send :remove_const, :DeprecatedInput
         Object.send :remove_const, :CollectionSelectInput
+        Object.send :remove_const, :FileInput
         CustomInputs.send :remove_const, :CustomizedInput
         CustomInputs.send :remove_const, :PasswordInput
         CustomInputs.send :remove_const, :NumericInput
@@ -108,6 +110,26 @@ class DiscoveryTest < ActionView::TestCase
     end
   end
 
+  test 'does not duplicate the html classes giving a extra class' do
+    discovery do
+      swap SimpleForm, input_class: 'custom-default-input-class' do
+        with_form_for @user, :active, as: :select
+        assert_select 'form select#user_active.select' do
+          # Make sure class list contains 'chosen' only once.
+          assert_select ":match('class', ?)", /^(?!.*\bchosen\b.*\bchosen\b).*\bchosen\b.*$/
+        end
+      end
+    end
+  end
+
+  test 'new inputs can override the default input_html_classes' do
+    discovery do
+      with_form_for @user, :avatar, as: :file
+      assert_no_select 'form input[type=file]#user_avatar.file.file-upload'
+      assert_select 'form input[type=file]#user_avatar.file-upload'
+    end
+  end
+  
   test 'inputs method without wrapper_options are deprecated' do
     discovery do
       assert_deprecated do

data/test/inputs/file_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 

data/test/inputs/general_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -119,12 +120,12 @@ class InputTest < ActionView::TestCase
   end
 
   test 'input as select with collection is generated properly when object is not present' do
-    with_input_for :project, :name, :select, collection: ['Jose', 'Carlos']
+    with_input_for :project, :name, :select, collection: %w[Jose Carlos]
     assert_select 'select.select#project_name'
   end
 
   test 'input does not generate empty css class' do
-    swap SimpleForm, generate_additional_classes_for: [:wrapper, :label] do
+    swap SimpleForm, generate_additional_classes_for: %i[wrapper label] do
       with_input_for :project, :name, :string
       assert_no_select 'input#project_name[class]'
     end

data/test/inputs/grouped_collection_select_input_test.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
 class GroupedCollectionSelectInputTest < ActionView::TestCase
   test 'grouped collection accepts array collection form' do
     with_input_for @user, :tag_ids, :grouped_select,
-      collection: [['Authors', ['Jose', 'Carlos']], ['General', ['Bob', 'John']]],
+      collection: [['Authors', %w[Jose Carlos]], ['General', %w[Bob John]]],
       group_method: :last
 
     assert_select 'select.grouped_select#user_tag_ids' do
@@ -31,7 +32,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
 
   test 'grouped collection accepts proc as collection' do
     with_input_for @user, :tag_ids, :grouped_select,
-      collection: Proc.new { [['Authors', ['Jose', 'Carlos']], ['General', ['Bob', 'John']]] },
+      collection: proc { [['Authors', %w[Jose Carlos]], ['General', %w[Bob John]]] },
       group_method: :last
 
     assert_select 'select.grouped_select#user_tag_ids' do
@@ -49,7 +50,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
 
   test 'grouped collection accepts hash collection form' do
     with_input_for @user, :tag_ids, :grouped_select,
-      collection: { 'Authors' => ['Jose', 'Carlos'], 'General' => ['Bob', 'John'] },
+      collection: { Authors: %w[Jose Carlos], General: %w[Bob John] },
       group_method: :last
 
     assert_select 'select.grouped_select#user_tag_ids' do
@@ -67,7 +68,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
 
   test 'grouped collection accepts group_label_method option' do
     with_input_for @user, :tag_ids, :grouped_select,
-      collection: { ['Jose', 'Carlos'] => 'Authors' },
+      collection: { %w[Jose Carlos] => 'Authors' },
       group_method: :first,
       group_label_method: :last
 
@@ -80,7 +81,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
   end
 
   test 'grouped collection finds default label methods on the group objects' do
-    option_list = ['Jose', 'Carlos']
+    option_list = %w[Jose Carlos]
 
     GroupedClass = Struct.new(:to_label, :options)
     group = GroupedClass.new("Authors", option_list)
@@ -117,7 +118,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
 
   test 'grouped collection accepts label and value methods options' do
     with_input_for @user, :tag_ids, :grouped_select,
-      collection: { 'Authors' => ['Jose', 'Carlos'] },
+      collection: { Authors: %w[Jose Carlos] },
       group_method: :last,
       label_method: :upcase,
       value_method: :downcase
@@ -132,10 +133,10 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
 
   test 'grouped collection allows overriding label and value methods using a lambda' do
     with_input_for @user, :tag_ids, :grouped_select,
-      collection: { 'Authors' => ['Jose', 'Carlos'] },
+      collection: { Authors: %w[Jose Carlos] },
       group_method: :last,
-      label_method: lambda { |i| i.upcase },
-      value_method: lambda { |i| i.downcase }
+      label_method: ->(i) { i.upcase },
+      value_method: ->(i) { i.downcase }
 
     assert_select 'select.grouped_select#user_tag_ids' do
       assert_select 'optgroup[label=Authors]' do
@@ -148,7 +149,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
   test 'grouped collection with associations' do
     tag_groups = [
       TagGroup.new(1, "Group of Tags", [Tag.new(1, "Tag 1"), Tag.new(2, "Tag 2")]),
-      TagGroup.new(2, "Other group", [Tag.new(3, "Tag 3"), Tag.new(4,"Tag 4")])
+      TagGroup.new(2, "Other group", [Tag.new(3, "Tag 3"), Tag.new(4, "Tag 4")])
     ]
 
     with_input_for @user, :tag_ids, :grouped_select,

data/test/inputs/hidden_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 

data/test/inputs/numeric_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -156,7 +157,7 @@ class NumericInputTest < ActionView::TestCase
     end
   end
 
-  [:integer, :float, :decimal].each do |type|
+  %i[integer float decimal].each do |type|
     test "#{type} input infers min value from attributes with greater than or equal validation" do
       with_input_for @validating_user, :age, type
       assert_select 'input[min="18"]'

data/test/inputs/priority_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -5,22 +6,14 @@ class PriorityInputTest < ActionView::TestCase
   test 'input generates a country select field' do
     with_input_for @user, :country, :country
     assert_select 'select#user_country'
-    if ActionPack::VERSION::STRING >= '5'
-      assert_select 'select option[value=BR]', 'Brazil'
-    elsif ActionPack::VERSION::STRING < '5'
-      assert_select 'select option[value=Brazil]', 'Brazil'
-    end
+    assert_select 'select option[value=BR]', 'Brazil'
     assert_no_select 'select option[value=""][disabled=disabled]'
   end
 
   test 'input generates a country select with SimpleForm default' do
     swap SimpleForm, country_priority: [ 'Brazil' ] do
       with_input_for @user, :country, :country
-      if ActionPack::VERSION::STRING >= '5'
-        assert_select 'select option[value="---------------"][disabled=disabled]'
-      elsif ActionPack::VERSION::STRING < '5'
-        assert_select 'select option[value=""][disabled=disabled]'
-      end
+      assert_select 'select option[value="---------------"][disabled=disabled]'
     end
   end
 

data/test/inputs/readonly_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class ReadonlyTest < ActionView::TestCase

data/test/inputs/required_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class RequiredTest < ActionView::TestCase

data/test/inputs/string_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -7,6 +8,11 @@ class StringInputTest < ActionView::TestCase
     assert_select "input#user_name[type=text][name='user[name]'][value='New in SimpleForm!']"
   end
 
+  test 'input maps text field to citext attribute' do
+    with_input_for @user, :name, :citext
+    assert_select "input#user_name[type=text][name='user[name]'][value='New in SimpleForm!']"
+  end
+
   test 'input generates a password field for password attributes' do
     with_input_for @user, :password, :password
     assert_select "input#user_password.password[type=password][name='user[password]']"
@@ -37,18 +43,6 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input.string[minlength="5"]'
   end
 
-  if ActionPack::VERSION::STRING < '5'
-    test 'input does not get maxlength from validation when tokenizer present' do
-      with_input_for @validating_user, :action, :string
-      assert_no_select 'input.string[maxlength]'
-    end
-
-    test 'input does not get minlength from validation when tokenizer present' do
-      with_input_for @validating_user, :action, :string
-      assert_no_select 'input.string[minlength]'
-    end
-  end
-
   test 'input gets maxlength from validation when :is option present' do
     with_input_for @validating_user, :home_picture, :string
     assert_select 'input.string[maxlength="12"]'
@@ -87,12 +81,12 @@ class StringInputTest < ActionView::TestCase
 
   test 'input infers pattern from attributes' do
     with_input_for @other_validating_user, :country, :string, pattern: true
-    assert_select 'input[pattern="\w+"]'
+    assert_select "input:match('pattern', ?)", /\w+/
   end
 
   test 'input infers pattern from attributes using proc' do
     with_input_for @other_validating_user, :name, :string, pattern: true
-    assert_select 'input[pattern="\w+"]'
+    assert_select "input:match('pattern', ?)", /\w+/
   end
 
   test 'input does not infer pattern from attributes if root default is false' do
@@ -104,7 +98,7 @@ class StringInputTest < ActionView::TestCase
 
   test 'input uses given pattern from attributes' do
     with_input_for @other_validating_user, :country, :string, input_html: { pattern: "\\d+" }
-    assert_select 'input[pattern="\d+"]'
+    assert_select "input:match('pattern', ?)", /\\d+/
   end
 
   test 'input does not use pattern if model has :without validation option' do
@@ -132,7 +126,7 @@ class StringInputTest < ActionView::TestCase
     end
   end
 
-  [:email, :url, :search, :tel].each do |type|
+  %i[email url search tel].each do |type|
     test "input allows type #{type}" do
       with_input_for @user, :name, type
       assert_select "input.string.#{type}"

data/test/inputs/text_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 

data/test/simple_form_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class SimpleFormTest < ActiveSupport::TestCase