simple_form 3.1.0 → 5.0.0

data/test/form_builder/general_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -30,6 +31,12 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder works with decorated object responsive to #to_model' do
+    assert_nothing_raised do
+      with_form_for @decorated_user, :name
+    end
+  end
+
   test 'builder input allows a block to configure input' do
     with_form_for @user, :name do
       text_field_tag :foo, :bar, id: :cool
@@ -46,8 +53,19 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder does not override custom input mappings for custom collection' do
+    swap SimpleForm, input_mappings: { /gender$/ => :check_boxes } do
+      with_concat_form_for @user do |f|
+        f.input :gender, collection: %i[male female]
+      end
+
+      assert_no_select 'select option', 'Male'
+      assert_select 'input[type=checkbox][value=male]'
+    end
+  end
+
   test 'builder allows to skip input_type class' do
-    swap SimpleForm, generate_additional_classes_for: [:label, :wrapper] do
+    swap SimpleForm, generate_additional_classes_for: %i[label wrapper] do
       with_form_for @user, :post_count
       assert_no_select "form input#user_post_count.integer"
       assert_select "form input#user_post_count"
@@ -108,9 +126,40 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder generates text areas for text columns' do
     with_form_for @user, :description
+    assert_no_select 'form input#user_description.string'
+    assert_select 'form textarea#user_description.text'
+  end
+
+  test 'builder generates text areas for text columns when hinted' do
+    with_form_for @user, :description, as: :text
+    assert_no_select 'form input#user_description.string'
     assert_select 'form textarea#user_description.text'
   end
 
+  test 'builder generates text field for text columns when hinted' do
+    with_form_for @user, :description, as: :string
+    assert_no_select 'form textarea#user_description.text'
+    assert_select 'form input#user_description.string'
+  end
+
+  test 'builder generates text areas for hstore columns' do
+    with_form_for @user, :hstore
+    assert_no_select 'form input#user_hstore.string'
+    assert_select 'form textarea#user_hstore.text'
+  end
+
+  test 'builder generates text areas for json columns' do
+    with_form_for @user, :json
+    assert_no_select 'form input#user_json.string'
+    assert_select 'form textarea#user_json.text'
+  end
+
+  test 'builder generates text areas for jsonb columns' do
+    with_form_for @user, :jsonb
+    assert_no_select 'form input#user_jsonb.string'
+    assert_select 'form textarea#user_jsonb.text'
+  end
+
   test 'builder generates a checkbox for boolean columns' do
     with_form_for @user, :active
     assert_select 'form input[type=checkbox]#user_active.boolean'
@@ -128,7 +177,16 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder generates uuid fields for uuid columns' do
     with_form_for @user, :uuid
-    assert_select 'form input#user_uuid.string.uuid'
+    if defined? ActiveModel::Type
+      assert_select 'form input#user_uuid.string.string'
+    else
+      assert_select 'form input#user_uuid.string.uuid'
+    end
+  end
+
+  test 'builder generates string fields for citext columns' do
+    with_form_for @user, :citext
+    assert_select 'form input#user_citext.string'
   end
 
   test 'builder generates password fields for columns that matches password' do
@@ -181,20 +239,24 @@ 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)
+  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
 
-    with_form_for @user, :avatar
-    assert_select 'form input#user_avatar.file'
+  test 'builder generates file input for Shrine >= 0.9.0, Refile >= 0.6.0 and CarrierWave >= 0.2.1' 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)
+  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
@@ -202,15 +264,25 @@ 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'
     assert_select 'form textarea#user_name.text'
+  end
 
+  test 'builder allows overriding default input type for radio_buttons' do
     with_form_for @user, :active, as: :radio_buttons
     assert_no_select 'form input[type=checkbox]'
     assert_select 'form input.radio_buttons[type=radio]', count: 2
+  end
 
+  test 'builder allows overriding default input type for string' do
     with_form_for @user, :born_at, as: :string
     assert_no_select 'form select'
     assert_select 'form input#user_born_at.string'
@@ -256,7 +328,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder does not propagate input options to wrapper with custom wrapper' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_input do
+    swap_wrapper :default, custom_wrapper_with_wrapped_input do
       with_form_for @user, :name, input_html: { class: 'my_input' }
       assert_no_select 'form div.input.my_input'
       assert_select 'form input.my_input.string'
@@ -264,7 +336,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder does not propagate label options to wrapper with custom wrapper' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_label do
+    swap_wrapper :default, custom_wrapper_with_wrapped_label do
       with_form_for @user, :name, label_html: { class: 'my_label' }
       assert_no_select 'form div.label.my_label'
       assert_select 'form label.my_label.string'
@@ -350,18 +422,18 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # DEFAULT OPTIONS
-  [:input, :input_field].each do |method|
+  %i[input input_field].each do |method|
     test "builder receives a default argument and pass it to the inputs when calling '#{method}'" do
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
-        f.send(method, :name)
+        f.public_send(method, :name)
       end
       assert_select 'input.default_class'
     end
 
     test "builder receives a default argument and pass it to the inputs without changing the defaults when calling '#{method}'" do
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
-        concat(f.send(method, :name))
-        concat(f.send(method, :credit_limit))
+        concat(f.public_send(method, :name))
+        concat(f.public_send(method, :credit_limit))
       end
 
       assert_select "input.string.default_class[name='user[name]']"
@@ -372,9 +444,9 @@ class FormBuilderTest < ActionView::TestCase
       @user.company = Company.new(1, 'Empresa')
 
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
-        concat(f.send(method, :name))
+        concat(f.public_send(method, :name))
         concat(f.simple_fields_for(:company) do |company_form|
-          concat(company_form.send(method, :name))
+          concat(company_form.public_send(method, :name))
         end)
       end
 

data/test/form_builder/hint_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 # Tests for f.hint
@@ -18,6 +19,11 @@ class HintTest < ActionView::TestCase
     assert_select 'span.hint', 'Use with care...'
   end
 
+  test 'hint is generated with decorated object responsive to #to_model' do
+    with_hint_for @decorated_user, :name, hint: 'Use with care...'
+    assert_select 'span.hint', 'Use with care...'
+  end
+
   test 'hint does not modify the options hash' do
     options = { hint: 'Use with care...' }
     with_hint_for @user, :name, options

data/test/form_builder/input_field_test.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 # Tests for f.input_field
 class InputFieldTest < ActionView::TestCase
   test "builder input_field only renders the input tag, nothing else" do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name
-    end
+    with_input_field_for @user, :name
+
     assert_select 'form > input.required.string'
     assert_no_select 'div.string'
     assert_no_select 'label'
@@ -13,45 +13,34 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'builder input_field allows overriding default input type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, as: :text
-    end
+    with_input_field_for @user, :name, as: :text
 
     assert_no_select 'input#user_name'
     assert_select 'textarea#user_name.text'
   end
 
   test 'builder input_field generates input type based on column type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :age
-    end
+    with_input_field_for @user, :age
 
     assert_select 'input[type=number].integer#user_age'
   end
 
   test 'builder input_field is able to disable any component' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :age, html5: false
-    end
+    with_input_field_for @user, :age, html5: false
 
     assert_no_select 'input[html5=false]#user_age'
     assert_select 'input[type=text].integer#user_age'
   end
 
   test 'builder input_field allows passing options to input tag' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, id: 'name_input', class: 'name'
-    end
+    with_input_field_for @user, :name, id: 'name_input', class: 'name'
 
     assert_select 'input.string.name#name_input'
   end
 
   test 'builder input_field does not modify the options hash' do
     options = { id: 'name_input', class: 'name' }
-
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, options
-    end
+    with_input_field_for @user, :name, options
 
     assert_select 'input.string.name#name_input'
     assert_equal({ id: 'name_input', class: 'name' }, options)
@@ -59,9 +48,7 @@ class InputFieldTest < ActionView::TestCase
 
 
   test 'builder input_field generates an input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, as: :integer, class: 'name'
-    end
+    with_input_field_for @user, :name, as: :integer, class: 'name'
 
     assert_no_select 'input.integer[input_html]'
     assert_no_select 'input.integer[as]'
@@ -71,67 +58,57 @@ class InputFieldTest < ActionView::TestCase
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
-
-      with_concat_form_for(@user) do |f|
-        f.input_field :name
-      end
+      with_input_field_for @user, :name
 
       assert_select 'input.string[placeholder="Name goes here"]'
     end
   end
 
   test 'builder input_field uses min_max component' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :age, as: :integer
-    end
+    with_input_field_for @other_validating_user, :age, as: :integer
 
     assert_select 'input[min="18"]'
   end
 
   test 'builder input_field does not use pattern component by default' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string
-    end
+    with_input_field_for @other_validating_user, :country, as: :string
 
     assert_no_select 'input[pattern="\w+"]'
   end
 
   test 'builder input_field infers pattern from attributes' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string, pattern: true
-    end
+    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 patter' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string, pattern: '\d+'
-    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
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :age, as: :integer, readonly: true
-    end
+    with_input_field_for @other_validating_user, :age, as: :integer, readonly: true
 
     assert_select 'input.integer.readonly[readonly]'
   end
 
   test 'builder input_field uses maxlength component' do
-    with_concat_form_for(@validating_user) do |f|
-      f.input_field :name, as: :string
-    end
+    with_input_field_for @validating_user, :name, as: :string
 
     assert_select 'input.string[maxlength="25"]'
   end
 
+  test 'builder input_field uses minlength component' do
+    with_input_field_for @validating_user, :name, as: :string
+
+    assert_select 'input.string[minlength="5"]'
+  end
+
   test 'builder collection input_field generates input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :status, collection: ['Open', 'Closed'], class: 'status', label_method: :to_s, value_method: :to_s
-    end
+    with_input_field_for @user, :status, collection: %w[Open Closed],
+      class: 'status', label_method: :to_s, value_method: :to_s
 
     assert_no_select 'select.status[input_html]'
     assert_no_select 'select.status[collection]'
@@ -140,50 +117,79 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'build input_field does not treat "boolean_style" as a HTML attribute' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :active, boolean_style: :nested
-    end
+    with_input_field_for @user, :active, boolean_style: :nested
 
     assert_no_select 'input.boolean[boolean_style]'
   end
 
+  test 'build input_field does not treat "prompt" as a HTML attribute' do
+    with_input_field_for @user, :attempts, collection: [1,2,3,4,5], prompt: :translate
+
+    assert_no_select 'select[prompt]'
+  end
+
   test 'build input_field without pattern component use the pattern string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, pattern: '\w+'
-      end
+    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
 
   test 'build input_field without placeholder component use the placeholder string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, placeholder: 'Placeholder'
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, placeholder: 'Placeholder'
 
       assert_select 'input[placeholder="Placeholder"]'
     end
   end
 
   test 'build input_field without maxlength component use the maxlength string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, maxlength: 5
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, maxlength: 5
 
       assert_select 'input[maxlength="5"]'
     end
   end
 
+  test 'build input_field without minlength component use the minlength string' do
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, minlength: 5
+
+      assert_select 'input[minlength="5"]'
+    end
+  end
+
   test 'build input_field without readonly component use the readonly string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, readonly: true
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, readonly: true
 
       assert_select 'input[readonly="readonly"]'
     end
   end
+
+  test 'adds valid class to input_field when it is configured' do
+    swap SimpleForm, input_field_valid_class: 'is-valid' do
+      @user.instance_eval { undef errors }
+      with_input_field_for @user, :name
+
+      assert_select 'input.string.required.is-valid'
+    end
+  end
+
+  test 'adds error class to input_field when it is configured' do
+    swap SimpleForm, input_field_error_class: 'is-invalid' do
+      with_input_field_for @user, :name
+
+      assert_select 'input.string.required.is-invalid'
+    end
+  end
+
+  test 'does not add validation classes to input_field when it is not configured' do
+    swap SimpleForm, input_field_error_class: nil, input_field_valid_class: nil do
+      with_input_field_for @user, :name
+
+      assert_select 'input.string.required'
+    end
+  end
 end

data/test/form_builder/label_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -13,6 +14,11 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder generates a label for the attribute with decorated object responsive to #to_model' do
+    with_label_for @decorated_user, :name
+    assert_select 'label.string[for=user_name]', /Name/
+  end
+
   test 'builder generates a label for the boolean attrbiute' do
     with_label_for @user, :name, as: :boolean
     assert_select 'label.boolean[for=user_name]', /Name/
@@ -29,6 +35,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
+  test 'builder adds a disabled class to label if the attribute is disabled' do
+    with_label_for @validating_user, :name, disabled: true
+    assert_select 'label.string.disabled[for=validating_user_name]', /Name/
+  end
+
+  test 'builder does not add a disabled class to label if the attribute is not disabled' do
+    with_label_for @validating_user, :name, disabled: false
+    assert_no_select 'label.string.disabled[for=validating_user_name]', /Name/
+  end
+
   test 'builder escapes label text' do
     with_label_for @user, :name, label: '<script>alert(1337)</script>', required: false
     assert_no_select 'label.string script'
@@ -80,7 +96,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'configuration allow set label text for wrappers' do
-    swap_wrapper :default, self.custom_wrapper_with_label_text do
+    swap_wrapper :default, custom_wrapper_with_label_text do
       with_concat_form_for(@user) do |f|
         concat f.input :age
       end
@@ -89,7 +105,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'configuration allow set rewrited label tag for wrappers' do
-    swap_wrapper :default, self.custom_wrapper_with_custom_label_component do
+    swap_wrapper :default, custom_wrapper_with_custom_label_component do
       with_concat_form_for(@user) do |f|
         concat f.input :age
       end
@@ -98,16 +114,23 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'builder allows custom formatting when label is explicitly specified' do
-    swap SimpleForm, label_text: lambda { |l, r, explicit_label| explicit_label ? l : "#{l.titleize}:" } do
+    swap SimpleForm, label_text: ->(l, r, explicit_label) { explicit_label ? l : "#{l.titleize}:" } do
       with_label_for @user, :time_zone, 'What is your home time zone?'
       assert_select 'label[for=user_time_zone]', 'What is your home time zone?'
     end
   end
 
   test 'builder allows custom formatting when label is generated' do
-    swap SimpleForm, label_text: lambda { |l, r, explicit_label| explicit_label ? l : "#{l.titleize}:" } do
+    swap SimpleForm, label_text: ->(l, r, explicit_label) { explicit_label ? l : "#{l.titleize}:" } do
       with_label_for @user, :time_zone
       assert_select 'label[for=user_time_zone]', 'Time Zone:'
     end
   end
+
+  test 'builder allows label specific `label_text` option' do
+    with_label_for @user, :time_zone, label_text: ->(l, _, _) { "#{l.titleize}:" }
+
+    assert_no_select 'label[label_text]'
+    assert_select 'label[for=user_time_zone]', 'Time Zone:'
+  end
 end