simple_form 3.5.1 → 4.0.0

data/test/components/label_test.rb

@@ -249,6 +249,15 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
+  test 'label uses custom i18n scope to find required text' do
+    store_translations(:en, my_scope: { required: { text: 'Pflichtfeld' } }) do
+      swap SimpleForm, i18n_scope: :my_scope do
+        with_label_for @user, :name, :string
+        assert_select 'form label abbr[title="Pflichtfeld"]', '*'
+      end
+    end
+  end
+
   test 'label uses i18n to find required mark' do
     store_translations(:en, simple_form: { required: { mark: '*-*' } }) do
       with_label_for @user, :name, :string
@@ -256,6 +265,15 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
+  test 'label uses custom i18n scope to find required mark' do
+    store_translations(:en, my_scope: { required: { mark: '!!' } }) do
+      swap SimpleForm, i18n_scope: :my_scope do
+        with_label_for @user, :name, :string
+        assert_select 'form label abbr', '!!'
+      end
+    end
+  end
+
   test 'label uses i18n to find required string tag' do
     store_translations(:en, simple_form: { required: { html: '<span class="required" title="requerido">*</span>' } }) do
       with_label_for @user, :name, :string
@@ -264,6 +282,16 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
+  test 'label uses custom i18n scope to find required string tag' do
+    store_translations(:en, my_scope: { required: { html: '<span class="mandatory" title="Pflichtfeld">!!</span>' } }) do
+      swap SimpleForm, i18n_scope: :my_scope do
+        with_label_for @user, :name, :string
+        assert_no_select 'form label abbr'
+        assert_select 'form label span.mandatory[title=Pflichtfeld]', '!!'
+      end
+    end
+  end
+
   test 'label allows overwriting input id' do
     with_label_for @user, :name, :string, input_html: { id: 'my_new_id' }
     assert_select 'label[for=my_new_id]'

data/test/form_builder/general_test.rb

@@ -142,6 +142,24 @@ class FormBuilderTest < ActionView::TestCase
     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'
@@ -166,6 +184,11 @@ class FormBuilderTest < ActionView::TestCase
     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
     with_form_for @user, :password
     assert_select 'form input#user_password.password'
@@ -219,6 +242,16 @@ class FormBuilderTest < ActionView::TestCase
   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'
+  end
+
+  test 'builder generates file for activestorage entries' do
+    @user.avatar = MiniTest::Mock.new
+    @user.avatar.expect(:attached?, false)
+    @user.avatar.expect(:!, false)
 
     with_form_for @user, :avatar
     assert_select 'form input#user_avatar.file'
@@ -227,6 +260,7 @@ class FormBuilderTest < ActionView::TestCase
   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)
 
     with_form_for @user, :home_picture
     assert_select 'form input#user_home_picture.file'

data/test/form_builder/input_field_test.rb

@@ -173,4 +173,29 @@ class InputFieldTest < ActionView::TestCase
       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/wrapper_test.rb

@@ -38,6 +38,27 @@ class WrapperTest < ActionView::TestCase
     assert_select 'div.field_with_errors'
   end
 
+  test 'wrapper adds error class to input for attribute with errors' do
+    with_form_for @user, :name, wrapper: custom_wrapper_with_input_error_class
+    assert_select 'div.field_with_errors'
+    assert_select 'input.is-invalid'
+  end
+
+  test 'wrapper does not add error class to input when the attribute is valid' do
+    with_form_for @user, :phone_number, wrapper: custom_wrapper_with_input_error_class
+    assert_no_select 'div.field_with_errors'
+    assert_no_select 'input.is-invalid'
+  end
+
+  test 'wrapper adds valid class for present attribute without errors' do
+    @user.instance_eval { undef errors }
+    with_form_for @user, :name, wrapper: custom_wrapper_with_input_valid_class
+    assert_select 'div.field_without_errors'
+    assert_select 'input.is-valid'
+    assert_no_select 'div.field_with_errors'
+    assert_no_select 'input.is-invalid'
+  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'
@@ -264,8 +285,6 @@ class WrapperTest < ActionView::TestCase
   end
 
   test "input with aria attributes will merge with wrapper_options' aria" do
-    skip unless ActionPack::VERSION::MAJOR == '4' && ActionPack::VERSION::MINOR >= '2'
-
     swap_wrapper :default, custom_wrapper_with_input_aria_modal do
       with_concat_form_for @user do |f|
         concat f.input :name, input_html: { aria: { modal: 'another-aria', target: 'merge-aria' } }

data/test/support/misc_helpers.rb

@@ -206,6 +206,20 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_input_error_class
+    SimpleForm.build tag: :div, class: "custom_wrapper", error_class: :field_with_errors do |b|
+      b.use :label
+      b.use :input, class: 'inline-class', error_class: 'is-invalid'
+    end
+  end
+
+  def custom_wrapper_with_input_valid_class
+    SimpleForm.build tag: :div, class: "custom_wrapper", valid_class: :field_without_errors do |b|
+      b.use :label
+      b.use :input, class: 'inline-class', valid_class: 'is-valid'
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end

data/test/support/models.rb

@@ -90,7 +90,8 @@ class User
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
     :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
     :extra_special_company_id, :pictures, :picture_ids, :special_pictures,
-    :special_picture_ids, :uuid, :friends, :friend_ids, :special_tags, :special_tag_ids
+    :special_picture_ids, :uuid, :friends, :friend_ids, :special_tags, :special_tag_ids,
+    :citext, :hstore, :json, :jsonb
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -141,7 +142,7 @@ class User
       when :attempts      then :integer
       when :action        then :string
       when :credit_card   then :string
-      when :uuid          then :uuid
+      else attribute.to_sym
     end
     Column.new(attribute, column_type, limit)
   end
@@ -175,6 +176,10 @@ class User
         when 'action'        then :string
         when 'credit_card'   then :string
         when 'uuid'          then :string
+        when 'citext'        then :string
+        when 'hstore'        then [:text, 200]
+        when 'json'          then [:text, 200]
+        when 'jsonb'         then [:text, 200]
       end
 
       ActiveModel::Type.lookup(column_type, limit: limit)
@@ -187,7 +192,8 @@ class User
       when :name, :status, :password, :description, :age,
         :credit_limit, :active, :born_at, :delivery_time,
         :created_at, :updated_at, :lock_version, :home_picture,
-        :amount, :attempts, :action, :credit_card, :uuid then true
+        :amount, :attempts, :action, :credit_card, :uuid,
+        :citext, :hstore, :json, :jsonb then true
       else false
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 4.0.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,9 +19,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +26,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,9 +33,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,9 +40,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 description: Forms made easy!
 email: opensource@plataformatec.com.br
 executables: []
@@ -125,6 +113,7 @@ files:
 - lib/simple_form/wrappers/single.rb
 - test/action_view_extensions/builder_test.rb
 - test/action_view_extensions/form_helper_test.rb
+- test/components/custom_components_test.rb
 - test/components/label_test.rb
 - test/form_builder/association_test.rb
 - test/form_builder/button_test.rb
@@ -186,6 +175,7 @@ summary: Forms made easy!
 test_files:
 - test/action_view_extensions/builder_test.rb
 - test/action_view_extensions/form_helper_test.rb
+- test/components/custom_components_test.rb
 - test/components/label_test.rb
 - test/form_builder/association_test.rb
 - test/form_builder/button_test.rb