Make tests green with Rails master.

This commit is contained in:
José Valim 2010-03-16 10:41:45 +01:00
parent 048fcd9dba
commit 1c89943d55
7 changed files with 64 additions and 64 deletions

View File

@ -3,27 +3,27 @@ require 'test_helper'
class BuilderTest < ActionView::TestCase
# COLLECTION RADIO
test 'collection radio accepts a collection and generate inputs from value method' do
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_radio :active, [true, false], :to_s, :to_s
end
end)
assert_select 'form input[type=radio][value=true]#user_active_true'
assert_select 'form input[type=radio][value=false]#user_active_false'
end
test 'collection radio accepts a collection and generate inputs from label method' do
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_radio :active, [true, false], :to_s, :to_s
end
end)
assert_select 'form label.collection_radio[for=user_active_true]', 'true'
assert_select 'form label.collection_radio[for=user_active_false]', 'false'
end
test 'collection radio accepts checked item' do
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, :checked => true
end
end)
assert_select 'form input[type=radio][value=true][checked=checked]'
assert_no_select 'form input[type=radio][value=false][checked=checked]'
@ -31,9 +31,9 @@ class BuilderTest < ActionView::TestCase
test 'collection radio accepts multiple disabled items' do
collection = [[1, true], [0, false], [2, 'other']]
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_radio :active, collection, :last, :first, :disabled => [true, false]
end
end)
assert_select 'form input[type=radio][value=true][disabled=disabled]'
assert_select 'form input[type=radio][value=false][disabled=disabled]'
@ -42,18 +42,18 @@ class BuilderTest < ActionView::TestCase
test 'collection radio accepts single disable item' do
collection = [[1, true], [0, false]]
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_radio :active, collection, :last, :first, :disabled => true
end
end)
assert_select 'form input[type=radio][value=true][disabled=disabled]'
assert_no_select 'form input[type=radio][value=false][disabled=disabled]'
end
test 'collection radio accepts html options as input' do
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, {}, :class => 'radio'
end
end)
assert_select 'form input[type=radio][value=true].radio#user_active_true'
assert_select 'form input[type=radio][value=false].radio#user_active_false'
@ -62,9 +62,9 @@ class BuilderTest < ActionView::TestCase
# COLLECTION CHECK BOX
test 'collection check box accepts a collection and generate a serie of checkboxes for value method' do
collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :id, :name
end
end)
assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]"
assert_select 'form input#user_tag_ids_1[type=checkbox][value=1]'
@ -73,9 +73,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts a collection and generate a serie of checkboxes with labels for label method' do
collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :id, :name
end
end)
assert_select 'form label.collection_check_boxes[for=user_tag_ids_1]', 'Tag 1'
assert_select 'form label.collection_check_boxes[for=user_tag_ids_2]', 'Tag 2'
@ -83,9 +83,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts selected values as :checked option' do
collection = (1..3).map{|i| [i, "Tag #{i}"] }
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => [1, 3]
end
end)
assert_select 'form input[type=checkbox][value=1][checked=checked]'
assert_select 'form input[type=checkbox][value=3][checked=checked]'
@ -94,9 +94,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts a single checked value' do
collection = (1..3).map{|i| [i, "Tag #{i}"] }
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => 3
end
end)
assert_select 'form input[type=checkbox][value=3][checked=checked]'
assert_no_select 'form input[type=checkbox][value=1][checked=checked]'
@ -105,9 +105,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts multiple disabled items' do
collection = (1..3).map{|i| [i, "Tag #{i}"] }
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => [1, 3]
end
end)
assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
assert_select 'form input[type=checkbox][value=3][disabled=disabled]'
@ -116,9 +116,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts single disable item' do
collection = (1..3).map{|i| [i, "Tag #{i}"] }
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => 1
end
end)
assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@ -127,9 +127,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts a proc to disabled items' do
collection = (1..3).map{|i| [i, "Tag #{i}"] }
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
end
end)
assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@ -138,9 +138,9 @@ class BuilderTest < ActionView::TestCase
test 'collection check box accepts html options' do
collection = [[1, 'Tag 1'], [2, 'Tag 2']]
form_for @user do |f|
concat(form_for @user do |f|
concat f.collection_check_boxes :tag_ids, collection, :first, :last, {}, :class => 'check'
end
end)
assert_select 'form input.check[type=checkbox][value=1]'
assert_select 'form input.check[type=checkbox][value=2]'
@ -148,11 +148,11 @@ class BuilderTest < ActionView::TestCase
test 'collection check box with fields for' do
collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
form_for @user do |f|
f.fields_for :post do |p|
concat(form_for @user do |f|
concat(f.fields_for :post do |p|
concat p.collection_check_boxes :tag_ids, collection, :id, :name
end
end
end)
end)
assert_select 'form input#user_post_tag_ids_1[type=checkbox][value=1]'
assert_select 'form input#user_post_tag_ids_2[type=checkbox][value=2]'
@ -163,10 +163,10 @@ class BuilderTest < ActionView::TestCase
# SIMPLE FIELDS
test 'simple fields for is available and yields an instance of FormBuilder' do
form_for @user do |f|
f.simple_fields_for :posts do |posts_form|
concat(form_for @user do |f|
concat(f.simple_fields_for :posts do |posts_form|
assert posts_form.instance_of?(SimpleForm::FormBuilder)
end
end
end)
end)
end
end

View File

@ -9,29 +9,29 @@ class FormHelperTest < ActionView::TestCase
end
test 'simple form should add default class to form' do
simple_form_for :user do |f| end
concat(simple_form_for :user do |f| end)
assert_select 'form.simple_form'
end
test 'simple form should add object name as css class to form when object is not present' do
simple_form_for :user do |f| end
concat(simple_form_for :user do |f| end)
assert_select 'form.simple_form.user'
end
test 'simple form should add object class name as css class to form' do
simple_form_for @user do |f| end
concat(simple_form_for @user do |f| end)
assert_select 'form.simple_form.user'
end
test 'pass options to simple form' do
simple_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end
concat(simple_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end)
assert_select 'form#my_form'
assert_select 'form[action=/account]'
end
test 'fields for yields an instance of FormBuilder' do
simple_fields_for :user do |f|
concat(simple_fields_for :user do |f|
assert f.instance_of?(SimpleForm::FormBuilder)
end
end)
end
end

View File

@ -3,14 +3,14 @@ require 'test_helper'
class ErrorTest < ActionView::TestCase
def with_error_for(object, attribute_name, type, options={}, &block)
simple_form_for object do |f|
concat(simple_form_for object do |f|
f.attribute_name = attribute_name
f.reflection = Association.new(Company, :company, {}) if options.delete(:setup_association)
f.input_type = type
f.options = options
concat(SimpleForm::Inputs::Base.new(f).error.to_s)
end
end)
end
test 'error should not generate content for attribute without errors' do

View File

@ -3,14 +3,14 @@ require 'test_helper'
class HintTest < ActionView::TestCase
def with_hint_for(object, attribute_name, type, options={}, &block)
simple_form_for object do |f|
concat(simple_form_for object do |f|
f.attribute_name = attribute_name
f.reflection = Association.new(Company, :company, {}) if options.delete(:setup_association)
f.input_type = type
f.options = options
concat(SimpleForm::Inputs::Base.new(f).hint.to_s)
end
end)
end
test 'hint should not be generated by default' do

View File

@ -7,14 +7,14 @@ class LabelTest < ActionView::TestCase
end
def with_label_for(object, attribute_name, type, options={})
simple_form_for object do |f|
concat(simple_form_for object do |f|
f.attribute_name = attribute_name
f.reflection = Association.new(Company, :company, {}) if options.delete(:setup_association)
f.input_type = type
f.options = options
concat(SimpleForm::Inputs::Base.new(f).label)
end
end)
end
test 'label should generate a default humanized description' do

View File

@ -3,39 +3,39 @@ require 'test_helper'
class FormBuilderTest < ActionView::TestCase
def with_form_for(object, *args, &block)
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.input(*args, &block)
end
end)
end
def with_button_for(object, *args)
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.button(*args)
end
end)
end
def with_error_for(object, *args)
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.error(*args)
end
end)
end
def with_hint_for(object, *args)
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.hint(*args)
end
end)
end
def with_label_for(object, *args)
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.label(*args)
end
end)
end
def with_association_for(object, *args)
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.association(*args)
end
end)
end
# All
@ -267,9 +267,9 @@ class FormBuilderTest < ActionView::TestCase
end
test 'builder allows wrapper tag to be given on demand' do
simple_form_for @user do |f|
concat(simple_form_for @user do |f|
concat f.input :name, :wrapper_tag => :b
end
end)
assert_select 'form b.required.string'
end

View File

@ -7,9 +7,9 @@ class InputTest < ActionView::TestCase
end
def with_input_for(object, attribute_name, type, options={})
simple_form_for object do |f|
concat(simple_form_for object do |f|
concat f.input(attribute_name, options.merge(:as => type))
end
end)
end
# ALL