simple_form 3.1.0 → 5.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'
@@ -36,6 +38,17 @@ to
 See https://github.com/plataformatec/simple_form/pull/997 for more information.
   WARN
 
+  FILE_METHODS_DEPRECATION_WARN = <<-WARN
+[SIMPLE_FORM] SimpleForm.file_methods is deprecated and has no effect.
+
+Since version 5, Simple Form now supports automatically discover of file inputs for the following Gems: activestorage, carrierwave, paperclip, refile and shrine.
+If you are using a custom method that is not from one of the supported Gems, please change your forms to pass the input type explicitly:
+
+    <%= form.input :avatar, as: :file %>
+
+See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple-form-cve-2019-16676 for more information.
+  WARN
+
   @@configured = false
 
   def self.configured? #:nodoc:
@@ -58,11 +71,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 +97,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 +121,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
@@ -118,10 +131,6 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
   mattr_accessor :browser_validations
   @@browser_validations = true
 
-  # Collection of methods to detect if a file type was given.
-  mattr_accessor :file_methods
-  @@file_methods = [:mounted_as, :file?, :public_filename]
-
   # 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
   # matches the regexp as value, such as { /count/ => :integer }.
@@ -152,10 +161,6 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
   mattr_accessor :country_priority
   @@country_priority = nil
 
-  # DEPRECATED: Maximum size allowed for inputs.
-  mattr_accessor :default_input_size
-  @@default_input_size = nil
-
   # When off, do not use translations in labels. Disabling translation in
   # hints and placeholders can be done manually in the wrapper API.
   mattr_accessor :translate_labels
@@ -167,7 +172,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
@@ -202,6 +207,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}"
@@ -231,11 +242,12 @@ 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
     b.use :maxlength
+    b.use :minlength
     b.use :placeholder
     b.optional :pattern
     b.optional :readonly
@@ -260,12 +272,65 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
     @@form_class = value
   end
 
+  def self.file_methods=(file_methods)
+    ActiveSupport::Deprecation.warn(FILE_METHODS_DEPRECATION_WARN, caller)
+    @@file_methods = file_methods
+  end
+
+  def self.file_methods
+    ActiveSupport::Deprecation.warn(FILE_METHODS_DEPRECATION_WARN, caller)
+    @@file_methods
+  end
+
   # Default way to setup Simple Form. Run rails generate simple_form:install
   # to create a fresh initializer with all configuration values.
   def self.setup
     @@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'
@@ -44,8 +45,17 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio sanitizes collection values for labels correctly" do
     with_collection_radio_buttons @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
-    assert_select 'label.collection_radio_buttons[for=user_name_099]', '$0.99'
-    assert_select 'label.collection_radio_buttons[for=user_name_199]', '$1.99'
+
+    # Rails 6 changed the way it sanitizes the values
+    # https://github.com/rails/rails/blob/6-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L141
+    # https://github.com/rails/rails/blob/5-2-stable/actionview/lib/action_view/helpers/tags/base.rb#L141
+    if ActionView::VERSION::MAJOR == 5
+      assert_select 'label.collection_radio_buttons[for=user_name_099]', '$0.99'
+      assert_select 'label.collection_radio_buttons[for=user_name_199]', '$1.99'
+    else
+      assert_select 'label.collection_radio_buttons[for=user_name_0_99]', '$0.99'
+      assert_select 'label.collection_radio_buttons[for=user_name_1_99]', '$1.99'
+    end
   end
 
   test "collection radio checks the correct value to local variables" do
@@ -243,7 +253,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 +293,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'
@@ -291,8 +301,17 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box sanitizes collection values for labels correctly" do
     with_collection_check_boxes @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
-    assert_select 'label.collection_check_boxes[for=user_name_099]', '$0.99'
-    assert_select 'label.collection_check_boxes[for=user_name_199]', '$1.99'
+
+    # Rails 6 changed the way it sanitizes the values
+    # https://github.com/rails/rails/blob/6-0-stable/actionview/lib/action_view/helpers/tags/base.rb#L141
+    # https://github.com/rails/rails/blob/5-2-stable/actionview/lib/action_view/helpers/tags/base.rb#L141
+    if ActionView::VERSION::MAJOR == 5
+      assert_select 'label.collection_check_boxes[for=user_name_099]', '$0.99'
+      assert_select 'label.collection_check_boxes[for=user_name_199]', '$1.99'
+    else
+      assert_select 'label.collection_check_boxes[for=user_name_0_99]', '$0.99'
+      assert_select 'label.collection_check_boxes[for=user_name_1_99]', '$1.99'
+    end
   end
 
   test "collection check box checks the correct value to local variables" do
@@ -317,7 +336,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 +560,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,18 @@ 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
+
+  test 'builder with group select considers multiple select by default' do
+    with_association_for @user, :tags, as: :grouped_select, group_method: :group_method
+
+    assert_select 'select[multiple="multiple"].grouped_select'
+  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
@@ -94,13 +100,36 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error b', 'markup'
   end
 
-
   test 'error generates an error message with raw HTML tags' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'.html_safe
     assert_select 'span.error', "Name cannot be blank"
     assert_select 'span.error b', "Name"
   end
 
+  test 'error adds aria-invalid attribute to inputs' do
+    with_form_for @user, :name, error: true
+    assert_select "input#user_name[name='user[name]'][aria-invalid='true']"
+
+    with_form_for @user, :name, as: :text, error: true
+    assert_select "textarea#user_name[name='user[name]'][aria-invalid='true']"
+
+    @user.errors.add(:active, 'must select one')
+    with_form_for @user, :active, as: :radio_buttons
+    assert_select "input#user_active_true[type=radio][name='user[active]'][aria-invalid='true']"
+    assert_select "input#user_active_false[type=radio][name='user[active]'][aria-invalid='true']"
+
+    with_form_for @user, :active, as: :check_boxes
+    assert_select "input#user_active_true[type=checkbox][aria-invalid='true']"
+    assert_select "input#user_active_false[type=checkbox][aria-invalid='true']"
+
+    with_form_for @user, :company_id, as: :select, error: true
+    assert_select "select#user_company_id[aria-invalid='true']"
+
+    @user.errors.add(:password, 'must not be blank')
+    with_form_for @user, :password
+    assert_select "input#user_password[type=password][aria-invalid='true']"
+  end
+
   # FULL ERRORS
 
   test 'full error generates a full error tag for the attribute' do
@@ -146,14 +175,14 @@ class ErrorTest < ActionView::TestCase
   # FULL_ERROR_WRAPPER
 
   test 'full error finds errors on association' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select
       assert_select 'span.error', 'Company must be valid'
     end
   end
 
   test 'full error finds errors on association with reflection' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select,
         reflection: Association.new(Company, :company, {})
       assert_select 'span.error', 'Company must be valid'
@@ -161,14 +190,14 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'full error can be disabled' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select, full_error: false
       assert_no_select 'span.error'
     end
   end
 
   test 'full error can be disabled setting error to false' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select, error: false
       assert_no_select 'span.error'
     end
@@ -195,8 +224,14 @@ 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, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       error_text = "Super User Name! cannot be blank"
       with_form_for @user, :name, error: error_text
 
@@ -219,7 +254,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error escapes the error text using full_error component' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :name, error: 'error must not contain <b>markup</b>'
 
       assert_select 'span.error'
@@ -228,7 +263,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error does not escape the error text if it is safe using full_error component' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :name, error: 'error must contain <b>markup</b>'.html_safe
 
       assert_select 'span.error'
@@ -237,7 +272,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error when using full_error component does not generate the error if there is no error on the attribute' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :active, error: "Super User Active! can't be blank"
 
       assert_no_select 'span.error'