simple_form 2.1.3 → 3.0.0.beta1

data/test/form_builder/button_test.rb

@@ -14,15 +14,15 @@ class ButtonTest < ActionView::TestCase
   end
 
   test 'builder should create buttons with options' do
-    with_button_for :post, :submit, :class => 'my_button'
+    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
-    options = { :class => 'my_button' }
+    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)
+    assert_equal({ class: 'my_button' }, options)
   end
 
   test 'builder should create buttons for records' do
@@ -32,7 +32,7 @@ class ButtonTest < ActionView::TestCase
   end
 
   test "builder should use the default class from the configuration" do
-    swap SimpleForm, :button_class => 'btn' do
+    swap SimpleForm, button_class: 'btn' do
       with_button_for :post, :submit
       assert_select 'form input.btn[type=submit][value=Save Post]'
     end

data/test/form_builder/error_notification_test.rb

@@ -27,7 +27,7 @@ class ErrorNotificationTest < ActionView::TestCase
   end
 
   test 'error notification uses I18n based on model to generate the notification message' do
-    store_translations(:en, :simple_form => { :error_notification => { :user =>
+    store_translations(:en, simple_form: { error_notification: { user:
       'Alguns erros foram encontrados para o usuário:'
     } }) do
       with_error_notification_for @user
@@ -36,8 +36,8 @@ class ErrorNotificationTest < ActionView::TestCase
   end
 
   test 'error notification uses I18n fallbacking to default message' do
-    store_translations(:en, :simple_form => { :error_notification => {
-      :default_message => 'Opa! Alguns erros foram encontrados, poderia verificar?'
+    store_translations(:en, simple_form: { error_notification: {
+      default_message: 'Opa! Alguns erros foram encontrados, poderia verificar?'
     } }) do
       with_error_notification_for @user
       assert_select 'p.error_notification', 'Opa! Alguns erros foram encontrados, poderia verificar?'
@@ -45,30 +45,30 @@ class ErrorNotificationTest < ActionView::TestCase
   end
 
   test 'error notification allows passing the notification message' do
-    with_error_notification_for @user, :message => 'Erro encontrado ao criar usuario'
+    with_error_notification_for @user, message: 'Erro encontrado ao criar usuario'
     assert_select 'p.error_notification', 'Erro encontrado ao criar usuario'
   end
 
   test 'error notification accepts other html options' do
-    with_error_notification_for @user, :id => 'user_error_message', :class => 'form_error'
+    with_error_notification_for @user, id: 'user_error_message', class: 'form_error'
     assert_select 'p#user_error_message.form_error.error_notification'
   end
 
   test 'error notification allows configuring the wrapper element' do
-    swap SimpleForm, :error_notification_tag => :div do
+    swap SimpleForm, error_notification_tag: :div do
       with_error_notification_for @user
       assert_select 'div.error_notification'
     end
   end
 
   test 'error notification can contain HTML tags' do
-    with_error_notification_for @user, :message => 'Erro encontrado ao criar <b>usuário</b>'
+    with_error_notification_for @user, message: 'Erro encontrado ao criar <b>usuário</b>'
     assert_select 'p.error_notification', 'Erro encontrado ao criar usuário'
     assert_select 'p.error_notification b', 'usuário'
   end
 
   test 'error notification uses I18n based on model to generate the notification message and accepts HTML' do
-    store_translations(:en, :simple_form => { :error_notification => { :user =>
+    store_translations(:en, simple_form: { error_notification: { user:
       'Alguns erros foram encontrados para o <b>usuário</b>:'
     } }) do
       with_error_notification_for @user

data/test/form_builder/error_test.rb

@@ -14,10 +14,6 @@ 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
     with_error_for @user, :active
     assert_no_select 'span.error'
@@ -36,38 +32,38 @@ class ErrorTest < ActionView::TestCase
 
   test 'error should generate messages for attribute with single error' do
     with_error_for @user, :name
-    assert_select 'span.error', "can&#x27;t be blank"
+    assert_select 'span.error', "can't be blank"
   end
 
   test 'error should generate messages for attribute with one error when using first' do
-    swap SimpleForm, :error_method => :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
-    swap SimpleForm, :error_method => :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
-    with_error_for @user, :name, :id => 'error', :class => 'yay'
+    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
-    options = { :id => 'error', :class => 'yay' }
+    options = { id: 'error', class: 'yay' }
     with_error_for @user, :name, options
     assert_select 'span#error.error.yay'
-    assert_equal({ :id => 'error', :class => 'yay' }, options)
+    assert_equal({ id: 'error', class: 'yay' }, options)
   end
 
   test 'error should find errors on attribute and association' do
-    with_error_for @user, :company_id, :as => :select,
-      :error_method => :to_sentence, :reflection => Association.new(Company, :company, {})
+    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
 
@@ -77,30 +73,16 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'error should generate 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
+    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]'
     assert_no_select 'p.error[error_prefix]'
     assert_no_select 'p.error[error_method]'
   end
 
-  test 'error should escape 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&#x27;t be blank"
-  end
-
-  test 'error escapes error text' do
-    @user.errors.merge!(: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 should generate 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&#x27;t be blank"
+    with_error_for @user, :name, error_prefix: '<b>Name</b>'
+    assert_select 'span.error', "Name can't be blank"
     assert_select 'span.error b', "Name"
   end
 
@@ -108,7 +90,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error should generate an full error tag for the attribute' do
     with_full_error_for @user, :name
-    assert_select 'span.error', "Super User Name! can&#x27;t be blank"
+    assert_select 'span.error', "Super User Name! can't be blank"
   end
 
   test 'full error should generate an full error tag with a clean HTML' do
@@ -117,15 +99,15 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'full error should allow 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&#x27;t be blank"
+    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"
   end
 
   test 'full error should not modify the options hash' do
-    options = { :id => 'name_error' }
+    options = { id: 'name_error' }
     with_full_error_for @user, :name, options
-    assert_select 'span.error#name_error', "Super User Name! can&#x27;t be blank"
-    assert_equal({ :id => 'name_error' }, options)
+    assert_select 'span.error#name_error', "Super User Name! can't be blank"
+    assert_equal({ id: 'name_error' }, options)
   end
 
   # CUSTOM WRAPPERS
@@ -133,36 +115,7 @@ class ErrorTest < ActionView::TestCase
   test 'error with custom wrappers works' do
     swap_wrapper do
       with_error_for @user, :name
-      assert_select 'span.omg_error', "can&#x27;t be blank"
+      assert_select 'span.omg_error', "can't be blank"
     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")
-
-    assert_select 'span.error', "Super User Name! can&#x27;t 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
-
-    assert_no_select 'span.error'
-  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
 end

data/test/form_builder/general_test.rb

@@ -24,14 +24,14 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder input should allow a block to configure input' do
     with_form_for @user, :name do
-      text_field_tag :foo, :bar, :id => :cool
+      text_field_tag :foo, :bar, id: :cool
     end
     assert_no_select 'input.string'
     assert_select 'input#cool'
   end
 
   test 'builder should allow adding custom input mappings for default input types' do
-    swap SimpleForm, :input_mappings => { /count$/ => :integer } do
+    swap SimpleForm, input_mappings: { /count$/ => :integer } do
       with_form_for @user, :post_count
       assert_no_select 'form input#user_post_count.string'
       assert_select 'form input#user_post_count.numeric.integer'
@@ -39,7 +39,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow to skip input_type class' do
-    swap SimpleForm, :generate_additional_classes_for => [:label, :wrapper] do
+    swap SimpleForm, generate_additional_classes_for: [:label, :wrapper] do
       with_form_for @user, :post_count
       assert_no_select "form input#user_post_count.integer"
       assert_select "form input#user_post_count"
@@ -47,7 +47,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow to add additional classes only for wrapper' do
-    swap SimpleForm, :generate_additional_classes_for => [:wrapper] do
+    swap SimpleForm, generate_additional_classes_for: [:wrapper] do
       with_form_for @user, :post_count
       assert_no_select "form input#user_post_count.string"
       assert_no_select "form label#user_post_count.string"
@@ -56,7 +56,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow adding custom input mappings for integer input types' do
-    swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
+    swap SimpleForm, input_mappings: { /lock_version/ => :hidden } do
       with_form_for @user, :lock_version
       assert_no_select 'form input#user_lock_version.integer'
       assert_select 'form input#user_lock_version.hidden'
@@ -64,7 +64,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder uses the first matching custom input map when more than one matches' do
-    swap SimpleForm, :input_mappings => { /count$/ => :integer, /^post_/ => :password } do
+    swap SimpleForm, input_mappings: { /count$/ => :integer, /^post_/ => :password } do
       with_form_for @user, :post_count
       assert_no_select 'form input#user_post_count.password'
       assert_select 'form input#user_post_count.numeric.integer'
@@ -72,33 +72,13 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder uses the custom map only for matched attributes' do
-    swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
+    swap SimpleForm, input_mappings: { /lock_version/ => :hidden } do
       with_form_for @user, :post_count
       assert_no_select 'form input#user_post_count.hidden'
       assert_select 'form input#user_post_count.string'
     end
   end
 
-  test 'builder allow to use numbers in the model name' do
-    user = UserNumber1And2.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :created_at => Time.now
-    })
-
-    user.tags = [Tag.new(nil, 'Tag1')]
-
-    with_concat_form_for(user, :url => '/') do |f|
-      f.simple_fields_for(:tags) do |tags|
-        tags.input :name
-      end
-    end
-
-    assert_select 'form .user_number1_and2_tags_name'
-    assert_no_select 'form .user_number1_and2_tags_1_name'
-  end
-
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name
@@ -194,46 +174,46 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'build should generate select if a collection is given' do
-    with_form_for @user, :age, :collection => 1..60
+    with_form_for @user, :age, collection: 1..60
     assert_select 'form select#user_age.select'
   end
 
   test 'builder should allow overriding default input type for text' do
-    with_form_for @user, :name, :as => :text
+    with_form_for @user, :name, as: :text
     assert_no_select 'form input#user_name'
     assert_select 'form textarea#user_name.text'
 
-    with_form_for @user, :active, :as => :radio_buttons
+    with_form_for @user, :active, as: :radio_buttons
     assert_no_select 'form input[type=checkbox]'
-    assert_select 'form input.radio_buttons[type=radio]', :count => 2
+    assert_select 'form input.radio_buttons[type=radio]', count: 2
 
-    with_form_for @user, :born_at, :as => :string
+    with_form_for @user, :born_at, as: :string
     assert_no_select 'form select'
     assert_select 'form input#user_born_at.string'
   end
 
   # COMMON OPTIONS
   test 'builder should add chosen form class' do
-    swap SimpleForm, :form_class => :my_custom_class do
+    swap SimpleForm, form_class: :my_custom_class do
       with_form_for @user, :name
       assert_select 'form.my_custom_class'
     end
   end
 
   test 'builder should allow passing options to input' do
-    with_form_for @user, :name, :input_html => { :class => 'my_input', :id => 'my_input' }
+    with_form_for @user, :name, input_html: { class: 'my_input', id: 'my_input' }
     assert_select 'form input#my_input.my_input.string'
   end
 
   test 'builder should not propagate input options to wrapper' do
-    with_form_for @user, :name, :input_html => { :class => 'my_input', :id => 'my_input' }
+    with_form_for @user, :name, input_html: { class: 'my_input', id: 'my_input' }
     assert_no_select 'form div.input.my_input.string'
     assert_select 'form input#my_input.my_input.string'
   end
 
   test 'builder should not propagate input options to wrapper with custom wrapper' do
     swap_wrapper :default, self.custom_wrapper_with_wrapped_input do
-      with_form_for @user, :name, :input_html => { :class => 'my_input' }
+      with_form_for @user, :name, input_html: { class: 'my_input' }
       assert_no_select 'form div.input.my_input'
       assert_select 'form input.my_input.string'
     end
@@ -241,7 +221,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should not propagate label options to wrapper with custom wrapper' do
     swap_wrapper :default, self.custom_wrapper_with_wrapped_label do
-      with_form_for @user, :name, :label_html => { :class => 'my_label' }
+      with_form_for @user, :name, label_html: { class: 'my_label' }
       assert_no_select 'form div.label.my_label'
       assert_select 'form label.my_label.string'
     end
@@ -253,22 +233,22 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should be able to disable the label for a input' do
-    with_form_for @user, :name, :label => false
+    with_form_for @user, :name, label: false
     assert_no_select 'form label'
   end
 
   test 'builder should be able to disable the label for an input and return a html safe string' do
-    with_form_for @user, :name, :label => false, :wrapper => custom_wrapper_with_wrapped_label_input
+    with_form_for @user, :name, label: false, wrapper: custom_wrapper_with_wrapped_label_input
     assert_select 'form input#user_name'
   end
 
   test 'builder should use custom label' do
-    with_form_for @user, :name, :label => 'Yay!'
+    with_form_for @user, :name, label: 'Yay!'
     assert_select 'form label', /Yay!/
   end
 
   test 'builder should pass options to label' do
-    with_form_for @user, :name, :label_html => { :id => "cool" }
+    with_form_for @user, :name, label_html: { id: "cool" }
     assert_select 'form label#cool', /Name/
   end
 
@@ -278,21 +258,21 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should be able to add a hint for a input' do
-    with_form_for @user, :name, :hint => 'test'
+    with_form_for @user, :name, hint: 'test'
     assert_select 'span.hint', 'test'
   end
 
   test 'builder should be able to disable a hint even if it exists in i18n' do
-    store_translations(:en, :simple_form => { :hints => { :name => 'Hint test' } }) do
+    store_translations(:en, simple_form: { hints: { name: 'Hint test' } }) do
       SimpleForm::Inputs::Base.any_instance.expects(:hint).never
 
-      with_form_for @user, :name, :hint => false
+      with_form_for @user, :name, hint: false
       assert_no_select 'span.hint'
     end
   end
 
   test 'builder should pass options to hint' do
-    with_form_for @user, :name, :hint => 'test', :hint_html => { :id => "cool" }
+    with_form_for @user, :name, hint: 'test', hint_html: { id: "cool" }
     assert_select 'span.hint#cool', 'test'
   end
 
@@ -303,24 +283,24 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should generate errors for attribute with errors' do
     with_form_for @user, :name
-    assert_select 'span.error', "can&#x27;t be blank"
+    assert_select 'span.error', "can't be blank"
   end
 
   test 'builder should be able to disable showing errors for a input' do
-    with_form_for @user, :name, :error => false
+    with_form_for @user, :name, error: false
     assert_no_select 'span.error'
   end
 
   test 'builder should pass options to errors' do
-    with_form_for @user, :name, :error_html => { :id => "cool" }
-    assert_select 'span.error#cool', "can&#x27;t be blank"
+    with_form_for @user, :name, error_html: { id: "cool" }
+    assert_select 'span.error#cool', "can't be blank"
   end
 
   test 'placeholder should not be generated when set to false' do
-    store_translations(:en, :simple_form => { :placeholders => { :user => {
-      :name => 'Name goes here'
+    store_translations(:en, simple_form: { placeholders: { user: {
+      name: 'Name goes here'
     } } }) do
-      with_form_for @user, :name, :placeholder => false
+      with_form_for @user, :name, placeholder: false
       assert_no_select 'input[placeholder]'
     end
   end
@@ -328,14 +308,14 @@ class FormBuilderTest < ActionView::TestCase
   # DEFAULT OPTIONS
   [:input, :input_field].each do |method|
     test "builder should receive a default argument and pass it to the inputs when calling '#{method}'" do
-      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+      with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
         f.send(method, :name)
       end
       assert_select 'input.default_class'
     end
 
     test "builder should receive a default argument and pass it to the inputs without changing the defaults when calling '#{method}'" do
-      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
+      with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
         concat(f.send(method, :name))
         concat(f.send(method, :credit_limit))
       end
@@ -347,7 +327,7 @@ class FormBuilderTest < ActionView::TestCase
     test "builder should receive a default argument and pass it to the inputs and nested form when calling '#{method}'" do
       @user.company = Company.new(1, 'Empresa')
 
-      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+      with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
         concat(f.send(method, :name))
         concat(f.simple_fields_for(:company) do |company_form|
           concat(company_form.send(method, :name))
@@ -360,29 +340,29 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test "builder should receive a default argument and pass it to the inputs when calling 'input', respecting the specific options" do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
-      f.input :name, :input_html => { :id => 'specific_id' }
+    with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
+      f.input :name, input_html: { id: 'specific_id' }
     end
     assert_select 'input.default_class#specific_id'
   end
 
   test "builder should receive a default argument and pass it to the inputs when calling 'input_field', respecting the specific options" do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
-      f.input_field :name, :id => 'specific_id'
+    with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
+      f.input_field :name, id: 'specific_id'
     end
     assert_select 'input.default_class#specific_id'
   end
 
   test "builder should receive a default argument and pass it to the inputs when calling 'input', overwriting the defaults with specific options" do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
-      f.input :name, :input_html => { :id => 'specific_id' }
+    with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
+      f.input :name, input_html: { id: 'specific_id' }
     end
     assert_select 'input.default_class#specific_id'
   end
 
   test "builder should receive a default argument and pass it to the inputs when calling 'input_field', overwriting the defaults with specific options" do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
-      f.input_field :name, :id => 'specific_id'
+    with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
+      f.input_field :name, id: 'specific_id'
     end
     assert_select 'input.default_class#specific_id'
   end
@@ -406,9 +386,9 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow overriding input type when object is not present' do
-    with_form_for :project, :created_at, :as => :datetime
+    with_form_for :project, :created_at, as: :datetime
     assert_select 'form select.datetime#project_created_at_1i'
-    with_form_for :project, :budget, :as => :decimal
+    with_form_for :project, :budget, as: :decimal
     assert_select 'form input.decimal#project_budget'
   end