simple_form 2.0.0.rc → 2.0.0

data/test/action_view_extensions/form_helper_test.rb

@@ -2,23 +2,23 @@ require 'test_helper'
 
 class FormHelperTest < ActionView::TestCase
 
-  test 'simple form for yields an instance of FormBuilder' do
+  test 'SimpleForm for yields an instance of FormBuilder' do
     simple_form_for :user do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
     end
   end
 
-  test 'simple form should add default class to form' do
+  test 'SimpleForm should add default class to form' do
     concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form'
   end
 
-  test 'simple form should use default browser validations by default' do
+  test 'SimpleForm should use default browser validations by default' do
     concat(simple_form_for(:user) do |f| end)
     assert_no_select 'form[novalidate]'
   end
 
-  test 'simple form should not use default browser validations if specified in the configuration options' do
+  test 'SimpleForm should not use default browser validations if specified in the configuration options' do
     swap SimpleForm, :browser_validations => false do
       concat(simple_form_for(:user) do |f| end)
       assert_select 'form[novalidate="novalidate"]'
@@ -37,49 +37,49 @@ class FormHelperTest < ActionView::TestCase
     end
   end
 
-  test 'simple form should add object name as css class to form when object is not present' do
+  test 'SimpleForm should add object name as css class to form when object is not present' do
     concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form.user'
   end
 
-  test 'simple form should add :as option as css class to form when object is not present' do
+  test 'SimpleForm should add :as option as css class to form when object is not present' do
     concat(simple_form_for(:user, :as => 'superuser') do |f| end)
     assert_select 'form.simple_form.superuser'
   end
 
-  test 'simple form should add object class name with new prefix as css class to form if record is not persisted' do
+  test 'SimpleForm should add object class name with new prefix as css class to form if record is not persisted' do
     @user.new_record!
     concat(simple_form_for(@user) do |f| end)
     assert_select 'form.simple_form.new_user'
   end
 
-  test 'simple form should add :as option with new prefix as css class to form if record is not persisted' do
+  test 'SimpleForm should add :as option with new prefix as css class to form if record is not persisted' do
     @user.new_record!
     concat(simple_form_for(@user, :as => 'superuser') do |f| end)
     assert_select 'form.simple_form.new_superuser'
   end
 
-  test 'simple form should add edit class prefix as css class to form if record is persisted' do
+  test 'SimpleForm should add edit class prefix as css class to form if record is persisted' do
     concat(simple_form_for(@user) do |f| end)
     assert_select 'form.simple_form.edit_user'
   end
 
-  test 'simple form should add :as options with edit prefix as css class to form if record is persisted' do
+  test 'SimpleForm should add :as options with edit prefix as css class to form if record is persisted' do
     concat(simple_form_for(@user, :as => 'superuser') do |f| end)
     assert_select 'form.simple_form.edit_superuser'
   end
 
-  test 'simple form should not add object class to form if css_class is specified' do
+  test 'SimpleForm should not add object class to form if css_class is specified' do
     concat(simple_form_for(:user, :html => {:class => nil}) do |f| end)
     assert_no_select 'form.user'
   end
 
-  test 'simple form should add custom class to form if css_class is specified' do
+  test 'SimpleForm should add custom class to form if css_class is specified' do
     concat(simple_form_for(:user, :html => {:class => 'my_class'}) do |f| end)
     assert_select 'form.my_class'
   end
 
-  test 'pass options to simple form' do
+  test 'pass options to SimpleForm' do
     concat(simple_form_for(:user, :url => '/account', :html => { :id => 'my_form' }) do |f| end)
     assert_select 'form#my_form'
     assert_select 'form[action=/account]'

data/test/components/label_test.rb

@@ -166,6 +166,21 @@ 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
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :input] do
+      with_label_for @user, :name, :string
+      assert_no_select 'label.string'
+      with_label_for @user, :description, :text
+      assert_no_select 'label.text'
+      with_label_for @user, :age, :integer
+      assert_no_select 'label.integer'
+      with_label_for @user, :born_at, :date
+      assert_no_select 'label.date'
+      with_label_for @user, :created_at, :datetime
+      assert_no_select 'label.datetime'
+    end
+  end
+
   test 'label should obtain required from ActiveModel::Validations when it is included' do
     with_label_for @validating_user, :name, :string
     assert_select 'label.required'
@@ -173,6 +188,15 @@ class IsolatedLabelTest < ActionView::TestCase
     assert_select 'label.optional'
   end
 
+  test 'label should 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'
+      with_label_for @validating_user, :status, :string
+      assert_no_select 'label.optional'
+    end
+  end
+
   test 'label should allow overriding required when ActiveModel::Validations is included' do
     with_label_for @validating_user, :name, :string, :required => false
     assert_select 'label.optional'

data/test/form_builder/association_test.rb

@@ -164,4 +164,14 @@ class AssociationTest < ActionView::TestCase
     assert_select 'form ul', :count => 1
     assert_select 'form ul li', :count => 3
   end
+
+  test 'builder with collection support should not change the options hash' do
+    options = { :as => :check_boxes, :collection_wrapper_tag => :ul, :item_wrapper_tag => :li}
+    with_association_for @user, :tags, options
+
+    assert_select 'form ul', :count => 1
+    assert_select 'form ul li', :count => 3
+    assert_equal({ :as => :check_boxes, :collection_wrapper_tag => :ul, :item_wrapper_tag => :li},
+                 options)
+  end
 end

data/test/form_builder/button_test.rb

@@ -13,6 +13,18 @@ class ButtonTest < ActionView::TestCase
     assert_select 'form input.button[type=submit][value=Save Post]'
   end
 
+  test 'builder should create 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
+    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
     @user.new_record!
     with_button_for @user, :submit
@@ -25,4 +37,11 @@ class ButtonTest < ActionView::TestCase
       assert_select 'form input.btn[type=submit][value=Save Post]'
     end
   end
+
+  if ActionView::Helpers::FormBuilder.method_defined?(:button)
+    test "allows to use Rails button helper when available" do
+      with_button_for :post, :button, 'Save!'
+      assert_select 'form button.button[type=submit]', 'Save!'
+    end
+  end
 end

data/test/form_builder/error_notification_test.rb

@@ -60,4 +60,20 @@ class ErrorNotificationTest < ActionView::TestCase
       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>'
+    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 =>
+      'Alguns erros foram encontrados para o <b>usuário</b>:'
+    } }) do
+      with_error_notification_for @user
+      assert_select 'p.error_notification', 'Alguns erros foram encontrados para o usuário:'
+      assert_select 'p.error_notification b', 'usuário'
+    end
+  end
 end

data/test/form_builder/error_test.rb

@@ -54,6 +54,13 @@ class ErrorTest < ActionView::TestCase
     assert_select 'span#error.error.yay'
   end
 
+  test 'error should 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
     with_error_for @user, :company_id, :as => :select,
       :error_method => :to_sentence, :reflection => Association.new(Company, :company, {})
@@ -73,6 +80,12 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'p.error[error_method]'
   end
 
+  test 'error should generate an error message with raw HTML tags' do
+    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
+
   # FULL ERRORS
 
   test 'full error should generate an full error tag for the attribute' do
@@ -80,7 +93,7 @@ class ErrorTest < ActionView::TestCase
     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
+  test 'full error should generate an full error tag with a clean HTML' do
     with_full_error_for @user, :name
     assert_no_select 'span.error[error_html]'
   end
@@ -90,6 +103,13 @@ class ErrorTest < ActionView::TestCase
     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' }
+    with_full_error_for @user, :name, options
+    assert_select 'span.error#name_error', "Super User Name! can't be blank"
+    assert_equal({ :id => 'name_error' }, options)
+  end
+
   # CUSTOM WRAPPERS
 
   test 'error with custom wrappers works' do

data/test/form_builder/general_test.rb

@@ -38,6 +38,14 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should allow to skip input_type class' 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"
+    end
+  end
+
   test 'builder should allow adding custom input mappings for integer input types' do
     swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
       with_form_for @user, :lock_version

data/test/form_builder/hint_test.rb

@@ -18,9 +18,17 @@ class HintTest < ActionView::TestCase
     assert_select 'span.hint', 'Use with care...'
   end
 
+  test 'hint should not modify the options hash' do
+    options = { :hint => 'Use with care...' }
+    with_hint_for @user, :name, options
+    assert_select 'span.hint', 'Use with care...'
+    assert_equal({ :hint => 'Use with care...' }, options)
+  end
+
   test 'hint should be generated cleanly with optional text' do
-    with_hint_for @user, :name, :hint => 'Use with care...'
+    with_hint_for @user, :name, :hint => 'Use with care...', :hint_tag => :span
     assert_no_select 'span.hint[hint]'
+    assert_no_select 'span.hint[hint_tag]'
     assert_no_select 'span.hint[hint_html]'
   end
 
@@ -109,7 +117,7 @@ class HintTest < ActionView::TestCase
   test 'hint with custom wrappers works' do
     swap_wrapper do
       with_hint_for @user, :name, :hint => "can't be blank"
-      assert_select 'span.omg_hint', "can't be blank"
+      assert_select 'div.omg_hint', "can't be blank"
     end
   end
 end

data/test/form_builder/input_field_test.rb

@@ -29,6 +29,18 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input.string.name#name_input'
   end
 
+  test 'builder input_field should not modify the options hash' do
+    options = { :id => 'name_input', :class => 'name' }
+
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, options
+    end
+
+    assert_select 'input.string.name#name_input'
+    assert_equal({ :id => 'name_input', :class => 'name' }, options)
+  end
+
+
   test 'builder input_field should generate an input tag with a clean HTML' do
     with_concat_form_for(@user) do |f|
       f.input_field :name, :as => :integer, :class => 'name'
@@ -48,4 +60,4 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'select.status[label_method]'
     assert_no_select 'select.status[value_method]'
   end
-end
+end

data/test/form_builder/label_test.rb

@@ -28,6 +28,20 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string#name_label', /My label/
   end
 
+  test 'builder label should generate label tag with clean HTML' do
+    with_label_for @user, :name, :label => 'My label', :required => true, :id => 'name_label'
+    assert_select 'label.string#name_label', /My label/
+    assert_no_select 'label[label]'
+    assert_no_select 'label[required]'
+  end
+
+  test 'builder should not modify the options hash' do
+    options = { :label => 'My label', :id => 'name_label' }
+    with_label_for @user, :name, options
+    assert_select 'label.string#name_label', /My label/
+    assert_equal({ :label => 'My label', :id => 'name_label' }, options)
+  end
+
   test 'builder should fallback to default label when string is given' do
     with_label_for @user, :name, 'Nome do usuário'
     assert_select 'label', 'Nome do usuário'

data/test/form_builder/wrapper_test.rb

@@ -66,6 +66,15 @@ class WrapperTest < ActionView::TestCase
     assert_select 'form div.wrapper.required.string'
   end
 
+  test 'wrapper should skip additional classes when configured' do
+    swap SimpleForm, :generate_additional_classes_for => [:input, :label] do
+      with_form_for @user, :name, :wrapper_class => :wrapper
+      assert_select 'form div.wrapper'
+      assert_no_select 'div.required'
+      assert_no_select 'div.string'
+    end
+  end
+
   # Custom wrapper test
 
   test 'custom wrappers works' do
@@ -75,7 +84,7 @@ class WrapperTest < ActionView::TestCase
       assert_select "section.custom_wrapper div.another_wrapper input.string"
       assert_no_select "section.custom_wrapper div.another_wrapper span.omg_error"
       assert_select "section.custom_wrapper div.error_wrapper span.omg_error"
-      assert_select "section.custom_wrapper > span.omg_hint", "cool"
+      assert_select "section.custom_wrapper > div.omg_hint", "cool"
     end
   end
 

data/test/inputs/boolean_input_test.rb

@@ -88,4 +88,14 @@ class BooleanInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'input boolean with nested style works using :label_input in wrapper config, adding "checkbox" class to label' do
+    swap_wrapper :default, self.custom_wrapper_without_top_level do
+      swap SimpleForm, :boolean_style => :nested do
+        with_input_for @user, :active, :boolean
+
+        assert_select 'input[type=hidden] + label.boolean.checkbox > input.boolean'
+      end
+    end
+  end
 end

data/test/inputs/datetime_input_test.rb

@@ -62,14 +62,28 @@ class DateTimeInputTest < ActionView::TestCase
     assert_select 'select.time option', 'minuto'
   end
 
-  test 'label should point to first option when date input type' do
-    with_input_for :project, :created_at, :date
-    assert_select 'label[for=project_created_at_1i]'
+  test 'label should use i18n to get target for date input type' do
+    store_translations(:en, :date => { :order => [:month, :day, :year] }) do
+      with_input_for :project, :created_at, :date
+      assert_select 'label[for=project_created_at_2i]'
+    end
+  end
+
+  test 'label should use i18n to get target for datetime input type' do
+    store_translations(:en, :date => { :order => [:month, :day, :year] }) do
+      with_input_for :project, :created_at, :datetime
+      assert_select 'label[for=project_created_at_2i]'
+    end
+  end
+
+  test 'label should use order to get target when date input type' do
+    with_input_for :project, :created_at, :date, :order => [:month, :year, :day]
+    assert_select 'label[for=project_created_at_2i]'
   end
 
-  test 'label should point to first option when datetime input type' do
-    with_input_for :project, :created_at, :datetime
-    assert_select 'label[for=project_created_at_1i]'
+  test 'label should use order to get target when datetime input type' do
+    with_input_for :project, :created_at, :datetime, :order => [:month, :year, :day]
+    assert_select 'label[for=project_created_at_2i]'
   end
 
   test 'label should point to first option when time input type' do

data/test/inputs/grouped_collection_select_input_test.rb

@@ -20,6 +20,15 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
     end
   end
 
+  test 'grouped collection accepts empty array collection form' do
+    with_input_for @user, :tag_ids, :grouped_select,
+      :collection => [],
+      :group_method => :last
+
+    assert_select 'select.grouped_select#user_tag_ids'
+  end
+
+
   test 'grouped collection accepts proc as collection' do
     with_input_for @user, :tag_ids, :grouped_select,
       :collection => Proc.new { [['Authors', ['Jose', 'Carlos']], ['General', ['Bob', 'John']]] },

data/test/inputs/priority_input_test.rb

@@ -9,7 +9,7 @@ class PriorityInputTest < ActionView::TestCase
     assert_no_select 'select option[value=][disabled=disabled]'
   end
 
-  test 'input should generate a country select with simple form default' do
+  test 'input should generate a country select with SimpleForm default' do
     swap SimpleForm, :country_priority => [ 'Brazil' ] do
       with_input_for @user, :country, :country
       assert_select 'select option[value=][disabled=disabled]'

data/test/inputs/string_input_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class StringInputTest < ActionView::TestCase
   test 'input should map text field to string attribute' do
     with_input_for @user, :name, :string
-    assert_select "input#user_name[type=text][name='user[name]'][value=New in Simple Form!]"
+    assert_select "input#user_name[type=text][name='user[name]'][value=New in SimpleForm!]"
   end
 
   test 'input should generate a password field for password attributes' do