simple_form 3.5.0 → 4.0.0

data/lib/simple_form.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 require 'action_view'
+require 'action_pack'
 require 'simple_form/action_view_extensions/form_helper'
 require 'simple_form/action_view_extensions/builder'
 require 'active_support/core_ext/hash/slice'
@@ -58,11 +60,11 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
   # Series of attemps to detect a default label method for collection.
   mattr_accessor :collection_label_methods
-  @@collection_label_methods = [:to_label, :name, :title, :to_s]
+  @@collection_label_methods = %i[to_label name title to_s]
 
   # Series of attemps to detect a default value method for collection.
   mattr_accessor :collection_value_methods
-  @@collection_value_methods = [:id, :to_s]
+  @@collection_value_methods = %i[id to_s]
 
   # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
   mattr_accessor :collection_wrapper_tag
@@ -84,7 +86,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
   # How the label text should be generated altogether with the required text.
   mattr_accessor :label_text
-  @@label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+  @@label_text = ->(label, required, explicit_label) { "#{required} #{label}" }
 
   # You can define the class to be used on all labels. Defaults to none.
   mattr_accessor :label_class
@@ -108,7 +110,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
   # You can define which elements should obtain additional classes.
   mattr_accessor :generate_additional_classes_for
-  @@generate_additional_classes_for = [:wrapper, :label, :input]
+  @@generate_additional_classes_for = %i[wrapper label input]
 
   # Whether attributes are required by default or not.
   mattr_accessor :required_by_default
@@ -120,7 +122,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
   # Collection of methods to detect if a file type was given.
   mattr_accessor :file_methods
-  @@file_methods = [:mounted_as, :file?, :public_filename]
+  @@file_methods = %i[mounted_as file? public_filename attached?]
 
   # Custom mappings for input types. This should be a hash containing a regexp
   # to match as key, and the input type that will be used when the field name
@@ -163,7 +165,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
   # Cache SimpleForm inputs discovery.
   mattr_accessor :cache_discovery
-  @@cache_discovery = defined?(Rails) && !Rails.env.development?
+  @@cache_discovery = defined?(Rails.env) && !Rails.env.development?
 
   # Adds a class to each generated button, mostly for compatiblity.
   mattr_accessor :button_class
@@ -198,6 +200,12 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
   mattr_accessor :i18n_scope
   @@i18n_scope = 'simple_form'
 
+  mattr_accessor :input_field_error_class
+  @@input_field_error_class = nil
+
+  mattr_accessor :input_field_valid_class
+  @@input_field_valid_class = nil
+
   # Retrieves a given wrapper
   def self.wrapper(name)
     @@wrappers[name.to_s] or raise WrapperNotFound, "Couldn't find wrapper with name #{name}"
@@ -227,7 +235,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
     SimpleForm::Wrappers::Root.new(builder.to_a, options)
   end
 
-  wrappers class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+  wrappers class: :input, hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
     b.use :html5
 
     b.use :min_max
@@ -263,6 +271,49 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
     @@configured = true
     yield self
   end
+
+  # Includes a component to be used by Simple Form. Methods defined in a
+  # component will be exposed to be used in the wrapper as Simple::Components
+  #
+  # Examples
+  #
+  #    # The application needs to tell where the components will be.
+  #    Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
+  #
+  #    # Create a custom component in the path specified above.
+  #    # lib/components/input_group_component.rb
+  #    module InputGroupComponent
+  #      def prepend
+  #        ...
+  #      end
+  #
+  #      def append
+  #        ...
+  #      end
+  #    end
+  #
+  #    SimpleForm.setup do |config|
+  #      # Create a wrapper using the custom component.
+  #      config.wrappers :input_group, tag: :div, error_class: :error do |b|
+  #        b.use :label
+  #        b.optional :prepend
+  #        b.use :input
+  #        b.use :append
+  #      end
+  #    end
+  #
+  #    # Using the custom component in the form.
+  #    <%= simple_form_for @blog, wrapper: input_group do |f| %>
+  #      <%= f.input :title, prepend: true %>
+  #    <% end %>
+  #
+  def self.include_component(component)
+    if Module === component
+      SimpleForm::Inputs::Base.include(component)
+    else
+      raise TypeError, "SimpleForm.include_component expects a module but got: #{component.class}"
+    end
+  end
 end
 
 require 'simple_form/railtie' if defined?(Rails)

data/test/action_view_extensions/builder_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class BuilderTest < ActionView::TestCase
@@ -36,7 +37,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio handles camelized collection values for labels correctly" do
-    with_collection_radio_buttons @user, :active, ['Yes', 'No'], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, %w[Yes No], :to_s, :to_s
 
     assert_select 'form label.collection_radio_buttons[for=user_active_yes]', 'Yes'
     assert_select 'form label.collection_radio_buttons[for=user_active_no]', 'No'
@@ -243,7 +244,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio with block helpers does not leak the template" do
     with_concat_form_for(@user) do |f|
-      collection_input =  f.collection_radio_buttons :active, [true, false], :to_s, :to_s do |b|
+      collection_input = f.collection_radio_buttons :active, [true, false], :to_s, :to_s do |b|
         b.label(class: b.object) { b.radio_button + b.text }
       end
       concat collection_input
@@ -283,7 +284,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box handles camelized collection values for labels correctly" do
-    with_collection_check_boxes @user, :active, ['Yes', 'No'], :to_s, :to_s
+    with_collection_check_boxes @user, :active, %w[Yes No], :to_s, :to_s
 
     assert_select 'form label.collection_check_boxes[for=user_active_yes]', 'Yes'
     assert_select 'form label.collection_check_boxes[for=user_active_no]', 'No'
@@ -317,7 +318,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes accepts selected string values as :checked option" do
     collection = (1..3).map { |i| [i, "Category #{i}"] }
-    with_collection_check_boxes :user, :category_ids, collection, :first, :last, checked: ['1', '3']
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, checked: %w[1 3]
 
     assert_select 'input[type=checkbox][value="1"][checked=checked]'
     assert_select 'input[type=checkbox][value="3"][checked=checked]'
@@ -541,7 +542,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes with block helpers does not leak the template" do
     with_concat_form_for(@user) do |f|
-      collection_input =  f.collection_check_boxes :active, [true, false], :to_s, :to_s do |b|
+      collection_input = f.collection_check_boxes :active, [true, false], :to_s, :to_s do |b|
         b.label(class: b.object) { b.check_box + b.text }
       end
       concat collection_input

data/test/action_view_extensions/form_helper_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class FormHelperTest < ActionView::TestCase
@@ -151,7 +152,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'SimpleForm for swaps default action view field_error_proc' do
-    expected_error_proc = lambda {}
+    expected_error_proc = -> {}
     swap SimpleForm, field_error_proc: expected_error_proc do
       simple_form_for :user do |f|
         assert_equal expected_error_proc, ::ActionView::Base.field_error_proc
@@ -161,7 +162,7 @@ class FormHelperTest < ActionView::TestCase
 
   private
 
-  def swap_field_error_proc(expected_error_proc = lambda {})
+  def swap_field_error_proc(expected_error_proc = -> {})
     swap ActionView::Base, field_error_proc: expected_error_proc do
       yield
 

data/test/components/custom_components_test.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+# Module that represents a custom component.
+module Numbers
+  def number(wrapper_options = nil)
+    @number ||= options[:number].to_s.html_safe
+  end
+end
+
+# Module that represents a custom component.
+module InputGroup
+  def prepend(wrapper_options = nil)
+    span_tag = content_tag(:span, options[:prepend], class: 'input-group-text')
+    template.content_tag(:div, span_tag, class: 'input-group-prepend')
+  end
+
+  def append(wrapper_options = nil)
+    span_tag = content_tag(:span, options[:append], class: 'input-group-text')
+    template.content_tag(:div, span_tag, class: 'input-group-append')
+  end
+end
+
+class CustomComponentsTest < ActionView::TestCase
+  test 'includes the custom components' do
+    SimpleForm.include_component Numbers
+
+    custom_wrapper = SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
+      b.use :number, wrap_with: { tag: 'div', class: 'number' }
+    end
+
+    with_form_for @user, :name, number: 1, wrapper: custom_wrapper
+
+    assert_select 'div.number', text: '1'
+  end
+
+  test 'includes custom components and use it as optional in the wrapper' do
+    SimpleForm.include_component InputGroup
+
+    custom_wrapper = SimpleForm.build tag: :div, class: 'custom_wrapper' do |b|
+      b.use :label
+      b.optional :prepend
+      b.use :input
+      b.use :append
+    end
+
+    with_form_for @user, :name, prepend: true, wrapper: custom_wrapper
+
+    assert_select 'div.input-group-prepend > span.input-group-text'
+    assert_select 'div.input-group-append > span.input-group-text'
+  end
+
+  test 'raises a TypeError when the component is not a Module' do
+    component = 'MyComponent'
+
+    exception = assert_raises TypeError do 
+      SimpleForm.include_component(component)
+    end
+    assert_equal exception.message, "SimpleForm.include_component expects a module but got: String"
+  end
+end

data/test/components/label_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -177,7 +178,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label does not have css class from type when generate_additional_classes_for does not include :label' do
-    swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
+    swap SimpleForm, generate_additional_classes_for: %i[wrapper input] do
       with_label_for @user, :name, :string
       assert_no_select 'label.string'
       with_label_for @user, :description, :text
@@ -192,7 +193,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label does not generate empty css class' do
-    swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
+    swap SimpleForm, generate_additional_classes_for: %i[wrapper input] do
       with_label_for @user, :name, :string
       assert_no_select 'label[class]'
     end
@@ -206,7 +207,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label does not obtain required from ActiveModel::Validations when generate_additional_classes_for does not include :label' do
-    swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
+    swap SimpleForm, generate_additional_classes_for: %i[wrapper input] do
       with_label_for @validating_user, :name, :string
       assert_no_select 'label.required'
       with_label_for @validating_user, :status, :string
@@ -248,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
@@ -255,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
@@ -263,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]'
@@ -289,7 +318,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label includes for attribute for select collection' do
-    with_label_for @user, :sex, :select, collection: [:male, :female]
+    with_label_for @user, :sex, :select, collection: %i[male female]
     assert_select 'label[for=user_sex]'
   end
 

data/test/form_builder/association_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -14,6 +15,12 @@ class AssociationTest < ActionView::TestCase
     end
   end
 
+  test 'builder association works with decorated object responsive to #to_model' do
+    assert_nothing_raised do
+      with_association_for @decorated_user, :company
+    end
+  end
+
   test 'builder association with a block calls simple_fields_for' do
     simple_form_for @user do |f|
       f.association :posts do |posts_form|
@@ -121,6 +128,15 @@ class AssociationTest < ActionView::TestCase
     assert_no_select 'form select option[value="2"]'
   end
 
+  test 'builder allows collection to have a scope with parameter' do
+    with_association_for @user, :special_tags
+    assert_select 'form select.select#user_special_tag_ids'
+    assert_select 'form select[multiple=multiple]'
+    assert_select 'form select option[value="1"]', 'Tag 1'
+    assert_no_select 'form select option[value="2"]'
+    assert_no_select 'form select option[value="3"]'
+  end
+
   test 'builder marks the record which already belongs to the user' do
     @user.company_id = 2
     with_association_for @user, :company, as: :radio_buttons
@@ -154,6 +170,15 @@ class AssociationTest < ActionView::TestCase
     end
   end
 
+  test 'builder does not call where if the given association does not respond to it' do
+    with_association_for @user, :friends
+    assert_select 'form select.select#user_friend_ids'
+    assert_select 'form select[multiple=multiple]'
+    assert_select 'form select option[value="1"]', 'Friend 1'
+    assert_select 'form select option[value="2"]', 'Friend 2'
+    assert_select 'form select option[value="3"]', 'Friend 3'
+  end
+
   test 'builder does not call order if the given association does not respond to it' do
     with_association_for @user, :pictures
     assert_select 'form select.select#user_picture_ids'
@@ -210,12 +235,12 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder with collection support does not change the options hash' do
-    options = { as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li}
+    options = { as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li }
     with_association_for @user, :tags, options
 
     assert_select 'form ul', count: 1
     assert_select 'form ul li', count: 3
-    assert_equal({ as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li},
+    assert_equal({ as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li },
                  options)
   end
 end

data/test/form_builder/button_test.rb

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

data/test/form_builder/error_notification_test.rb

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

data/test/form_builder/error_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 # Tests for f.error and f.full_error
@@ -35,6 +36,11 @@ class ErrorTest < ActionView::TestCase
     assert_select 'span.error', "cannot be blank"
   end
 
+  test 'error generates messages with decorated object responsive to #to_model' do
+    with_error_for @decorated_user, :name
+    assert_select 'span.error', "cannot be blank"
+  end
+
   test 'error generates messages for attribute with one error when using first' do
     swap SimpleForm, error_method: :first do
       with_error_for @user, :age

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
@@ -49,7 +56,7 @@ class FormBuilderTest < ActionView::TestCase
   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: [:male, :female]
+        f.input :gender, collection: %i[male female]
       end
 
       assert_no_select 'select option', 'Male'
@@ -58,7 +65,7 @@ class FormBuilderTest < ActionView::TestCase
   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"
@@ -135,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'
@@ -159,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'
@@ -212,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'
@@ -220,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'
@@ -382,7 +423,7 @@ 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.public_send(method, :name)

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,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 # Tests for f.input_field
@@ -112,7 +113,7 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'builder collection input_field generates input tag with a clean HTML' do
-    with_input_field_for @user, :status, collection: ['Open', 'Closed'],
+    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]'
@@ -172,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/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/
@@ -108,21 +114,21 @@ 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: lambda { |l, _, _| "#{l.titleize}:" }
+    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:'