padrino-helpers 0.9.24 → 0.9.25

data/test/test_form_builder.rb

@@ -38,7 +38,7 @@ class TestFormBuilder < Test::Unit::TestCase
     should "display correct form html for namespaced object" do
       actual_html = form_for(Outer::UserAccount.new, '/register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.text_field :username }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
-      assert_has_tag('form input', :type => 'text', :name => 'outer-user_account[username]') { actual_html }
+      assert_has_tag('form input', :type => 'text', :name => 'outer_user_account[username]') { actual_html }
     end
 
     should "display correct form html with remote option" do
@@ -97,6 +97,13 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
     end
 
+    should "display correct form in slim" do
+      visit '/slim/form_for'
+      assert_have_selector :form, :action => '/demo', :id => 'demo'
+      assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
+      assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+    end
+
     should "have a class of 'invalid' for fields with errors" do
       actual_html = form_for(@user, '/register') {|f| f.text_field(:email) }
       assert_has_tag(:input, :type => 'text', :name => 'user[email]', :id => 'user_email', :class => 'invalid') {actual_html }
@@ -138,6 +145,14 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
       assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
     end
+
+    should "display correct simple fields in slim" do
+      visit '/slim/fields_for'
+      assert_have_selector :form, :action => '/demo1', :id => 'demo-fields-for'
+      assert_have_selector '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
+      assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
+      assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
+    end
   end
 
   # ===========================
@@ -184,6 +199,19 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
       assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
     end
+
+    should "display correct form in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo div.field-errors h2',     :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Fake must be valid"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Second must be present"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Third must be a number"
+      assert_have_selector '#demo2 div.field-errors h2',    :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+    end
   end
 
   context 'for #error_message_on method' do
@@ -223,6 +251,13 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo label', :content => "About Me: "
       assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
     end
+
+    should "display correct label in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
+      assert_have_selector '#demo label', :content => "About Me: "
+      assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
+    end
   end
 
   context 'for #hidden_field method' do
@@ -242,6 +277,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
       assert_have_selector '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
     end
+
+    should "display correct hidden field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
+      assert_have_selector '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
+    end
   end
 
   context 'for #text_field method' do
@@ -261,6 +302,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
       assert_have_selector '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
     end
+
+    should "display correct text field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
+      assert_have_selector '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
+    end
   end
 
   context 'for #check_box method' do
@@ -313,6 +360,11 @@ class TestFormBuilder < Test::Unit::TestCase
       visit '/erb/form_for'
       assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
     end
+
+    should "display correct checkbox in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
+    end
   end
 
   context 'for #radio_button method' do
@@ -351,17 +403,24 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
       assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
     end
+
+    should "display correct radio button in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
+      assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
+      assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
+    end
   end
 
   context 'for #text_area method' do
     should "display correct text_area html" do
       actual_html = standard_builder.text_area(:about, :class => 'large')
-      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
+      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]', :rows => '', :cols => '') { actual_html }
     end
 
     should "display correct text_area html and content" do
-      actual_html = standard_builder.text_area(:about, :value => "Demo")
-      assert_has_tag('textarea', :id => 'user_about', :content => 'Demo') { actual_html }
+      actual_html = standard_builder.text_area(:about, :value => "Demo", :rows => '5', :cols => '6')
+      assert_has_tag('textarea', :id => 'user_about', :content => 'Demo', :rows => '5', :cols => '6') { actual_html }
     end
 
     should "display correct text_area in haml" do
@@ -375,6 +434,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
       assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
     end
+
+    should "display correct text_area in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+      assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+    end
   end
 
   context 'for #password_field method' do
@@ -394,6 +459,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
       assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
     end
+
+    should "display correct password_field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
+      assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
+    end
   end
 
   context 'for #file_field method' do
@@ -413,6 +484,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo  input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
       assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
     end
+
+    should "display correct file_field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo  input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+      assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+    end
   end
 
   context 'for #select method' do
@@ -486,6 +563,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
       assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
     end
+
+    should "display correct select in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+      assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+    end
   end
 
   context 'for #submit method' do
@@ -510,6 +593,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
       assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
     end
+
+    should "display correct submit button in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
+      assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
+    end
   end
 
   context 'for #image_submit method' do
@@ -538,6 +627,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
       assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
+
+    should "display correct image submit button in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
+      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+    end
   end
 
   context 'for #fields_for method' do
@@ -658,6 +753,23 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
       assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
     end
+
+    should "display nested children fields in slim" do
+      visit '/slim/fields_for'
+      # Telephone
+      assert_have_selector('label', :for => 'markup_user_telephone_attributes_number')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
+      # Address 1 (Saved)
+      assert_have_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
+      assert_have_selector('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
+      assert_have_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
+      # Address 2 (New)
+      assert_have_no_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
+      assert_have_selector('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
+      assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
+      assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
+    end
   end
 
   # ===========================
@@ -682,6 +794,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
       assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
     end
+
+    should "display correct text field block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
+      assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
+    end
   end
 
   context 'for #text_area_block method' do
@@ -702,6 +820,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
       assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
     end
+
+    should "display correct text area block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
+      assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
+    end
   end
 
   context 'for #password_field_block method' do
@@ -722,6 +846,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
       assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
     end
+
+    should "display correct password field block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
+      assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
+    end
   end
 
   context 'for #file_field_block method' do
@@ -742,6 +872,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
       assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
     end
+
+    should "display correct file field block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
+      assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+    end
   end
 
   context 'for #check_box_block method' do
@@ -762,6 +898,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
       assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
     end
+
+    should "display correct check box block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
+      assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
+    end
   end
 
   context 'for #select_block method' do
@@ -786,6 +928,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
       assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
     end
+
+    should "display correct select_block block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
+      assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
+    end
   end
 
   context 'for #submit_block method' do
@@ -803,6 +951,11 @@ class TestFormBuilder < Test::Unit::TestCase
       visit '/erb/form_for'
       assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
     end
+
+    should "display correct submit block in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
+    end
   end
 
   context 'for #image_submit_block method' do
@@ -820,8 +973,8 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
 
-    should "display correct image submit block in erb" do
-      visit '/erb/form_for'
+    should "display correct image submit block in slim" do
+      visit '/slim/form_for'
       assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end

data/test/test_form_helpers.rb

@@ -65,6 +65,12 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form', :action => '/simple'
       assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
     end
+
+    should "display correct forms in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form', :action => '/simple'
+      assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
+    end
   end
 
   context 'for #field_set_tag method' do
@@ -89,6 +95,14 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
       assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
     end
+
+    should "display correct field_sets in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form fieldset', :count => 1
+      assert_have_no_selector 'form.simple-form fieldset legend'
+      assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
+      assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
+    end
   end
 
   context 'for #error_messages_for method' do
@@ -129,6 +143,20 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
       assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
     end
+
+    should "display correct error messages list in slim" do
+      visit '/slim/form_tag'
+      assert_have_no_selector 'form.simple-form .field-errors'
+      assert_have_selector 'form.advanced-form .field-errors'
+      assert_have_selector 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
+      assert_have_selector 'form.advanced-form .field-errors p',  :content => "There were problems with the following fields:"
+      assert_have_selector 'form.advanced-form .field-errors ul'
+      assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be a email"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
+    end
   end
 
   context 'for #error_message_on method' do
@@ -187,6 +215,7 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     end
+
     should "display label tag in haml for advanced form" do
       visit '/haml/form_tag'
       assert_have_selector 'form.advanced-form label', :count => 6
@@ -196,6 +225,24 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.advanced-form label.photo', :content => "Photo"   , :for => 'photo'
       assert_have_selector 'form.advanced-form label.gender', :content => "Gender"   , :for => 'gender'
     end
+
+    should "display label tag in slim for simple form" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
+      assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
+      assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
+    end
+
+    should "display label tag in slim for advanced form" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
+      assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
+      assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
+      assert_have_selector 'form.advanced-form label.photo', :content => "Photo"   , :for => 'photo'
+      assert_have_selector 'form.advanced-form label.gender', :content => "Gender"   , :for => 'gender'
+    end
   end
 
   context 'for #hidden_field_tag method' do
@@ -215,6 +262,12 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
       assert_have_selector 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
     end
+
+    should "display hidden field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+      assert_have_selector 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+    end
   end
 
   context 'for #text_field_tag method' do
@@ -234,17 +287,23 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
       assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
     end
+
+    should "display text field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
+      assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
+    end
   end
 
   context 'for #text_area_tag method' do
     should "display text area in ruby" do
       actual_html = text_area_tag(:about, :class => 'long')
-      assert_has_tag(:textarea, :class => "long", :name => 'about') { actual_html }
+      assert_has_tag(:textarea, :class => "long", :name => 'about', :rows => '', :cols => '') { actual_html }
     end
 
     should "display text area in ruby with specified content" do
-      actual_html = text_area_tag(:about, :value => "a test")
-      assert_has_tag(:textarea, :content => "a test", :name => 'about') { actual_html }
+      actual_html = text_area_tag(:about, :value => "a test", :rows => 5, :cols => 6)
+      assert_has_tag(:textarea, :content => "a test", :name => 'about', :rows => "5", :cols => "6") { actual_html }
     end
 
     should "display text area in erb" do
@@ -256,6 +315,11 @@ class TestFormHelpers < Test::Unit::TestCase
       visit '/haml/form_tag'
       assert_have_selector 'form.advanced-form textarea', :count => 1, :name => 'about', :class => 'large'
     end
+
+    should "display text area in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.advanced-form textarea', :count => 1, :name => 'about', :class => 'large'
+    end
   end
 
   context 'for #password_field_tag method' do
@@ -275,6 +339,12 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form input[type=password]', :count => 1, :name => 'password'
       assert_have_selector 'form.advanced-form input[type=password]', :count => 1, :name => 'password'
     end
+
+    should "display password field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=password]', :count => 1, :name => 'password'
+      assert_have_selector 'form.advanced-form input[type=password]', :count => 1, :name => 'password'
+    end
   end
 
   context 'for #file_field_tag method' do
@@ -292,6 +362,11 @@ class TestFormHelpers < Test::Unit::TestCase
       visit '/haml/form_tag'
       assert_have_selector 'form.advanced-form input[type=file]', :count => 1, :name => 'photo', :class => 'upload'
     end
+
+    should "display file field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.advanced-form input[type=file]', :count => 1, :name => 'photo', :class => 'upload'
+    end
   end
 
   context "for #check_box_tag method" do
@@ -317,6 +392,12 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form input[type=checkbox]', :count => 1
       assert_have_selector 'form.advanced-form input[type=checkbox]', :value => "1", :checked => 'checked'
     end
+
+    should "display check_box tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=checkbox]', :count => 1
+      assert_have_selector 'form.advanced-form input[type=checkbox]', :value => "1", :checked => 'checked'
+    end
   end
 
   context "for #radio_button_tag method" do
@@ -345,6 +426,14 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.advanced-form input[type=radio]', :value => "male", :checked => 'checked'
       assert_have_selector 'form.advanced-form input[type=radio]', :value => "female"
     end
+
+    should "display radio_button tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=radio]', :count => 1, :value => 'male'
+      assert_have_selector 'form.simple-form input[type=radio]', :count => 1, :value => 'female'
+      assert_have_selector 'form.advanced-form input[type=radio]', :value => "male", :checked => 'checked'
+      assert_have_selector 'form.advanced-form input[type=radio]', :value => "female"
+    end
   end
 
   context "for #select_tag method" do
@@ -353,7 +442,7 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag(:select, :name => 'favorite_color') { actual_html }
       assert_has_tag('select option:first-child', :content => '') { actual_html }
       assert_has_tag('select option', :content => 'green', :value => 'green') { actual_html }
-      assert_has_tag('select option', :content => 'blue', :value => 'blue') { actual_html }
+      assert_has_tag('select option', :content => 'blue',  :value => 'blue')  { actual_html }
       assert_has_tag('select option', :content => 'black', :value => 'black') { actual_html }
     end
 
@@ -362,6 +451,50 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag(:select, :disabled => 'disabled') { actual_html }
     end
 
+    should "take a range as a collection for options" do
+      actual_html = select_tag(:favorite_color, :options => (1..3))
+      assert_has_tag(:select) { actual_html }
+      assert_has_tag('select option', :value => '1') { actual_html }
+      assert_has_tag('select option', :value => '2') { actual_html }
+      assert_has_tag('select option', :value => '3') { actual_html }
+    end
+
+    should "include blank for grouped options" do
+      opts = { "Red"  => ["Rose","Fire"], "Blue" => ["Sky","Sea"] }
+      actual_html = select_tag( 'color', :grouped_options => opts, :include_blank => true )
+      assert_has_tag('select option:first-child', :value => "", :content => "") { actual_html }
+    end
+
+    should "return a select tag with grouped options for an nested array" do
+      opts = [
+        ["Friends",["Yoda",["Obiwan",2]]],
+        ["Enemies", ["Palpatine",['Darth Vader',3]]]
+      ]
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:optgroup, :label => "Friends") { actual_html }
+      assert_has_tag(:option,   :value => "Yoda", :content => "Yoda") { actual_html }
+      assert_has_tag(:option,   :value => "2",  :content => "Obiwan") { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies") { actual_html }
+      assert_has_tag(:option,   :value => "Palpatine", :content => "Palpatine") { actual_html }
+      assert_has_tag(:option,   :value => "3", :content => "Darth Vader") { actual_html }
+    end
+
+    should "return a select tag with grouped options for a hash" do
+      opts = {
+        "Friends" => ["Yoda",["Obiwan",2]],
+        "Enemies" => ["Palpatine",['Darth Vader',3]]
+      }
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name  => "name")    { actual_html }
+      assert_has_tag(:optgroup, :label => "Friends") { actual_html }
+      assert_has_tag(:option,   :value => "Yoda", :content => "Yoda")   { actual_html }
+      assert_has_tag(:option,   :value => "2",    :content => "Obiwan") { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies") { actual_html }
+      assert_has_tag(:option,   :value => "Palpatine", :content => "Palpatine") { actual_html }
+      assert_has_tag(:option,   :value => "3", :content => "Darth Vader") { actual_html }
+    end
+
     should "display select tag in ruby with multiple attribute" do
       actual_html = select_tag(:favorite_color, :multiple => true, :options => ['only', 'option'])
       assert_has_tag(:select, :multiple => 'multiple', :name => 'favorite_color[]') { actual_html }
@@ -418,6 +551,18 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
       assert_have_selector('select option', :content => 'purple', :value => '3')
     end
+
+    should "display select tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form select', :count => 1, :name => 'color'
+      assert_have_selector('select option', :content => 'green',  :value => 'green')
+      assert_have_selector('select option', :content => 'orange', :value => 'orange')
+      assert_have_selector('select option', :content => 'purple', :value => 'purple')
+      assert_have_selector 'form.advanced-form select', :name => 'fav_color'
+      assert_have_selector('select option', :content => 'green',  :value => '1')
+      assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
+      assert_have_selector('select option', :content => 'purple', :value => '3')
+    end
   end
 
   context 'for #submit_tag method' do
@@ -437,6 +582,12 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.simple-form input[type=submit]', :count => 1, :value => "Submit"
       assert_have_selector 'form.advanced-form input[type=submit]', :count => 1, :value => "Login"
     end
+
+    should "display submit tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=submit]', :count => 1, :value => "Submit"
+      assert_have_selector 'form.advanced-form input[type=submit]', :count => 1, :value => "Login"
+    end
   end
 
   context 'for #button_tag method' do
@@ -454,6 +605,11 @@ class TestFormHelpers < Test::Unit::TestCase
       visit '/haml/form_tag'
       assert_have_selector 'form.advanced-form input[type=button]', :count => 1, :value => "Cancel"
     end
+
+    should "display submit tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.advanced-form input[type=button]', :count => 1, :value => "Cancel"
+    end
   end
 
   context 'for #image_submit_tag method' do
@@ -480,5 +636,10 @@ class TestFormHelpers < Test::Unit::TestCase
       visit '/haml/form_tag'
       assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png?#{@stamp}"
     end
+
+    should "display image submit tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png?#{@stamp}"
+    end
   end
 end