simple_form 4.0.1 → 5.1.0

data/test/form_builder/error_test.rb

@@ -224,6 +224,12 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error'
   end
 
+  test 'input with custom error works when form does not use a model' do
+    with_form_for :user, :active, error: "Super User Active! cannot be blank"
+
+    assert_select 'span.error'
+  end
+
   test 'input with custom error works when using full_error component' do
     swap_wrapper :default, custom_wrapper_with_full_error do
       error_text = "Super User Name! cannot be blank"

data/test/form_builder/general_test.rb

@@ -239,31 +239,29 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form select#user_updated_at_1i.datetime'
   end
 
-  test 'builder generates file for file columns' do
-    @user.avatar = MiniTest::Mock.new
-    @user.avatar.expect(:public_filename, true)
-    @user.avatar.expect(:!, false)
-
-    with_form_for @user, :avatar
-    assert_select 'form input#user_avatar.file'
+  test 'builder generates file input for ActiveStorage >= 5.2 and Refile >= 0.2.0 <= 0.4.0' do
+    with_form_for UserWithAttachment.build, :avatar
+    assert_select 'form input#user_with_attachment_avatar.file'
   end
 
-  test 'builder generates file for activestorage entries' do
-    @user.avatar = MiniTest::Mock.new
-    @user.avatar.expect(:attached?, false)
-    @user.avatar.expect(:!, false)
+  test 'builder generates file input for ActiveStorage::Attached::Many' do
+    with_form_for UserWithAttachment.build, :avatars
+    assert_select 'form input#user_with_attachment_avatars.file'
+  end
 
-    with_form_for @user, :avatar
-    assert_select 'form input#user_avatar.file'
+  test 'builder generates file input for Refile >= 0.3.0 and CarrierWave >= 0.2.2' do
+    with_form_for UserWithAttachment.build, :cover
+    assert_select 'form input#user_with_attachment_cover.file'
   end
 
-  test 'builder generates file for attributes that are real db columns but have file methods' do
-    @user.home_picture = MiniTest::Mock.new
-    @user.home_picture.expect(:mounted_as, true)
-    @user.home_picture.expect(:!, false)
+  test 'builder generates file input for Refile >= 0.4.0 and Shrine >= 0.9.0' do
+    with_form_for UserWithAttachment.build, :profile_image
+    assert_select 'form input#user_with_attachment_profile_image.file'
+  end
 
-    with_form_for @user, :home_picture
-    assert_select 'form input#user_home_picture.file'
+  test 'builder generates file input for Paperclip ~> 2.0' do
+    with_form_for UserWithAttachment.build, :portrait
+    assert_select 'form input#user_with_attachment_portrait.file'
   end
 
   test 'build generates select if a collection is given' do
@@ -271,6 +269,12 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form select#user_age.select'
   end
 
+  test 'builder does not generate url fields for columns that contain only the letters url' do
+    with_form_for @user, :hourly
+    assert_no_select 'form input#user_url.string.url'
+    assert_select 'form input#user_hourly.string'
+  end
+
   test 'builder allows overriding default input type for text' do
     with_form_for @user, :name, as: :text
     assert_no_select 'form input#user_name'

data/test/form_builder/input_field_test.rb

@@ -3,12 +3,6 @@ require 'test_helper'
 
 # Tests for f.input_field
 class InputFieldTest < ActionView::TestCase
-  def with_input_field_for(object, *args)
-    with_concat_form_for(object) do |f|
-      f.input_field(*args)
-    end
-  end
-
   test "builder input_field only renders the input tag, nothing else" do
     with_input_field_for @user, :name
 
@@ -85,13 +79,13 @@ class InputFieldTest < ActionView::TestCase
   test 'builder input_field infers pattern from attributes' do
     with_input_field_for @other_validating_user, :country, as: :string, pattern: true
 
-    assert_select 'input[pattern="\w+"]'
+    assert_select "input:match('pattern', ?)", /\w+/
   end
 
   test 'builder input_field accepts custom pattern' do
     with_input_field_for @other_validating_user, :country, as: :string, pattern: '\d+'
 
-    assert_select 'input[pattern="\d+"]'
+    assert_select "input:match('pattern', ?)", /\\d+/
   end
 
   test 'builder input_field uses readonly component' do
@@ -138,7 +132,7 @@ class InputFieldTest < ActionView::TestCase
     swap_wrapper :default, custom_wrapper_with_html5_components do
       with_input_field_for @user, :name, pattern: '\w+'
 
-      assert_select 'input[pattern="\w+"]'
+      assert_select "input:match('pattern', ?)", /\w+/
     end
   end
 

data/test/form_builder/label_test.rb

@@ -19,7 +19,7 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
-  test 'builder generates a label for the boolean attrbiute' do
+  test 'builder generates a label for the boolean attribute' do
     with_label_for @user, :name, as: :boolean
     assert_select 'label.boolean[for=user_name]', /Name/
     assert_no_select 'label[as=boolean]'

data/test/form_builder/wrapper_test.rb

@@ -59,6 +59,13 @@ class WrapperTest < ActionView::TestCase
     assert_no_select 'input.is-invalid'
   end
 
+  test 'wrapper does not determine if valid class is needed when it is set to nil' do
+    @user.instance_eval { undef errors }
+    with_form_for @user, :name, wrapper: custom_wrapper_with_input_valid_class(valid_class: nil)
+
+    assert_no_select 'div.field_without_errors'
+  end
+
   test 'wrapper adds hint class for attribute with a hint' do
     with_form_for @user, :name, hint: 'hint'
     assert_select 'div.field_with_hint'
@@ -161,7 +168,7 @@ class WrapperTest < ActionView::TestCase
   test 'custom wrappers can have full error message on attributes' do
     swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :name
-      assert_select 'span.error', "Name cannot be blank"
+      assert_select 'span.error', "Super User Name! cannot be blank"
     end
   end
 

data/test/inputs/boolean_input_test.rb

@@ -107,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'

data/test/inputs/collection_check_boxes_input_test.rb

@@ -3,10 +3,6 @@
 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: %i[male female]
     assert_select 'label'
@@ -316,4 +312,12 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
       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

@@ -3,10 +3,6 @@
 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'
@@ -439,4 +435,12 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
       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

data/test/inputs/collection_select_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionSelectInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionSelectInput.reset_i18n_cache :boolean_collection
-  end
-
   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'
@@ -284,6 +280,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select[required]'
   end
 
+  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'

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

@@ -6,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
@@ -80,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
 

data/test/inputs/disabled_test.rb

@@ -76,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

@@ -15,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
@@ -109,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/priority_input_test.rb

@@ -6,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
 
@@ -44,15 +36,15 @@ class PriorityInputTest < ActionView::TestCase
     assert_no_select 'select option[value=""]', /^$/
   end
 
-  test 'priority input does not generate invalid required html attribute' do
+  test 'priority input does generate select element with required html attribute' do
     with_input_for @user, :country, :country
     assert_select 'select.required'
-    assert_no_select 'select[required]'
+    assert_select 'select[required]'
   end
 
-  test 'priority input does not generate invalid aria-required html attribute' do
+  test 'priority input does generate select element with aria-required html attribute' do
     with_input_for @user, :country, :country
     assert_select 'select.required'
-    assert_no_select 'select[aria-required]'
+    assert_select 'select[aria-required]'
   end
 end

data/test/inputs/rich_text_area_input_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+require 'test_helper'
+
+class RichTextAreaInputTest < ActionView::TestCase
+  test 'input generates a text area for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text#user_description'
+  end
+
+  test 'input generates a text area for text attributes that accept placeholder' do
+    with_input_for @user, :description, :text, placeholder: 'Put in some text'
+    assert_select 'textarea.text[placeholder="Put in some text"]'
+  end
+end

data/test/inputs/string_input_test.rb

@@ -8,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]']"
@@ -38,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"]'
@@ -88,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
@@ -105,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