simple_form 3.0.4 → 3.1.0.rc2

data/test/action_view_extensions/form_helper_test.rb

@@ -8,17 +8,17 @@ class FormHelperTest < ActionView::TestCase
     end
   end
 
-  test 'SimpleForm should add default class to form' do
+  test 'SimpleForm adds default class to form' do
     with_concat_form_for(:user)
     assert_select 'form.simple_form'
   end
 
-  test 'SimpleForm should use default browser validations by default' do
+  test 'SimpleForm uses default browser validations by default' do
     with_concat_form_for(:user)
     assert_no_select 'form[novalidate]'
   end
 
-  test 'SimpleForm should not use default browser validations if specified in the configuration options' do
+  test 'SimpleForm does not use default browser validations if specified in the configuration options' do
     swap SimpleForm, browser_validations: false do
       with_concat_form_for(:user)
       assert_select 'form[novalidate="novalidate"]'
@@ -37,54 +37,54 @@ class FormHelperTest < ActionView::TestCase
     end
   end
 
-  test 'SimpleForm should add object name as css class to form when object is not present' do
+  test 'SimpleForm adds object name as css class to form when object is not present' do
     with_concat_form_for(:user, html: { novalidate: true })
     assert_select 'form.simple_form.user'
   end
 
-  test 'SimpleForm should add :as option as css class to form when object is not present' do
+  test 'SimpleForm adds :as option as css class to form when object is not present' do
     with_concat_form_for(:user, as: 'superuser')
     assert_select 'form.simple_form.superuser'
   end
 
-  test 'SimpleForm should add object class name with new prefix as css class to form if record is not persisted' do
+  test 'SimpleForm adds object class name with new prefix as css class to form if record is not persisted' do
     @user.new_record!
     with_concat_form_for(@user)
     assert_select 'form.simple_form.new_user'
   end
 
-  test 'SimpleForm should add :as option with new prefix as css class to form if record is not persisted' do
+  test 'SimpleForm adds :as option with new prefix as css class to form if record is not persisted' do
     @user.new_record!
     with_concat_form_for(@user, as: 'superuser')
     assert_select 'form.simple_form.new_superuser'
   end
 
-  test 'SimpleForm should add edit class prefix as css class to form if record is persisted' do
+  test 'SimpleForm adds edit class prefix as css class to form if record is persisted' do
     with_concat_form_for(@user)
     assert_select 'form.simple_form.edit_user'
   end
 
-  test 'SimpleForm should add :as options with edit prefix as css class to form if record is persisted' do
+  test 'SimpleForm adds :as options with edit prefix as css class to form if record is persisted' do
     with_concat_form_for(@user, as: 'superuser')
     assert_select 'form.simple_form.edit_superuser'
   end
 
-  test 'SimpleForm should add last object name as css class to form when there is array of objects' do
+  test 'SimpleForm adds last object name as css class to form when there is array of objects' do
     with_concat_form_for([Company.new, @user])
     assert_select 'form.simple_form.edit_user'
   end
 
-  test 'SimpleForm should not add object class to form if css_class is specified' do
+  test 'SimpleForm does not add object class to form if css_class is specified' do
     with_concat_form_for(:user, html: { class: nil })
     assert_no_select 'form.user'
   end
 
-  test 'SimpleForm should add custom class to form if css_class is specified' do
+  test 'SimpleForm adds custom class to form if css_class is specified' do
     with_concat_form_for(:user, html: { class: 'my_class' })
     assert_select 'form.my_class'
   end
 
-  test 'pass options to SimpleForm' do
+  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]'

data/test/components/label_test.rb

@@ -7,34 +7,34 @@ class IsolatedLabelTest < ActionView::TestCase
     SimpleForm::Inputs::Base.reset_i18n_cache :translate_required_html
   end
 
-  def with_label_for(object, attribute_name, type, options={})
+  def with_label_for(object, attribute_name, type, options = {})
     with_concat_form_for(object) do |f|
       options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
       SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).label
     end
   end
 
-  test 'label should generate a default humanized description' do
+  test 'label generates a default humanized description' do
     with_label_for @user, :name, :string
     assert_select 'label[for=user_name]', /Name/
   end
 
-  test 'label should allow a customized description' do
+  test 'label allows a customized description' do
     with_label_for @user, :name, :string, label: 'My label!'
     assert_select 'label[for=user_name]', /My label!/
   end
 
-  test 'label should use human attribute name from object when available' do
+  test 'label uses human attribute name from object when available' do
     with_label_for @user, :description, :text
     assert_select 'label[for=user_description]', /User Description!/
   end
 
-  test 'label should use human attribute name based on association name' do
+  test 'label uses human attribute name based on association name' do
     with_label_for @user, :company_id, :string, setup_association: true
     assert_select 'label', /Company Human Name!/
   end
 
-  test 'label should use i18n based on model, action, and attribute to lookup translation' do
+  test 'label uses i18n based on model, action, and attribute to lookup translation' do
     @controller.action_name = "new"
     store_translations(:en, simple_form: { labels: { user: {
       new: { description: 'Nova descrição' }
@@ -44,7 +44,7 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should fallback to new when action is create' do
+  test 'label fallbacks to new when action is create' do
     @controller.action_name = "create"
     store_translations(:en, simple_form: { labels: { user: {
       new: { description: 'Nova descrição' }
@@ -54,7 +54,7 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should not explode while looking for i18n translation when action is not set' do
+  test 'label does not explode while looking for i18n translation when action is not set' do
     def @controller.action_name; nil; end
 
     assert_nothing_raised do
@@ -63,7 +63,7 @@ class IsolatedLabelTest < ActionView::TestCase
     assert_select 'label[for=user_description]'
   end
 
-  test 'label should use i18n based on model and attribute to lookup translation' do
+  test 'label uses i18n based on model and attribute to lookup translation' do
     store_translations(:en, simple_form: { labels: { user: {
       description: 'Descrição'
     } } }) do
@@ -72,14 +72,14 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should use i18n under defaults to lookup translation' do
+  test 'label uses i18n under defaults to lookup translation' do
     store_translations(:en, simple_form: { labels: { defaults: { age: 'Idade' } } }) do
       with_label_for @user, :age, :integer
       assert_select 'label[for=user_age]', /Idade/
     end
   end
 
-  test 'label should not use i18n label if translate is false' do
+  test 'label does not use i18n label if translate is false' do
     swap SimpleForm, translate_labels: false do
       store_translations(:en, simple_form: { labels: { defaults: { age: 'Idade' } } }) do
         with_label_for @user, :age, :integer
@@ -107,7 +107,7 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should do correct i18n lookup for nested models with nested translation' do
+  test 'label does correct i18n lookup for nested models with nested translation' do
     @user.company = Company.new(1, 'Empresa')
 
     store_translations(:en, simple_form: { labels: {
@@ -125,7 +125,7 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should do correct i18n lookup for nested models with no nested translation' do
+  test 'label does correct i18n lookup for nested models with no nested translation' do
     @user.company = Company.new(1, 'Empresa')
 
     store_translations(:en, simple_form: { labels: {
@@ -144,7 +144,7 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should do correct i18n lookup for nested has_many models with no nested translation' do
+  test 'label does correct i18n lookup for nested has_many models with no nested translation' do
     @user.tags = [Tag.new(1, 'Empresa')]
 
     store_translations(:en, simple_form: { labels: {
@@ -163,7 +163,7 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should have css class from type' do
+  test 'label has css class from type' do
     with_label_for @user, :name, :string
     assert_select 'label.string'
     with_label_for @user, :description, :text
@@ -176,7 +176,7 @@ class IsolatedLabelTest < ActionView::TestCase
     assert_select 'label.datetime'
   end
 
-  test 'label should not have css class from type when generate_additional_classes_for does not include :label' do
+  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
       with_label_for @user, :name, :string
       assert_no_select 'label.string'
@@ -191,21 +191,21 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should not generate empty css class' do
+  test 'label does not generate empty css class' do
     swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
       with_label_for @user, :name, :string
       assert_no_select 'label[class]'
     end
   end
 
-  test 'label should obtain required from ActiveModel::Validations when it is included' do
+  test 'label obtains required from ActiveModel::Validations when it is included' do
     with_label_for @validating_user, :name, :string
     assert_select 'label.required'
     with_label_for @validating_user, :status, :string
     assert_select 'label.optional'
   end
 
-  test 'label should not obtain required from ActiveModel::Validations when generate_additional_classes_for does not include :label' do
+  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
       with_label_for @validating_user, :name, :string
       assert_no_select 'label.required'
@@ -214,48 +214,48 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should allow overriding required when ActiveModel::Validations is included' do
+  test 'label allows overriding required when ActiveModel::Validations is included' do
     with_label_for @validating_user, :name, :string, required: false
     assert_select 'label.optional'
     with_label_for @validating_user, :status, :string, required: true
     assert_select 'label.required'
   end
 
-  test 'label should be required by default when ActiveModel::Validations is not included' do
+  test 'label is required by default when ActiveModel::Validations is not included' do
     with_label_for @user, :name, :string
     assert_select 'label.required'
   end
 
-  test 'label should be able to disable required when ActiveModel::Validations is not included' do
+  test 'label is able to disable required when ActiveModel::Validations is not included' do
     with_label_for @user, :name, :string, required: false
     assert_no_select 'label.required'
   end
 
-  test 'label should add required text when required' do
+  test 'label adds required text when required' do
     with_label_for @user, :name, :string
     assert_select 'label.required abbr[title=required]', '*'
   end
 
-  test 'label should not have required text in no required inputs' do
+  test 'label does not have required text in no required inputs' do
     with_label_for @user, :name, :string, required: false
     assert_no_select 'form label abbr'
   end
 
-  test 'label should use i18n to find required text' do
+  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]', '*'
     end
   end
 
-  test 'label should use i18n to find required mark' do
+  test 'label uses i18n to find required mark' do
     store_translations(:en, simple_form: { required: { mark: '*-*' } }) do
       with_label_for @user, :name, :string
       assert_select 'form label abbr', '*-*'
     end
   end
 
-  test 'label should use i18n to find required string tag' do
+  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
       assert_no_select 'form label abbr'
@@ -263,37 +263,37 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should allow overwriting input id' do
+  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]'
   end
 
-  test 'label should allow overwriting of for attribute' do
+  test 'label allows overwriting of for attribute' do
     with_label_for @user, :name, :string, label_html: { for: 'my_new_id' }
     assert_select 'label[for=my_new_id]'
   end
 
-  test 'label should allow overwriting of for attribute with input_html not containing id' do
+  test 'label allows overwriting of for attribute with input_html not containing id' do
     with_label_for @user, :name, :string, label_html: { for: 'my_new_id' }, input_html: { class: 'foo' }
     assert_select 'label[for=my_new_id]'
   end
 
-  test 'label should use default input id when it was not overridden' do
+  test 'label uses default input id when it was not overridden' do
     with_label_for @user, :name, :string, input_html: { class: 'my_new_id' }
     assert_select 'label[for=user_name]'
   end
 
-  test 'label should be generated properly when object is not present' do
+  test 'label is generated properly when object is not present' do
     with_label_for :project, :name, :string
     assert_select 'label[for=project_name]', /Name/
   end
 
-  test 'label should include for attribute for select collection' do
+  test 'label includes for attribute for select collection' do
     with_label_for @user, :sex, :select, collection: [:male, :female]
     assert_select 'label[for=user_sex]'
   end
 
-  test 'label should use i18n properly when object is not present' do
+  test 'label uses i18n properly when object is not present' do
     store_translations(:en, simple_form: { labels: {
       project: { name: 'Nome' }
     } }) do
@@ -302,14 +302,14 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
-  test 'label should add required by default when object is not present' do
+  test 'label adds required by default when object is not present' do
     with_label_for :project, :name, :string
     assert_select 'label.required[for=project_name]'
     with_label_for :project, :description, :string, required: false
     assert_no_select 'label.required[for=project_description]'
   end
 
-  test 'label should add chosen label class' do
+  test 'label adds chosen label class' do
     swap SimpleForm, label_class: :my_custom_class do
       with_label_for @user, :name, :string
       assert_select 'label.my_custom_class'

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
@@ -113,6 +113,14 @@ class AssociationTest < ActionView::TestCase
     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
     @user.company_id = 2
     with_association_for @user, :company, as: :radio_buttons
@@ -122,7 +130,7 @@ 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]'
@@ -130,7 +138,7 @@ class AssociationTest < ActionView::TestCase
     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'
@@ -146,6 +154,15 @@ 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'
@@ -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,30 +8,30 @@ 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]'
   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]'
   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_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]'
   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]'

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