simple_form 1.2.0 → 1.4.0

data/test/components/wrapper_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+class WrapperTest < ActionView::TestCase
+  def with_error_for(object, attribute_name, &block)
+    with_concat_form_for(object) do |f|
+      f.input attribute_name
+    end
+  end
+
+  def with_form_for(object, *args, &block)
+    with_concat_form_for(object) do |f|
+       f.input(*args, &block)
+    end
+  end
+
+  test 'wrapper should not have error class for attribute without errors' do
+    with_error_for @user, :active
+    assert_no_select 'div.field_with_errors'
+  end
+
+  test 'wrapper should not have error class when object is not present' do
+    with_error_for :project, :name
+    assert_no_select 'div.field_with_errors'
+  end
+
+  test 'wrapper should add error class for attribute with errors' do
+    with_error_for @user, :name
+    assert_select 'div.field_with_errors'
+  end
+
+  test 'wrapper should add chosen error class for attribute with errors' do
+    swap SimpleForm, :wrapper_error_class => "omgError" do
+      with_error_for @user, :name
+      assert_select 'div.omgError'
+    end
+  end
+
+  test 'wrapper should add chosen wrapper class' do
+    swap SimpleForm, :wrapper_class => "wrapper" do
+      with_form_for @user, :active
+      assert_select 'div.wrapper'
+      assert_no_select 'div.input'
+
+      with_form_for @user, :name
+      assert_select 'div.wrapper'
+      assert_no_select 'div.input'
+
+      with_form_for :project, :name
+      assert_select 'div.wrapper'
+      assert_no_select 'div.input'
+    end
+  end
+
+  test 'wrapper should not have disabled class by default' do
+    with_form_for @user, :active
+    assert_no_select 'div.disabled'
+  end
+
+  test 'wrapper should add disabled class when the input is disabled' do
+    with_form_for @user, :active, :disabled => true
+    assert_select 'div.disabled'
+  end
+end

data/test/discovery_inputs.rb

@@ -0,0 +1,21 @@
+class StringInput < SimpleForm::Inputs::StringInput
+  def input
+    "<section>#{super}</section>".html_safe
+  end
+end
+
+class NumericInput < SimpleForm::Inputs::NumericInput
+  def input
+    "<section>#{super}</section>".html_safe
+  end
+end
+
+class CustomizedInput < SimpleForm::Inputs::StringInput
+  def input
+    "<section>#{super}</section>".html_safe
+  end
+  
+  def input_method
+    :text_field
+  end
+end

data/test/error_notification_test.rb

@@ -0,0 +1,62 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class ErrorNotificationTest < ActionView::TestCase
+
+  def with_error_notification_for(object, options={}, &block)
+    with_concat_form_for(object) do |f|
+      f.error_notification(options)
+    end
+  end
+
+  test 'error notification is not generated when the object has no error' do
+    assert @validating_user.valid?
+    with_error_notification_for @validating_user
+    assert_no_select 'p.error_notification'
+  end
+
+  test 'error notification is not generated for forms without objects' do
+    with_error_notification_for :user
+    assert_no_select 'p.error_notification'
+  end
+
+  test 'error notification is generated when the object has some error' do
+    with_error_notification_for @user
+    assert_select 'p.error_notification', 'Some errors were found, please take a look:'
+  end
+
+  test 'error notification uses I18n based on model to generate the notification message' do
+    store_translations(:en, :simple_form => { :error_notification => { :user =>
+      'Alguns erros foram encontrados para o usuário:'
+    } }) do
+      with_error_notification_for @user
+      assert_select 'p.error_notification', 'Alguns erros foram encontrados para o usuário:'
+    end
+  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?'
+    } }) do
+      with_error_notification_for @user
+      assert_select 'p.error_notification', 'Opa! Alguns erros foram encontrados, poderia verificar?'
+    end
+  end
+
+  test 'error notification allows passing the notification message' do
+    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'
+    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
+      with_error_notification_for @user
+      assert_select 'div.error_notification'
+    end
+  end
+end

data/test/form_builder_test.rb

@@ -1,41 +1,54 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class FormBuilderTest < ActionView::TestCase
 
   def with_form_for(object, *args, &block)
-    concat(simple_form_for object do |f|
-      concat f.input(*args, &block)
-    end)
+    with_concat_form_for(object) do |f|
+      f.input(*args, &block)
+    end
+  end
+
+  def with_custom_form_for(object, *args, &block)
+    with_concat_custom_form_for(object) do |f|
+      f.input(*args, &block)
+    end
   end
 
   def with_button_for(object, *args)
-    concat(simple_form_for object do |f|
-      concat f.button(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.button(*args)
+    end
   end
 
   def with_error_for(object, *args)
-    concat(simple_form_for object do |f|
-      concat f.error(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.error(*args)
+    end
+  end
+
+  def with_full_error_for(object, *args)
+    with_concat_form_for(object) do |f|
+      f.full_error(*args)
+    end
   end
 
   def with_hint_for(object, *args)
-    concat(simple_form_for object do |f|
-      concat f.hint(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.hint(*args)
+    end
   end
 
   def with_label_for(object, *args)
-    concat(simple_form_for object do |f|
-      concat f.label(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.label(*args)
+    end
   end
 
   def with_association_for(object, *args)
-    concat(simple_form_for object do |f|
-      concat f.association(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.association(*args)
+    end
   end
 
   # All
@@ -55,12 +68,44 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder input should allow a block to configure input' do
     with_form_for @user, :name do
-      concat 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
+      with_form_for @user, :post_count
+      assert_no_select 'form input#user_post_count.string'
+      assert_select 'form input#user_post_count.numeric.integer'
+    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
+      assert_no_select 'form input#user_lock_version.integer'
+      assert_select 'form input#user_lock_version.hidden'
+    end
+  end
+
+  test 'builder uses the first matching custom input map when more than one match' 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'
+    end
+  end
+
+  test 'builder uses the custom map only for matched attributes' 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
+
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name
@@ -107,6 +152,11 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_email.string.email'
   end
 
+  test 'builder should generate tel fields for columns that matches phone' do
+    with_form_for @user, :phone_number
+    assert_select 'form input#user_phone_number.string.tel'
+  end
+
   test 'builder should generate url fields for columns that matches url' do
     with_form_for @user, :url
     assert_select 'form input#user_url.string.url'
@@ -142,6 +192,14 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_avatar.file'
   end
 
+  test 'builder should generate file for attributes that are real db columns but have file methods' do
+    @user.home_picture = mock("file")
+    @user.home_picture.expects(:respond_to?).with(:mounted_as).returns(true)
+
+    with_form_for @user, :home_picture
+    assert_select 'form input#user_home_picture.file'
+  end
+
   test 'build should generate select if a collection is given' do
     with_form_for @user, :age, :collection => 1..60
     assert_select 'form select#user_age.select'
@@ -162,6 +220,13 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # COMMON OPTIONS
+  test 'builder should add chosen form 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' }
     assert_select 'form input#my_input.my_input.string'
@@ -229,29 +294,47 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error#cool', "can't be blank"
   end
 
-  # REQUIRED AND PRESENCE VALIDATION 
+  test 'placeholder should not be generated when set to false' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+      with_form_for @user, :name, :placeholder => false
+      assert_no_select 'input[placeholder]'
+    end
+  end
+
+  # REQUIRED AND PRESENCE VALIDATION
   test 'builder input should obtain required from ActiveModel::Validations when it is included' do
     with_form_for @validating_user, :name
-    assert_select 'input.required#validating_user_name'
+    assert_select 'input.required[required]#validating_user_name'
     with_form_for @validating_user, :status
     assert_select 'input.optional#validating_user_status'
   end
-  
+
   test 'builder input should allow overriding required when ActiveModel::Validations is included' do
     with_form_for @validating_user, :name, :required => false
     assert_select 'input.optional#validating_user_name'
     with_form_for @validating_user, :status, :required => true
-    assert_select 'input.required#validating_user_status'
+    assert_select 'input.required[required]#validating_user_status'
   end
-  
+
   test 'builder input should be required by default when ActiveModel::Validations is not included' do
     with_form_for @user, :name
-    assert_select 'input.required#user_name'
+    assert_select 'input.required[required]#user_name'
+  end
+
+  test 'builder input should not be required by default when ActiveModel::Validations is not included if option is set to false' do
+    swap SimpleForm, :required_by_default => false do
+      with_form_for @user, :name
+      assert_select 'input.optional#user_name'
+      assert_no_select 'input[required]'
+    end
   end
-  
+
   test 'builder input should allow disabling required when ActiveModel::Validations is not included' do
     with_form_for @user, :name, :required => false
     assert_no_select 'input.required'
+    assert_no_select 'input[required]'
     assert_select 'input.optional#user_name'
   end
 
@@ -282,12 +365,61 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder allows wrapper tag to be given on demand' do
-    concat(simple_form_for @user do |f|
-      concat f.input :name, :wrapper_tag => :b
-    end)
+    with_concat_form_for(@user) do |f|
+      f.input :name, :wrapper_tag => :b
+    end
     assert_select 'form b.required.string'
   end
 
+  test 'builder allows wrapper class to be given on demand' do
+    with_concat_form_for(@user) do |f|
+      f.input :name, :wrapper_class => :wrapper
+    end
+    assert_select 'form div.wrapper.required.string'
+  end
+
+  test 'builder wrapping tag adds errors class for attribute with errors' do
+    with_form_for @user, :name
+    assert_select 'form div.input.required.string.field_with_errors'
+  end
+
+  # ONLY THE INPUT TAG
+  test "builder input_field should only render the input tag, nothing else" do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name
+    end
+    assert_select 'form > input.required.string'
+    assert_no_select 'div.string'
+    assert_no_select 'label'
+    assert_no_select '.hint'
+  end
+
+  test 'builder input_field should allow overriding default input type' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, :as => :text
+    end
+
+    assert_no_select 'input#user_name'
+    assert_select 'textarea#user_name.text'
+  end
+
+  test 'builder input_field should allow passing options to input tag' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, :id => 'name_input', :class => 'name'
+    end
+
+    assert_select 'input.string.name#name_input'
+  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'
+    end
+
+    assert_no_select 'input.integer[input_html]'
+    assert_no_select 'input.integer[as]'
+  end
+
   # WITHOUT OBJECT
   test 'builder should generate properly when object is not present' do
     with_form_for :project, :name
@@ -319,11 +451,32 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error', "can't be blank"
   end
 
+  test 'builder should generate an error tag with a clean HTML' do
+    with_error_for @user, :name
+    assert_no_select 'span.error[error_html]'
+  end
+
   test 'builder should allow passing options to error tag' do
     with_error_for @user, :name, :id => 'name_error'
     assert_select 'span.error#name_error', "can't be blank"
   end
 
+  # FULL ERRORS
+  test 'builder should generate an full error tag for the attribute' do
+    with_full_error_for @user, :name
+    assert_select 'span.error', "Super User Name! can't be blank"
+  end
+
+  test 'builder 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
+
+  test 'builder 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't be blank"
+  end
+
   # HINTS
   test 'builder should generate a hint tag for the attribute' do
     store_translations(:en, :simple_form => { :hints => { :user => { :name => "Add your name" }}}) do
@@ -332,10 +485,21 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should generate a hint component tag for the given text for a model with ActiveModel::Validations' do
+    with_hint_for @validating_user, 'Hello World!'
+    assert_select 'span.hint', 'Hello World!'
+  end
+
   test 'builder should generate a hint component tag for the given text' do
-     with_hint_for @user, 'Hello World!'
-     assert_select 'span.hint', 'Hello World!'
-   end
+    with_hint_for @user, 'Hello World!'
+    assert_select 'span.hint', 'Hello World!'
+  end
+
+  test 'builder should generate a hint componet tag with a clean HTML' do
+    with_hint_for @validating_user, 'Hello World!'
+    assert_no_select 'span.hint[hint]'
+    assert_no_select 'span.hint[hint_html]'
+  end
 
   test 'builder should allow passing options to hint tag' do
     with_hint_for @user, :name, :hint => 'Hello World!', :id => 'name_hint'
@@ -348,9 +512,14 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder should generate a label componet tag with a clean HTML' do
+    with_label_for @user, :name
+    assert_no_select 'label.string[label_html]'
+  end
+
   test 'builder should add a required class to label if the attribute is required' do
     with_label_for @validating_user, :name
-    assert_select 'label.string[for=validating_user_name]', /Name/
+    assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
   test 'builder should allow passing options to label tag' do
@@ -374,13 +543,13 @@ class FormBuilderTest < ActionView::TestCase
   # BUTTONS
   test 'builder should create buttons' do
     with_button_for :post, :submit
-    assert_select 'form input[type=submit][value=Save Post]'
+    assert_select 'form input.button[type=submit][value=Save Post]'
   end
 
   test 'builder should create buttons for records' do
     @user.new_record!
     with_button_for @user, :submit
-    assert_select 'form input[type=submit][value=Create User]'
+    assert_select 'form input.button[type=submit][value=Create User]'
   end
 
   # ASSOCIATIONS
@@ -409,6 +578,43 @@ class FormBuilderTest < ActionView::TestCase
     assert_equal 3, calls
   end
 
+  test 'builder association mark input as required based both association and attribute' do
+    swap SimpleForm, :required_by_default => false do
+      with_association_for @validating_user, :company, :collection => []
+      assert_select 'label.required'
+    end
+  end
+
+  test 'builder preloads collection association' do
+    value = @user.tags
+    value.expects(:to_a).returns(value)
+    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'
+  end
+
+  test 'builder does not preload collection association if preload false' do
+    value = @user.company
+    value.expects(:to_a).never
+    with_association_for @user, :company, :preload => false
+    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'
+  end
+
+  test 'builder does not preload non collection association' do
+    value = @user.company
+    value.expects(:to_a).never
+    with_association_for @user, :company, :preload => false
+    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'
+  end
+
   # ASSOCIATIONS - BELONGS TO
   test 'builder creates a select for belongs_to associations' do
     with_association_for @user, :company
@@ -495,4 +701,95 @@ class FormBuilderTest < ActionView::TestCase
     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
+    with_association_for @user, :tags, :as => :check_boxes,
+      :collection_wrapper_tag => :ul, :item_wrapper_tag => :li
+
+    assert_select 'form ul', :count => 1
+    assert_select 'form ul li', :count => 3
+  end
+
+  # CUSTOM FORM BUILDER
+  test 'custom builder should inherit mappings' do
+    with_custom_form_for @user, :email
+    assert_select 'form input[type=email]#user_email.custom'
+  end
+
+  test 'form with CustomMapTypeFormBuilder should use custom map type builder' do
+    with_concat_custom_mapping_form_for(:user) do |user|
+      assert user.instance_of?(CustomMapTypeFormBuilder)
+    end
+  end
+
+  test 'form with CustomMapTypeFormBuilder should use custom mapping' do
+    with_concat_custom_mapping_form_for(:user) do |user|
+      assert_equal SimpleForm::Inputs::StringInput, user.class.mappings[:custom_type]
+    end
+  end
+
+  test 'form without CustomMapTypeFormBuilder should not use custom mapping' do
+    with_concat_form_for(:user) do |user|
+      assert_nil user.class.mappings[:custom_type]
+    end
+  end
+
+  # DISCOVERY
+  # Setup new inputs and remove them after the test.
+  def discovery(value=false)
+    swap SimpleForm, :cache_discovery => value do
+      begin
+        load "discovery_inputs.rb"
+        yield
+      ensure
+        SimpleForm::FormBuilder.discovery_cache.clear
+        Object.send :remove_const, :StringInput
+        Object.send :remove_const, :NumericInput
+        Object.send :remove_const, :CustomizedInput
+      end
+    end
+  end
+
+  test 'builder should not discover new inputs if cached' do
+    with_form_for @user, :name
+    assert_select 'form input#user_name.string'
+
+    discovery(true) do
+      with_form_for @user, :name
+      assert_no_select 'form section input#user_name.string'
+    end
+  end
+
+  test 'builder should discover new inputs' do
+    discovery do
+      with_form_for @user, :name, :as => :customized
+      assert_select 'form section input#user_name.string'
+    end
+  end
+
+  test 'builder should not discover new inputs if discovery is off' do
+    with_form_for @user, :name
+    assert_select 'form input#user_name.string'
+
+    swap SimpleForm, :inputs_discovery => false do
+      discovery do
+        with_form_for @user, :name
+        assert_no_select 'form section input#user_name.string'
+      end
+    end
+  end
+
+  test 'builder should discover new inputs from mappings if not cached' do
+    discovery do
+      with_form_for @user, :name
+      assert_select 'form section input#user_name.string'
+    end
+  end
+
+  test 'builder should discover new inputs from internal fallbacks if not cached' do
+    discovery do
+      with_form_for @user, :age
+      assert_select 'form section input#user_age.numeric.integer'
+    end
+  end
 end