simple_form 3.1.0.rc2 → 3.1.1

data/lib/simple_form/inputs/date_time_input.rb

@@ -14,16 +14,20 @@ module SimpleForm
       private
 
       def label_target
-        position = case input_type
-        when :date, :datetime
-          date_order = input_options[:order] || I18n.t('date.order')
-          date_order.first.to_sym
+        if use_html5_inputs?
+          attribute_name
         else
-          :hour
-        end
+          position = case input_type
+          when :date, :datetime
+            date_order = input_options[:order] || I18n.t('date.order')
+            date_order.first.to_sym
+          else
+            :hour
+          end
 
-        position = ActionView::Helpers::DateTimeSelector::POSITION[position]
-        "#{attribute_name}_#{position}i"
+          position = ActionView::Helpers::DateTimeSelector::POSITION[position]
+          "#{attribute_name}_#{position}i"
+        end
       end
 
       def use_html5_inputs?

data/lib/simple_form/tags.rb

@@ -16,11 +16,9 @@ module SimpleForm
           rendered_item = yield item, value, text, default_html_options.merge(additional_html_options)
 
           if @options.fetch(:boolean_style, SimpleForm.boolean_style) == :nested
-            label_options = {}
-            add_default_name_and_id_for_value(value, label_options)
-            label_options['for'] = label_options.delete('id')
+            label_options = default_html_options.slice(:index, :namespace)
             label_options['class'] = @options[:item_label_class]
-            rendered_item = content_tag(:label, rendered_item, label_options)
+            rendered_item = @template_object.label(@object_name, sanitize_attribute_name(value), rendered_item, label_options)
           end
 
           item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, class: item_wrapper_class) : rendered_item

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.1.0.rc2".freeze
+  VERSION = "3.1.1".freeze
 end

data/lib/simple_form.rb

@@ -96,10 +96,16 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
   mattr_accessor :boolean_style
   @@boolean_style = :inline
 
-  # You can define the class to be used on all forms. Default is simple_form.
-  mattr_accessor :form_class
+  # DEPRECATED: You can define the class to be used on all forms. Default is
+  # simple_form.
+  mattr_reader :form_class
   @@form_class = :simple_form
 
+  # You can define the default class to be used on all forms. Can be overriden
+  # with `html: { :class }`. Defaults to none.
+  mattr_accessor :default_form_class
+  @@default_form_class = nil
+
   # You can define which elements should obtain additional classes.
   mattr_accessor :generate_additional_classes_for
   @@generate_additional_classes_for = [:wrapper, :label, :input]
@@ -249,6 +255,11 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
     ActiveSupport::Deprecation.warn "[SIMPLE_FORM] SimpleForm.default_input_size= is deprecated and has no effect", caller
   end
 
+  def self.form_class=(value)
+    ActiveSupport::Deprecation.warn "[SIMPLE_FORM] SimpleForm.form_class= is deprecated and will be removed in 4.x. Use SimpleForm.default_form_class= instead", caller
+    @@form_class = value
+  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

data/test/action_view_extensions/builder_test.rb

@@ -263,15 +263,15 @@ class BuilderTest < ActionView::TestCase
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
-    assert_select 'form input#user_tag_ids_1[type=checkbox][value=1]'
-    assert_select 'form input#user_tag_ids_2[type=checkbox][value=2]'
+    assert_select 'form input#user_tag_ids_1[type=checkbox][value="1"]'
+    assert_select 'form input#user_tag_ids_2[type=checkbox][value="2"]'
   end
 
   test "collection check box generates only one hidden field for the entire collection, to ensure something will be sent back to the server when posting an empty collection" do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
-    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]", count: 1
+    assert_select "form input[type=hidden][name='user[tag_ids][]'][value='']", count: 1
   end
 
   test "collection check box accepts a collection and generate a serie of checkboxes with labels for label method" do
@@ -301,36 +301,36 @@ class BuilderTest < ActionView::TestCase
 
     with_collection_check_boxes user, :tag_ids, collection, :first, :last
 
-    assert_select 'form input[type=checkbox][value=1][checked=checked]'
-    assert_select 'form input[type=checkbox][value=3][checked=checked]'
-    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+    assert_select 'form input[type=checkbox][value="1"][checked=checked]'
+    assert_select 'form input[type=checkbox][value="3"][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value="2"][checked=checked]'
   end
 
   test "collection check box accepts selected values as :checked option" do
     collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: [1, 3]
 
-    assert_select 'form input[type=checkbox][value=1][checked=checked]'
-    assert_select 'form input[type=checkbox][value=3][checked=checked]'
-    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+    assert_select 'form input[type=checkbox][value="1"][checked=checked]'
+    assert_select 'form input[type=checkbox][value="3"][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value="2"][checked=checked]'
   end
 
   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']
 
-    assert_select 'input[type=checkbox][value=1][checked=checked]'
-    assert_select 'input[type=checkbox][value=3][checked=checked]'
-    assert_no_select 'input[type=checkbox][value=2][checked=checked]'
+    assert_select 'input[type=checkbox][value="1"][checked=checked]'
+    assert_select 'input[type=checkbox][value="3"][checked=checked]'
+    assert_no_select 'input[type=checkbox][value="2"][checked=checked]'
   end
 
   test "collection check box accepts a single checked value" do
     collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: 3
 
-    assert_select 'form input[type=checkbox][value=3][checked=checked]'
-    assert_no_select 'form input[type=checkbox][value=1][checked=checked]'
-    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+    assert_select 'form input[type=checkbox][value="3"][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value="1"][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value="2"][checked=checked]'
   end
 
   test "collection check box accepts selected values as :checked option and override the model values" do
@@ -338,44 +338,44 @@ class BuilderTest < ActionView::TestCase
     @user.tag_ids = [2]
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: [1, 3]
 
-    assert_select 'form input[type=checkbox][value=1][checked=checked]'
-    assert_select 'form input[type=checkbox][value=3][checked=checked]'
-    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+    assert_select 'form input[type=checkbox][value="1"][checked=checked]'
+    assert_select 'form input[type=checkbox][value="3"][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value="2"][checked=checked]'
   end
 
   test "collection check box accepts multiple disabled items" do
     collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: [1, 3]
 
-    assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
-    assert_select 'form input[type=checkbox][value=3][disabled=disabled]'
-    assert_no_select 'form input[type=checkbox][value=2][disabled=disabled]'
+    assert_select 'form input[type=checkbox][value="1"][disabled=disabled]'
+    assert_select 'form input[type=checkbox][value="3"][disabled=disabled]'
+    assert_no_select 'form input[type=checkbox][value="2"][disabled=disabled]'
   end
 
   test "collection check box accepts single disable item" do
     collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: 1
 
-    assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
-    assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
-    assert_no_select 'form input[type=checkbox][value=2][disabled=disabled]'
+    assert_select 'form input[type=checkbox][value="1"][disabled=disabled]'
+    assert_no_select 'form input[type=checkbox][value="3"][disabled=disabled]'
+    assert_no_select 'form input[type=checkbox][value="2"][disabled=disabled]'
   end
 
   test "collection check box accepts a proc to disabled items" do
     collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: proc { |i| i.first == 1 }
 
-    assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
-    assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
-    assert_no_select 'form input[type=checkbox][value=2][disabled=disabled]'
+    assert_select 'form input[type=checkbox][value="1"][disabled=disabled]'
+    assert_no_select 'form input[type=checkbox][value="3"][disabled=disabled]'
+    assert_no_select 'form input[type=checkbox][value="2"][disabled=disabled]'
   end
 
   test "collection check box accepts html options" do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, {}, class: 'check'
 
-    assert_select 'form input.check[type=checkbox][value=1]'
-    assert_select 'form input.check[type=checkbox][value=2]'
+    assert_select 'form input.check[type=checkbox][value="1"]'
+    assert_select 'form input.check[type=checkbox][value="2"]'
   end
 
   test "collection check box with fields for" do
@@ -386,8 +386,8 @@ class BuilderTest < ActionView::TestCase
       end
     end
 
-    assert_select 'form input#user_post_tag_ids_1[type=checkbox][value=1]'
-    assert_select 'form input#user_post_tag_ids_2[type=checkbox][value=2]'
+    assert_select 'form input#user_post_tag_ids_1[type=checkbox][value="1"]'
+    assert_select 'form input#user_post_tag_ids_2[type=checkbox][value="2"]'
 
     assert_select 'form label.collection_check_boxes[for=user_post_tag_ids_1]', 'Tag 1'
     assert_select 'form label.collection_check_boxes[for=user_post_tag_ids_2]', 'Tag 2'

data/test/action_view_extensions/form_helper_test.rb

@@ -13,6 +13,25 @@ class FormHelperTest < ActionView::TestCase
     assert_select 'form.simple_form'
   end
 
+  test 'SimpleForm allows overriding default form class' do
+    swap SimpleForm, default_form_class: "my_custom_class" do
+      with_concat_form_for :user, html: { class: "override_class" }
+      assert_no_select 'form.my_custom_class'
+      assert_select 'form.override_class'
+    end
+  end
+
+  # Remove this test when SimpleForm.form_class is removed in 4.x
+  test 'SimpleForm allows overriding default form class, but not form class' do
+    ActiveSupport::Deprecation.silence do
+      swap SimpleForm, form_class: "fixed_class", default_form_class: "my_custom_class" do
+        with_concat_form_for :user, html: { class: "override_class" }
+        assert_no_select 'form.my_custom_class'
+        assert_select 'form.fixed_class.override_class'
+      end
+    end
+  end
+
   test 'SimpleForm uses default browser validations by default' do
     with_concat_form_for(:user)
     assert_no_select 'form[novalidate]'
@@ -87,7 +106,7 @@ class FormHelperTest < ActionView::TestCase
   test 'passes options to SimpleForm' do
     with_concat_form_for(:user, url: '/account', html: { id: 'my_form' })
     assert_select 'form#my_form'
-    assert_select 'form[action=/account]'
+    assert_select 'form[action="/account"]'
   end
 
   test 'form_for yields an instance of FormBuilder' do

data/test/components/label_test.rb

@@ -244,7 +244,7 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label uses i18n to find required text' do
     store_translations(:en, simple_form: { required: { text: 'campo requerido' } }) do
       with_label_for @user, :name, :string
-      assert_select 'form label abbr[title=campo requerido]', '*'
+      assert_select 'form label abbr[title="campo requerido"]', '*'
     end
   end
 

data/test/form_builder/association_test.rb

@@ -46,9 +46,9 @@ class AssociationTest < ActionView::TestCase
 
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'
-    assert_select 'form select option[value=1]', 'Tag 1'
-    assert_select 'form select option[value=2]', 'Tag 2'
-    assert_select 'form select option[value=3]', 'Tag 3'
+    assert_select 'form select option[value="1"]', 'Tag 1'
+    assert_select 'form select option[value="2"]', 'Tag 2'
+    assert_select 'form select option[value="3"]', 'Tag 3'
 
     value.verify
   end
@@ -59,9 +59,9 @@ class AssociationTest < ActionView::TestCase
 
     with_association_for @user, :tags, preload: false
     assert_select 'form select.select#user_tag_ids'
-    assert_select 'form select option[value=1]', 'Tag 1'
-    assert_select 'form select option[value=2]', 'Tag 2'
-    assert_select 'form select option[value=3]', 'Tag 3'
+    assert_select 'form select option[value="1"]', 'Tag 1'
+    assert_select 'form select option[value="2"]', 'Tag 2'
+    assert_select 'form select option[value="3"]', 'Tag 3'
 
     assert_raises MockExpectationError do
       value.verify
@@ -74,9 +74,9 @@ class AssociationTest < ActionView::TestCase
 
     with_association_for @user, :company
     assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=1]', 'Company 1'
-    assert_select 'form select option[value=2]', 'Company 2'
-    assert_select 'form select option[value=3]', 'Company 3'
+    assert_select 'form select option[value="1"]', 'Company 1'
+    assert_select 'form select option[value="2"]', 'Company 2'
+    assert_select 'form select option[value="3"]', 'Company 3'
 
     assert_raises MockExpectationError do
       value.verify
@@ -87,15 +87,15 @@ class AssociationTest < ActionView::TestCase
   test 'builder creates a select for belongs_to associations' do
     with_association_for @user, :company
     assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=1]', 'Company 1'
-    assert_select 'form select option[value=2]', 'Company 2'
-    assert_select 'form select option[value=3]', 'Company 3'
+    assert_select 'form select option[value="1"]', 'Company 1'
+    assert_select 'form select option[value="2"]', 'Company 2'
+    assert_select 'form select option[value="3"]', 'Company 3'
   end
 
   test 'builder creates blank select if collection is nil' do
     with_association_for @user, :company, collection: nil
     assert_select 'form select.select#user_company_id'
-    assert_no_select 'form select option[value=1]', 'Company 1'
+    assert_no_select 'form select option[value="1"]', 'Company 1'
   end
 
   test 'builder allows collection radio for belongs_to associations' do
@@ -108,17 +108,17 @@ class AssociationTest < ActionView::TestCase
   test 'builder allows collection to have a proc as a condition' do
     with_association_for @user, :extra_special_company
     assert_select 'form select.select#user_extra_special_company_id'
-    assert_select 'form select option[value=1]'
-    assert_no_select 'form select option[value=2]'
-    assert_no_select 'form select option[value=3]'
+    assert_select 'form select option[value="1"]'
+    assert_no_select 'form select option[value="2"]'
+    assert_no_select 'form select option[value="3"]'
   end
 
   test 'builder allows collection to have a scope' do
     with_association_for @user, :special_pictures
     assert_select 'form select.select#user_special_picture_ids'
-    assert_select 'form select option[value=3]', '3'
-    assert_no_select 'form select option[value=1]'
-    assert_no_select 'form select option[value=2]'
+    assert_select 'form select option[value="3"]', '3'
+    assert_no_select 'form select option[value="1"]'
+    assert_no_select 'form select option[value="2"]'
   end
 
   test 'builder marks the record which already belongs to the user' do
@@ -133,17 +133,17 @@ class AssociationTest < ActionView::TestCase
   test 'builder uses reflection conditions to find collection' do
     with_association_for @user, :special_company
     assert_select 'form select.select#user_special_company_id'
-    assert_select 'form select option[value=1]'
-    assert_no_select 'form select option[value=2]'
-    assert_no_select 'form select option[value=3]'
+    assert_select 'form select option[value="1"]'
+    assert_no_select 'form select option[value="2"]'
+    assert_no_select 'form select option[value="3"]'
   end
 
   test 'builder allows overriding collection to association input' do
     with_association_for @user, :company, include_blank: false,
                          collection: [Company.new(999, 'Teste')]
     assert_select 'form select.select#user_company_id'
-    assert_no_select 'form select option[value=1]'
-    assert_select 'form select option[value=999]', 'Teste'
+    assert_no_select 'form select option[value="1"]'
+    assert_select 'form select option[value="999"]', 'Teste'
     assert_select 'form select option', count: 1
   end
 
@@ -158,31 +158,31 @@ class AssociationTest < ActionView::TestCase
     with_association_for @user, :pictures
     assert_select 'form select.select#user_picture_ids'
     assert_select 'form select[multiple=multiple]'
-    assert_select 'form select option[value=1]', 'Picture 1'
-    assert_select 'form select option[value=2]', 'Picture 2'
-    assert_select 'form select option[value=3]', 'Picture 3'
+    assert_select 'form select option[value="1"]', 'Picture 1'
+    assert_select 'form select option[value="2"]', 'Picture 2'
+    assert_select 'form select option[value="3"]', 'Picture 3'
   end
 
   test 'builder creates a select with multiple options for collection associations' do
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'
     assert_select 'form select[multiple=multiple]'
-    assert_select 'form select option[value=1]', 'Tag 1'
-    assert_select 'form select option[value=2]', 'Tag 2'
-    assert_select 'form select option[value=3]', 'Tag 3'
+    assert_select 'form select option[value="1"]', 'Tag 1'
+    assert_select 'form select option[value="2"]', 'Tag 2'
+    assert_select 'form select option[value="3"]', 'Tag 3'
   end
 
   test 'builder allows size to be overwritten for collection associations' do
     with_association_for @user, :tags, input_html: { size: 10 }
-    assert_select 'form select[multiple=multiple][size=10]'
+    assert_select 'form select[multiple=multiple][size="10"]'
   end
 
   test 'builder marks all selected records which already belongs to user' do
     @user.tag_ids = [1, 2]
     with_association_for @user, :tags
-    assert_select 'form select option[value=1][selected=selected]'
-    assert_select 'form select option[value=2][selected=selected]'
-    assert_no_select 'form select option[value=3][selected=selected]'
+    assert_select 'form select option[value="1"][selected=selected]'
+    assert_select 'form select option[value="2"][selected=selected]'
+    assert_no_select 'form select option[value="3"][selected=selected]'
   end
 
   test 'builder allows a collection of check boxes for collection associations' do
@@ -196,9 +196,9 @@ class AssociationTest < ActionView::TestCase
   test 'builder marks all selected records for collection boxes' do
     @user.tag_ids = [1, 2]
     with_association_for @user, :tags, as: :check_boxes
-    assert_select 'form input[type=checkbox][value=1][checked=checked]'
-    assert_select 'form input[type=checkbox][value=2][checked=checked]'
-    assert_no_select 'form input[type=checkbox][value=3][checked=checked]'
+    assert_select 'form input[type=checkbox][value="1"][checked=checked]'
+    assert_select 'form input[type=checkbox][value="2"][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value="3"][checked=checked]'
   end
 
   test 'builder with collection support giving collection and item wrapper tags' do

data/test/form_builder/button_test.rb

@@ -10,31 +10,31 @@ class ButtonTest < ActionView::TestCase
 
   test 'builder creates buttons' do
     with_button_for :post, :submit
-    assert_select 'form input.button[type=submit][value=Save Post]'
+    assert_select 'form input.button[type=submit][value="Save Post"]'
   end
 
   test 'builder creates buttons with options' do
     with_button_for :post, :submit, class: 'my_button'
-    assert_select 'form input.button.my_button[type=submit][value=Save Post]'
+    assert_select 'form input.button.my_button[type=submit][value="Save Post"]'
   end
 
   test 'builder does not modify the options hash' do
     options = { class: 'my_button' }
     with_button_for :post, :submit, options
-    assert_select 'form input.button.my_button[type=submit][value=Save Post]'
+    assert_select 'form input.button.my_button[type=submit][value="Save Post"]'
     assert_equal({ class: 'my_button' }, options)
   end
 
   test 'builder creates buttons for records' do
     @user.new_record!
     with_button_for @user, :submit
-    assert_select 'form input.button[type=submit][value=Create User]'
+    assert_select 'form input.button[type=submit][value="Create User"]'
   end
 
   test "builder uses the default class from the configuration" do
     swap SimpleForm, button_class: 'btn' do
       with_button_for :post, :submit
-      assert_select 'form input.btn[type=submit][value=Save Post]'
+      assert_select 'form input.btn[type=submit][value="Save Post"]'
     end
   end
 

data/test/form_builder/error_test.rb

@@ -32,7 +32,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'error generates messages for attribute with single error' do
     with_error_for @user, :name
-    assert_select 'span.error', "can't be blank"
+    assert_select 'span.error', "cannot be blank"
   end
 
   test 'error generates messages for attribute with one error when using first' do
@@ -82,12 +82,22 @@ class ErrorTest < ActionView::TestCase
 
   test 'error escapes error prefix text' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'
-    assert_select 'span.error', "&lt;b&gt;Name&lt;/b&gt; can't be blank"
+    assert_no_select 'span.error b'
   end
 
+  test 'error escapes error text' do
+    @user.errors.add(:action, 'must not contain <b>markup</b>')
+
+    with_error_for @user, :action
+
+    assert_select 'span.error'
+    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 can't be blank"
+    assert_select 'span.error', "Name cannot be blank"
     assert_select 'span.error b', "Name"
   end
 
@@ -95,7 +105,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error generates a full error tag for the attribute' do
     with_full_error_for @user, :name
-    assert_select 'span.error', "Super User Name! can't be blank"
+    assert_select 'span.error', "Super User Name! cannot be blank"
   end
 
   test 'full error generates a full error tag with a clean HTML' do
@@ -105,43 +115,60 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error allows passing options to full error tag' do
     with_full_error_for @user, :name, id: 'name_error', error_prefix: "Your name"
-    assert_select 'span.error#name_error', "Your name can't be blank"
+    assert_select 'span.error#name_error', "Your name cannot be blank"
   end
 
   test 'full error does not modify the options hash' do
     options = { id: 'name_error' }
     with_full_error_for @user, :name, options
-    assert_select 'span.error#name_error', "Super User Name! can't be blank"
+    assert_select 'span.error#name_error', "Super User Name! cannot be blank"
     assert_equal({ id: 'name_error' }, options)
   end
 
+  test 'full error escapes error text' do
+    @user.errors.add(:action, 'must not contain <b>markup</b>')
+
+    with_full_error_for @user, :action
+
+    assert_select 'span.error'
+    assert_no_select 'span.error b', 'markup'
+  end
+
   # CUSTOM WRAPPERS
 
   test 'error with custom wrappers works' do
     swap_wrapper do
       with_error_for @user, :name
-      assert_select 'span.omg_error', "can't be blank"
+      assert_select 'span.omg_error', "cannot be blank"
     end
   end
 
   # 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, 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'
+    end
+  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
@@ -150,7 +177,7 @@ class ErrorTest < ActionView::TestCase
   # CUSTOM ERRORS
 
   test 'input with custom error works' do
-    error_text = "Super User Name! can't be blank"
+    error_text = "Super User Name! cannot be blank"
     with_form_for @user, :name, error: error_text
 
     assert_select 'span.error', error_text
@@ -159,26 +186,58 @@ class ErrorTest < ActionView::TestCase
   test 'input with error option as true does not use custom error' do
     with_form_for @user, :name, error: true
 
-    assert_select 'span.error', "can't be blank"
+    assert_select 'span.error', "cannot be blank"
   end
 
   test 'input with custom error does not generate the error if there is no error on the attribute' do
-    with_form_for @user, :active, error: "Super User Active! can't be blank"
+    with_form_for @user, :active, error: "Super User Active! cannot be blank"
 
     assert_no_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
-      error_text = "Super User Name! can't be blank"
+    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
 
       assert_select 'span.error', error_text
     end
   end
 
+  test 'input with custom error escapes the error text' do
+    with_form_for @user, :name, error: 'error must not contain <b>markup</b>'
+
+    assert_select 'span.error'
+    assert_no_select 'span.error b', 'markup'
+  end
+
+  test 'input with custom error does not escape the error text if it is safe' do
+    with_form_for @user, :name, error: 'error must contain <b>markup</b>'.html_safe
+
+    assert_select 'span.error'
+    assert_select 'span.error b', 'markup'
+  end
+
+  test 'input with custom error escapes the error text using full_error component' 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'
+      assert_no_select 'span.error b', 'markup'
+    end
+  end
+
+  test 'input with custom error does not escape the error text if it is safe using full_error component' 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'
+      assert_select 'span.error b', 'markup'
+    end
+  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'