simple_form 1.3.0 → 1.4.0

data/test/action_view_extensions/form_helper_test.rb

@@ -13,6 +13,18 @@ class FormHelperTest < ActionView::TestCase
     assert_select 'form.simple_form'
   end
 
+  test 'simple form 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
+    swap SimpleForm, :browser_validations => false do
+      concat(simple_form_for(:user) do |f| end)
+      assert_select 'form[novalidate="novalidate"]'
+    end
+  end
+
   test 'simple form 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'

data/test/components/label_test.rb

@@ -96,6 +96,43 @@ class LabelTest < ActionView::TestCase
     end
   end
 
+  test 'label should do correct i18n lookup for nested models with nested translation' do
+    @user.company = Company.new(1, 'Empresa')
+
+    store_translations(:en, :simple_form => { :labels => {
+      :user => { :name => 'Usuario', :company => { :name => 'Nome da empresa' } }
+    } } ) do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input :name)
+        end)
+      end
+
+      assert_select 'label[for=user_name]', /Usuario/
+      assert_select 'label[for=user_company_attributes_name]', /Nome da empresa/
+    end
+  end
+
+  test 'label should do correct i18n lookup for nested models with no nested translation' do
+    @user.company = Company.new(1, 'Empresa')
+
+    store_translations(:en, :simple_form => { :labels => {
+      :user    => { :name => 'Usuario' },
+      :company => { :name => 'Nome da empresa' }
+    } } ) do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input :name)
+        end)
+      end
+
+      assert_select 'label[for=user_name]', /Usuario/
+      assert_select 'label[for=user_company_attributes_name]', /Nome da empresa/
+    end
+  end
+
   test 'label should have css class from type' do
     with_label_for @user, :name, :string
     assert_select 'label.string'
@@ -170,6 +207,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label[for=my_new_id]'
   end
 
+  test 'label should allow 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
+    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
     with_label_for @user, :name, :string, :input_html => { :class => 'my_new_id' }
     assert_select 'label[for=user_name]'
@@ -195,4 +242,11 @@ class LabelTest < ActionView::TestCase
     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
+    swap SimpleForm, :label_class => :my_custom_class do
+      with_label_for @user, :name, :string
+      assert_select 'label.my_custom_class'
+    end
+  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/form_builder_test.rb

@@ -9,6 +9,12 @@ class FormBuilderTest < ActionView::TestCase
     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)
     with_concat_form_for(object) do |f|
       f.button(*args)
@@ -21,6 +27,12 @@ class FormBuilderTest < ActionView::TestCase
     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)
     with_concat_form_for(object) do |f|
       f.hint(*args)
@@ -70,6 +82,14 @@ class FormBuilderTest < ActionView::TestCase
     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
@@ -78,6 +98,14 @@ class FormBuilderTest < ActionView::TestCase
     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
@@ -164,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'
@@ -184,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'
@@ -340,6 +383,43 @@ class FormBuilderTest < ActionView::TestCase
     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
@@ -371,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
@@ -384,11 +485,22 @@ 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
 
+  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'
     assert_select 'span.hint#name_hint', 'Hello World!'
@@ -400,6 +512,11 @@ 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.required[for=validating_user_name]', /Name/
@@ -468,6 +585,36 @@ class FormBuilderTest < ActionView::TestCase
     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
@@ -562,4 +709,87 @@ class FormBuilderTest < ActionView::TestCase
     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