simple_form 1.5.2 → 2.0.0

data/test/inputs/required_test.rb

@@ -0,0 +1,113 @@
+require 'test_helper'
+
+class RequiredTest < ActionView::TestCase
+  # 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[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[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[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 'when not using browser validations, input should not generate required html attribute' do
+    swap SimpleForm, :browser_validations => false do
+      with_input_for @user, :name, :string
+      assert_select 'input[type=text].required'
+      assert_no_select 'input[type=text][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
+
+  test 'when not the required component the input does not have the required attribute but has the required class' do
+    swap_wrapper do
+      with_input_for @user, :name, :string
+      assert_select 'input[type=text].required'
+      assert_no_select 'input[type=text][required]'
+    end
+  end
+
+  # VALIDATORS :if :unless
+  test 'builder input should not be required when ActiveModel::Validations is included and if option is present' do
+    with_form_for @validating_user, :age
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_select 'input.optional#validating_user_age'
+  end
+
+  test 'builder input should not be required when ActiveModel::Validations is included and unless option is present' do
+    with_form_for @validating_user, :amount
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_select 'input.optional#validating_user_amount'
+  end
+
+  # VALIDATORS :on
+  test 'builder input should be required when validation is on create and is not persisted' do
+    @validating_user.new_record!
+    with_form_for @validating_user, :action
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_action'
+  end
+
+  test 'builder input should not be required when validation is on create and is persisted' do
+    with_form_for @validating_user, :action
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_select 'input.optional#validating_user_action'
+  end
+
+  test 'builder input should be required when validation is on save' do
+    with_form_for @validating_user, :credit_limit
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_credit_limit'
+
+    @validating_user.new_record!
+    with_form_for @validating_user, :credit_limit
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_credit_limit'
+  end
+
+  test 'builder input should be required when validation is on update and is persisted' do
+    with_form_for @validating_user, :phone_number
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_phone_number'
+  end
+
+  test 'builder input should not be required when validation is on update and is not persisted' do
+    @validating_user.new_record!
+    with_form_for @validating_user, :phone_number
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_select 'input.optional#validating_user_phone_number'
+  end
+end

data/test/inputs/string_input_test.rb

@@ -0,0 +1,140 @@
+# encoding: UTF-8
+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 SimpleForm!]"
+  end
+
+  test 'input should generate a password field for password attributes' do
+    with_input_for @user, :password, :password
+    assert_select "input#user_password.password[type=password][name='user[password]']"
+  end
+
+  test 'input should not use size attribute for decimal attributes' do
+    with_input_for @user, :credit_limit, :decimal
+    assert_no_select 'input.decimal[size]'
+  end
+
+  test 'input should get maxlength from column definition for string attributes' do
+    with_input_for @user, :name, :string
+    assert_select 'input.string[maxlength=100]'
+  end
+
+  test 'input should not get maxlength from column without size definition for string attributes' do
+    with_input_for @user, :action, :string
+    assert_no_select 'input.string[maxlength]'
+  end
+
+  test 'input should get size from column definition for string attributes respecting maximum value' do
+    with_input_for @user, :name, :string
+    assert_select 'input.string[size=50]'
+  end
+
+  test 'input should use default text size for password attributes' do
+    with_input_for @user, :password, :password
+    assert_select 'input.password[type=password][size=50]'
+  end
+
+  test 'input should get maxlength from column definition for password attributes' do
+    with_input_for @user, :password, :password
+    assert_select 'input.password[type=password][maxlength=100]'
+  end
+
+  test 'input should infer maxlength column definition from validation when present' do
+    with_input_for @validating_user, :name, :string
+    assert_select 'input.string[maxlength=25]'
+  end
+
+  test 'input should not get maxlength from validation when tokenizer present' do
+    with_input_for @validating_user, :action, :string
+    assert_no_select 'input.string[maxlength]'
+  end
+
+  test 'input should get maxlength from validation when :is option present' do
+    with_input_for @validating_user, :home_picture, :string
+    assert_select 'input.string[maxlength=12]'
+  end
+
+  test 'input should not generate placeholder by default' do
+    with_input_for @user, :name, :string
+    assert_no_select 'input[placeholder]'
+  end
+
+  test 'input should accept the placeholder option' do
+    with_input_for @user, :name, :string, :placeholder => 'Put in some text'
+    assert_select 'input.string[placeholder=Put in some text]'
+  end
+
+  test 'input should generate a password field for password attributes that accept placeholder' do
+    with_input_for @user, :password, :password, :placeholder => 'Password Confirmation'
+    assert_select 'input[type=password].password[placeholder=Password Confirmation]#user_password'
+  end
+
+  test 'input should not infer pattern from attributes by default' do
+    with_input_for @other_validating_user, :country, :string
+    assert_no_select 'input[pattern="\w+"]'
+  end
+
+  test 'input should infer pattern from attributes' do
+    with_input_for @other_validating_user, :country, :string, :pattern => true
+    assert_select 'input[pattern="\w+"]'
+  end
+
+  test 'input should infer pattern from attributes using proc' do
+    with_input_for @other_validating_user, :name, :string, :pattern => true
+    assert_select 'input[pattern="\w+"]'
+  end
+
+  test 'input should not infer pattern from attributes if root default is false' do
+    swap_wrapper do
+      with_input_for @other_validating_user, :country, :string
+      assert_no_select 'input[pattern="\w+"]'
+    end
+  end
+
+  test 'input should use given pattern from attributes' do
+    with_input_for @other_validating_user, :country, :string, :input_html => { :pattern => "\\d+" }
+    assert_select 'input[pattern="\d+"]'
+  end
+
+  test 'input should use i18n to translate placeholder text' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+      with_input_for @user, :name, :string
+      assert_select 'input.string[placeholder=Name goes here]'
+    end
+  end
+
+  [:email, :url, :search, :tel].each do |type|
+    test "input should allow type #{type}" do
+      with_input_for @user, :name, type
+      assert_select "input.string.#{type}"
+      assert_select "input[type=#{type}]"
+    end
+
+    test "input should not allow type #{type} if HTML5 compatibility is disabled" do
+      swap_wrapper do
+        with_input_for @user, :name, type
+        assert_select "input[type=text]"
+        assert_no_select "input[type=#{type}]"
+      end
+    end
+  end
+
+  test 'input strips extra spaces from class html attribute with default classes' do
+    with_input_for @user, :name, :string
+    assert_select "input[class='string required']"
+    assert_no_select "input[class='string required ']"
+    assert_no_select "input[class=' string required']"
+  end
+
+  test 'input strips extra spaces from class html attribute when giving a custom class' do
+    with_input_for @user, :name, :string, :input_html => { :class => "my_input" }
+    assert_select "input[class='string required my_input']"
+    assert_no_select "input[class='string required my_input ']"
+    assert_no_select "input[class=' string required my_input']"
+  end
+end

data/test/inputs/text_input_test.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class TextInputTest < ActionView::TestCase
+  test 'input should generate a text area for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text#user_description'
+  end
+
+  test 'input should generate a text area for text attributes that accept placeholder' do
+    with_input_for @user, :description, :text, :placeholder => 'Put in some text'
+    assert_select 'textarea.text[placeholder=Put in some text]'
+  end
+
+  test 'input should get maxlength from column definition for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text[maxlength=200]'
+  end
+
+  test 'input should infer maxlength column definition from validation when present for text attributes' do
+    with_input_for @validating_user, :description, :text
+    assert_select 'textarea.text[maxlength=50]'
+  end
+end

data/test/support/misc_helpers.rb

@@ -1,11 +1,10 @@
 module MiscHelpers
   def store_translations(locale, translations, &block)
-    begin
-      I18n.backend.store_translations locale, translations
-      yield
-    ensure
-      I18n.reload!
-    end
+    I18n.backend.store_translations locale, translations
+    yield
+  ensure
+    I18n.reload!
+    I18n.backend.send :init_translations
   end
 
   def assert_no_select(selector, value = nil)
@@ -25,12 +24,34 @@ module MiscHelpers
     end
   end
 
-  def with_concat_form_for(object, &block)
-    concat simple_form_for(object, &block)
+  def swap_wrapper(name=:default, wrapper=self.custom_wrapper)
+    old = SimpleForm.wrappers[name]
+    SimpleForm.wrappers[name] = wrapper
+    yield
+  ensure
+    SimpleForm.wrappers[name] = old
+  end
+
+  def custom_wrapper
+    SimpleForm.build :tag => :section, :class => "custom_wrapper", :pattern => false do |b|
+      b.use :pattern
+      b.wrapper :another, :class => "another_wrapper" do |ba|
+        ba.use :label
+        ba.use :input
+      end
+      b.wrapper :error_wrapper, :tag => :div, :class => "error_wrapper" do |be|
+        be.use :error, :wrap_with => { :tag => :span, :class => "omg_error" }
+      end
+      b.use :hint, :wrap_with => { :class => "omg_hint" }
+    end
   end
 
-  def with_concat_custom_form_for(object, &block)
-    concat custom_form_for(object, &block)
+  def custom_wrapper_without_top_level
+    SimpleForm.build :tag => false, :class => 'custom_wrapper_without_top_level' do |b|
+      b.use :label_input
+      b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
+      b.use :error, :wrap_with => { :tag => :span, :class => :error }
+    end
   end
 
   def custom_form_for(object, *args, &block)
@@ -41,8 +62,28 @@ module MiscHelpers
     simple_form_for(object, *(args << { :builder => CustomMapTypeFormBuilder }), &block)
   end
 
-  def with_concat_custom_mapping_form_for(object, &block)
-    concat custom_mapping_form_for(object, &block)
+  def with_concat_form_for(*args, &block)
+    concat simple_form_for(*args, &block)
+  end
+
+  def with_concat_custom_form_for(*args, &block)
+    concat custom_form_for(*args, &block)
+  end
+
+  def with_concat_custom_mapping_form_for(*args, &block)
+    concat custom_mapping_form_for(*args, &block)
+  end
+
+  def with_form_for(object, *args, &block)
+    with_concat_form_for(object) do |f|
+      f.input(*args, &block)
+    end
+  end
+
+  def with_input_for(object, attribute_name, type, options={})
+    with_concat_form_for(object) do |f|
+      f.input(attribute_name, options.merge(:as => type))
+    end
   end
 end
 

data/test/support/mock_controller.rb

@@ -1,12 +1,12 @@
 class MockController
-  attr_accessor :action_name
+  attr_writer :action_name
 
   def _routes
     self
   end
 
   def action_name
-    @action_name || "edit"
+    defined?(@action_name) ? @action_name : "edit"
   end
 
   def url_for(*args)

data/test/support/models.rb

@@ -26,14 +26,14 @@ class Company < Struct.new(:id, :name)
 end
 
 class Tag < Company
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-
   def self.all(options={})
     (1..3).map{|i| Tag.new(i, "Tag #{i}")}
   end
 end
 
+class TagGroup < Struct.new(:id, :name, :tags)
+end
+
 class User
   extend ActiveModel::Naming
   include ActiveModel::Conversion
@@ -42,9 +42,10 @@ class User
     :description, :created_at, :updated_at, :credit_limit, :password, :url,
     :delivery_time, :born_at, :special_company_id, :country, :tags, :tag_ids,
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
-    :post_count, :lock_version, :amount, :attempts, :action
+    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender
 
   def initialize(options={})
+    @new_record = false
     options.each do |key, value|
       send("#{key}=", value)
     end if options
@@ -55,7 +56,7 @@ class User
   end
 
   def persisted?
-    !(@new_record || false)
+    !@new_record
   end
 
   def company_attributes=(*)
@@ -80,6 +81,7 @@ class User
       when :amount        then :integer
       when :attempts      then :integer
       when :action        then :string
+      when :credit_card   then :string
     end
     Column.new(attribute, column_type, limit)
   end
@@ -122,6 +124,10 @@ class User
       )
     end
   end
+
+  def self.readonly_attributes
+    [:credit_card]
+  end
 end
 
 class ValidatingUser < User
@@ -149,6 +155,8 @@ class ValidatingUser < User
     :only_integer => true
   validates_length_of :name, :maximum => 25
   validates_length_of :description, :maximum => 50
+  validates_length_of :action, :maximum => 10, :tokenizer => lambda { |str| str.scan(/\w+/) }
+  validates_length_of :home_picture, :is => 12
 
   def min_amount
     10
@@ -183,6 +191,13 @@ class OtherValidatingUser < User
     :only_integer => true
 
   validates_format_of :country, :with => /\w+/
+
+  # TODO: Remove this check when we drop Rails 3.0 support
+  if ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR >= 1
+    validates_format_of :name, :with => Proc.new { /\w+/ }
+  else
+    validates_format_of :name, :with => /\w+/
+  end
 end
 
 class HashBackedAuthor < Hash

data/test/test_helper.rb

@@ -22,17 +22,15 @@ end
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'simple_form'
 
-Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
-I18n.default_locale = :en
-
-country_select = "#{File.dirname(__FILE__)}/support/country_select/lib"
+require "rails/generators/test_case"
+require 'generators/simple_form/install_generator'
 
-if File.exists?(country_select)
-  $:.unshift country_select
-  require 'country_select'
-else
-  raise "Could not find country_select plugin in test/support. Please execute git submodule update --init."
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
+  require file unless file.end_with?('discovery_inputs.rb')
 end
+I18n.default_locale = :en
+
+require 'country_select'
 
 class ActionView::TestCase
   include MiscHelpers
@@ -53,15 +51,16 @@ class ActionView::TestCase
   def setup_new_user(options={})
     @user = User.new({
       :id => 1,
-      :name => 'New in Simple Form!',
+      :name => 'New in SimpleForm!',
       :description => 'Hello!',
       :created_at => Time.now
     }.merge(options))
 
     @validating_user = ValidatingUser.new({
       :id => 1,
-      :name => 'New in Simple Form!',
+      :name => 'New in SimpleForm!',
       :description => 'Hello!',
+      :home_picture => 'Home picture',
       :created_at => Time.now,
       :age => 19,
       :amount => 15,
@@ -71,7 +70,7 @@ class ActionView::TestCase
 
     @other_validating_user = OtherValidatingUser.new({
       :id => 1,
-      :name => 'New in Simple Form!',
+      :name => 'New in SimpleForm!',
       :description => 'Hello!',
       :created_at => Time.now,
       :age => 19,