simple_form 3.0.3 → 3.1.0

data/test/form_builder/association_test.rb

@@ -8,7 +8,7 @@ class AssociationTest < ActionView::TestCase
     end
   end
 
-  test 'builder should not allow creating an association input when no object exists' do
+  test 'builder does not allow creating an association input when no object exists' do
     assert_raise ArgumentError do
       with_association_for :post, :author
     end
@@ -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,9 +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"]'
   end
 
   test 'builder marks the record which already belongs to the user' do
@@ -122,20 +130,20 @@ class AssociationTest < ActionView::TestCase
   end
 
   # ASSOCIATIONS - FINDERS
-  test 'builder should use reflection conditions to find collection' do
+  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 should allow overriding collection to association input' do
+  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
 
@@ -146,26 +154,35 @@ class AssociationTest < ActionView::TestCase
     end
   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'
+    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'
+  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
@@ -179,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
@@ -192,7 +209,7 @@ class AssociationTest < ActionView::TestCase
     assert_select 'form ul li', count: 3
   end
 
-  test 'builder with collection support should not change the options hash' do
+  test 'builder with collection support does not change the options hash' do
     options = { as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li}
     with_association_for @user, :tags, options
 

data/test/form_builder/button_test.rb

@@ -8,33 +8,33 @@ class ButtonTest < ActionView::TestCase
     end
   end
 
-  test 'builder should create buttons' do
+  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 should create buttons with options' do
+  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 should not modify the options hash' do
+  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 should create buttons for records' do
+  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 should use the default class from the configuration" do
+  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_notification_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 # Tests for f.error_notification
 class ErrorNotificationTest < ActionView::TestCase
-  def with_error_notification_for(object, options={}, &block)
+  def with_error_notification_for(object, options = {}, &block)
     with_concat_form_for(object) do |f|
       f.error_notification(options)
     end

data/test/form_builder/error_test.rb

@@ -14,69 +14,65 @@ class ErrorTest < ActionView::TestCase
     end
   end
 
-  def with_custom_error_for(object, *args)
-    with_form_for(object, *args)
-  end
-
-  test 'error should not generate content for attribute without errors' do
+  test 'error does not generate content for attribute without errors' do
     with_error_for @user, :active
     assert_no_select 'span.error'
   end
 
-  test 'error should not generate messages when object is not present' do
+  test 'error does not generate messages when object is not present' do
     with_error_for :project, :name
     assert_no_select 'span.error'
   end
 
-  test "error should not generate messages when object doesn't respond to errors method" do
+  test "error does not generate messages when object doesn't respond to errors method" do
     @user.instance_eval { undef errors }
     with_error_for @user, :name
     assert_no_select 'span.error'
   end
 
-  test 'error should generate messages for attribute with single error' do
+  test 'error generates messages for attribute with single error' do
     with_error_for @user, :name
-    assert_select 'span.error', "can&#39;t be blank"
+    assert_select 'span.error', "cannot be blank"
   end
 
-  test 'error should generate messages for attribute with one error when using first' do
+  test 'error generates messages for attribute with one error when using first' do
     swap SimpleForm, error_method: :first do
       with_error_for @user, :age
       assert_select 'span.error', 'is not a number'
     end
   end
 
-  test 'error should generate messages for attribute with several errors when using to_sentence' do
+  test 'error generates messages for attribute with several errors when using to_sentence' do
     swap SimpleForm, error_method: :to_sentence do
       with_error_for @user, :age
       assert_select 'span.error', 'is not a number and must be greater than 18'
     end
   end
 
-  test 'error should be able to pass html options' do
+  test 'error is able to pass html options' do
     with_error_for @user, :name, id: 'error', class: 'yay'
     assert_select 'span#error.error.yay'
   end
 
-  test 'error should not modify the options hash' do
+  test 'error does not modify the options hash' do
     options = { id: 'error', class: 'yay' }
     with_error_for @user, :name, options
     assert_select 'span#error.error.yay'
     assert_equal({ id: 'error', class: 'yay' }, options)
   end
 
-  test 'error should find errors on attribute and association' do
+  test 'error finds errors on attribute and association' do
     with_error_for @user, :company_id, as: :select,
       error_method: :to_sentence, reflection: Association.new(Company, :company, {})
     assert_select 'span.error', 'must be valid and company must be present'
   end
 
-  test 'error should generate an error tag with a clean HTML' do
+  test 'error generates an error tag with a clean HTML' do
     with_error_for @user, :name
     assert_no_select 'span.error[error_html]'
   end
 
-  test 'error should generate an error tag with a clean HTML when errors options are present' do
+  test 'error generates an error tag with a clean HTML when errors options are present' do
     with_error_for @user, :name, error_tag: :p, error_prefix: 'Name', error_method: :first
     assert_no_select 'p.error[error_html]'
     assert_no_select 'p.error[error_tag]'
@@ -84,13 +80,13 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'p.error[error_method]'
   end
 
-  test 'error should escape error prefix text' do
+  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&#39;t be blank"
+    assert_no_select 'span.error b'
   end
 
   test 'error escapes error text' do
-    @user.errors.merge!(action: ['must not contain <b>markup</b>'])
+    @user.errors.add(:action, 'must not contain <b>markup</b>')
 
     with_error_for @user, :action
 
@@ -98,60 +94,116 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error b', 'markup'
   end
 
-  test 'error should generate an error message with raw HTML tags' do
+
+  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&#39;t be blank"
+    assert_select 'span.error', "Name cannot be blank"
     assert_select 'span.error b', "Name"
   end
 
   # FULL ERRORS
 
-  test 'full error should generate an full error tag for the attribute' do
+  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&#39;t be blank"
+    assert_select 'span.error', "Super User Name! cannot be blank"
   end
 
-  test 'full error should generate an full error tag with a clean HTML' do
+  test 'full error generates a full error tag with a clean HTML' do
     with_full_error_for @user, :name
     assert_no_select 'span.error[error_html]'
   end
 
-  test 'full error should allow passing options to full error tag' do
+  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&#39;t be blank"
+    assert_select 'span.error#name_error', "Your name cannot be blank"
   end
 
-  test 'full error should not modify the options hash' do
+  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&#39;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&#39;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
+      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
+      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
+      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
+      with_form_for @user, :company_id, as: :select, error: false
+      assert_no_select 'span.error'
     end
   end
 
   # CUSTOM ERRORS
 
   test 'input with custom error works' do
-    with_custom_error_for(@user, :name, error: "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', "Super User Name! can&#39;t be blank"
+    assert_select 'span.error', error_text
+  end
+
+  test 'input with error option as true does not use custom error' do
+    with_form_for @user, :name, error: true
+
+    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
-    error_text = "Super User Active! can't be blank"
-    with_form_for @user, :active, error: error_text
+    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! 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>'
 
@@ -165,4 +217,30 @@ class ErrorTest < ActionView::TestCase
     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, self.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, self.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
+      with_form_for @user, :active, error: "Super User Active! can't be blank"
+
+      assert_no_select 'span.error'
+    end
+  end
 end