middleman-core 3.2.0 → 3.2.1

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/test/fixtures/markup_app/views/form_tag.haml

@@ -18,6 +18,8 @@
     = search_field_tag :search
     = label_tag  :color
     = select_tag :color, :options => ['green', 'orange', 'purple']
+    = select_tag :type, :grouped_options => { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] }
+    = select_tag :character, :grouped_options => [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
     = label_tag  :gender
     = radio_button_tag :gender, :value => 'male'
     = radio_button_tag :gender, :value => 'female'
@@ -64,7 +66,13 @@
       = select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
     %p
       = check_box_tag :remember_me, :value => "1", :checked => true
+    %p
+      = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
+      = range_field_tag('ranger_with_range', :range => 1..5)
   - field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"
     = image_submit_tag "buttons/submit.png"
+
+- form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do
+  = submit_tag "Login"

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/test/fixtures/markup_app/views/form_tag.slim

@@ -18,6 +18,8 @@
     = search_field_tag :search
     = label_tag  :color
     = select_tag :color, :options => ['green', 'orange', 'purple']
+    = select_tag :type, :grouped_options => { 'foo' => ['foo', 'bar'], 'bar' => ['foo', 'bar'] }
+    = select_tag :character, :grouped_options => [['Friends',['Yoda',['Obiwan',1]]],['Enemies',['Palpatine',['Darth Vader',3]]]]
     = label_tag  :gender
     = radio_button_tag :gender, :value => 'male'
     = radio_button_tag :gender, :value => 'female'
@@ -64,7 +66,14 @@
       = select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
     p
       = check_box_tag :remember_me, :value => "1", :checked => true
+    p
+      = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
+      = range_field_tag('ranger_with_range', :range => 1..5)
+
   = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"
     = image_submit_tag "buttons/submit.png"
+    
+= form_tag '/dontprotect', :class => 'no-protection', :protect_from_csrf => false do
+  = submit_tag "Login"

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/test/fixtures/render_app/app.rb

@@ -16,6 +16,7 @@ class RenderDemo < Padrino::Application
   configure do
     set :logging, false
     set :padrino_logging, false
+    set :environment, :test
     set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
     set :haml, :escape_html => true
     set :slim, :generator => Temple::Generators::RailsOutputBuffer

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/test/test_asset_tag_helpers.rb

@@ -5,7 +5,7 @@ describe "AssetTagHelpers" do
   include Padrino::Helpers::AssetTagHelpers
 
   def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
+    MarkupDemo
   end
 
   def flash
@@ -71,9 +71,9 @@ describe "AssetTagHelpers" do
     end
 
     should "escape the link text" do
-      actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<>" }
+      actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<&>" }
       assert_has_tag('a#binky.first', :href => '/register') { actual_link }
-      assert_match "&lt;&gt;", actual_link
+      assert_match "&lt;&amp;&gt;", actual_link
     end
 
     should "not escape image_tag" do
@@ -119,6 +119,12 @@ describe "AssetTagHelpers" do
       assert_match %r{subject\=demo\%20test}, actual_html
     end
 
+    should "escape & with encoded string and &amp; in HTML" do
+      actual_html = mail_to('test@demo.com', "My&Email", :subject => "this&that")
+      assert_match 'this%26that', actual_html
+      assert_match 'My&amp;Email', actual_html
+    end
+
     should "display mail link element in haml" do
       visit '/haml/mail_to'
       assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'

data/lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_breadcrumb_helpers.rb

@@ -0,0 +1,134 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "BreadcrumbHelpers" do
+  include Padrino::Helpers::Breadcrumbs
+
+  def breadcrumb
+    @breadcrumb ||= Padrino::Helpers::Breadcrumb.new
+  end
+
+  before(:each) { breadcrumb.reset! }
+
+  context "for Breadcrumbs#breadcrumbs method" do
+    should "support breadcrumbs which is Padrino::Helpers::Breadcrumbs instance." do
+      breadcrumb.add "foo", "/foo", "foo link"
+      assert_has_tag(:a, :content => "Foo link", :href => "/foo") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support bootstrap" do
+      breadcrumb.add "foo", "/foo", "foo link"
+      assert_has_tag(:span, :content => "/", :class => "divider") { breadcrumbs(breadcrumb, true) }
+    end
+
+    should "support active" do
+      breadcrumb.add "foo", "/foo", "foo link"
+      assert_has_tag(:li, :class => "custom-active") { breadcrumbs(breadcrumb, nil, "custom-active") }
+    end
+
+    should "support options" do
+      assert_has_tag(:ul, :class => "breadcrumbs-class breadcrumb", :id => "breadcrumbs-id") do
+        breadcrumbs(breadcrumb, nil, nil, :id => "breadcrumbs-id", :class => "breadcrumbs-class")
+      end
+    end
+  end
+
+  context "for #add method" do
+    should "support name of string and symbol type" do
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+
+    should "support url" do
+      breadcrumb.add :foo, "/foo", "Foo Link"
+      assert_has_tag(:a, :href => "/foo") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support caption" do
+      breadcrumb.add :foo, "/foo", "Foo Link"
+      assert_has_tag(:a, :content => "Foo link") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support options" do
+      breadcrumb.add :foo, "/foo", "Foo Link", :id => "foo-id", :class => "foo-class"
+      breadcrumb.add :bar, "/bar", "Bar Link", :id => "bar-id", :class => "bar-class"
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:li, :class => "foo-class", :id => "foo-id") { actual_html }
+      assert_has_tag(:li, :class => "bar-class active", :id => "bar-id") { actual_html }
+    end
+  end
+
+  context "for #del method" do
+    should "support name of string type" do
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.del "foo"
+      breadcrumb.del "bar"
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+
+    should "support name of symbol type" do
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.del :foo
+      breadcrumb.del :bar
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+  end
+
+  context "for #set_home method" do
+    should "modified home item elements." do
+      breadcrumb.set_home("/custom", "Custom Home Page")
+      assert_has_tag(:a, :content => "Custom home page", :href => "/custom") { breadcrumbs(breadcrumb) }
+    end
+
+    should "support options" do
+      breadcrumb.set_home("/custom", "Custom Home Page", :id => "home-id")
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:li, :id => "home-id") { actual_html }
+      assert_has_tag(:a, :content => "Custom home page", :href => "/custom") { actual_html }
+    end
+  end
+
+  context "for #reset method" do
+    should "be #items which contains only home item." do
+      breadcrumb.set_home("/custom", "Custom Home Page")
+      breadcrumb.add "foo", "/foo", "Foo Link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.reset
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:a, :content => "Custom home page", :href => "/custom") { actual_html }
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+  end
+
+  context "for #reset! method" do
+    should "be #items which contains only default home item." do
+      breadcrumb.add "foo", "/foo", "foo link"
+      breadcrumb.add :bar, "/bar", "Bar Link"
+
+      breadcrumb.reset!
+
+      actual_html = breadcrumbs(breadcrumb)
+      assert_has_tag(:a, :content => "Home Page", :href => "/") { actual_html }
+      assert_has_no_tag(:a, :content => "Foo link", :href => "/foo") { actual_html }
+      assert_has_no_tag(:a, :content => "Bar link", :href => "/bar") { actual_html }
+    end
+  end
+end

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/test/test_form_builder.rb

@@ -4,6 +4,10 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 describe "FormBuilder" do
   include Padrino::Helpers::FormHelpers
 
+  def app
+    MarkupDemo
+  end
+
   # Dummy form builder for testing
   module Padrino::Helpers::FormBuilder
     class FakeFormBuilder < AbstractFormBuilder
@@ -11,10 +15,6 @@ describe "FormBuilder" do
     end
   end
 
-  def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
-  end
-
   def setup
     role_types = [mock_model('Role', :name => "Admin", :id => 1),
       mock_model('Role', :name => 'Moderate', :id => 2),  mock_model('Role', :name => 'Limited', :id => 3)]
@@ -49,8 +49,7 @@ describe "FormBuilder" do
     end
 
     should "display form specifying default builder setting" do
-      self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder')).once
-      actual_html = ""
+      self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder', :protect_from_csrf => false)).at_least_once
       actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.foo_field }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
       assert_has_tag('span', :content => "bar") { actual_html }
@@ -61,6 +60,16 @@ describe "FormBuilder" do
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }
     end
 
+    should "display correct form html with namespace option" do
+      actual_html = form_for(@user, '/update', :namespace => 'foo') do |f|
+        f.text_field(:first_name) << f.fields_for(:role_types) { |role| role.text_field(:name) }
+      end
+
+      assert_has_no_tag(:form, :namespace => 'foo') { actual_html }
+      assert_has_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'foo_user_first_name') { actual_html }
+      assert_has_tag(:input, :type => 'text', :name => 'user[role_types_attributes][0][name]', :id => 'foo_user_role_types_attributes_0_name') { actual_html }
+    end
+
     should "display correct form html with remote option and method put" do
       actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :remote => true, :method => 'put') { "Demo" }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :method => 'post', "data-remote" => 'true') { actual_html }
@@ -655,6 +664,17 @@ describe "FormBuilder" do
       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 form html with multipart, even if no 'multipart' option is specified" do
+      actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8") { |f| f.file_field :photo }
+      assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+    end
+
+    should "display correct form html without multipart, if 'multipart' option is specified 'false'" do
+      actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8", :multipart => false) { |f| f.file_field :photo }
+      assert_has_no_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+    end
+
   end
 
   context 'for #select method' do
@@ -742,6 +762,18 @@ describe "FormBuilder" do
       assert_has_tag('input[type=submit]', :value => "Submit") { actual_html }
     end
 
+
+    should "display correct submit button html with no caption" do
+      actual_html = standard_builder.submit(:class => 'btn')
+      assert_has_tag('input.btn[type=submit]', :value => "Submit") { actual_html }
+    end
+
+    should "display correct submit button html with nil caption" do
+      actual_html = standard_builder.submit(nil, :class => 'btn')
+      assert_has_tag('input.btn[type=submit]') { actual_html }
+      assert actual_html !~ %r{ value \* = }x
+    end
+
     should "display correct submit button html" do
       actual_html = standard_builder.submit("Commit", :class => 'large')
       assert_has_tag('input.large[type=submit]', :value => "Commit") { actual_html }

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/test/test_form_helpers.rb

@@ -5,7 +5,11 @@ describe "FormHelpers" do
   include Padrino::Helpers::FormHelpers
 
   def app
-    MarkupDemo.tap { |app| app.set :environment, :test }
+    MarkupDemo
+  end
+
+  class UnprotectedApp
+    def protect_from_csrf; false; end
   end
 
   context 'for #form_tag method' do
@@ -54,25 +58,67 @@ describe "FormHelpers" do
       assert_has_tag(:form, :enctype => "multipart/form-data") { actual_html }
     end
 
+    should "have an authenticity_token for method :post, :put or :delete" do
+      %w(post put delete).each do |method|
+        actual_html = form_tag('/modify', :method => method) { "Demo" }
+        assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+      end
+    end
+
+    should "not have an authenticity_token if method: :get" do
+      actual_html = form_tag('/get', :method => :get) { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "have an authenticity_token by default" do
+      actual_html = form_tag('/superadmindelete') { "Demo" }
+      assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "create csrf meta tags with token and param - #csrf_meta_tags" do
+      actual_html = csrf_meta_tags
+      assert_has_tag(:meta, :name => 'csrf-param') { actual_html }
+      assert_has_tag(:meta, :name => 'csrf-token') { actual_html }
+    end
+
+    should "have an authenticity_token by default" do
+      actual_html = form_tag('/superadmindelete') { "Demo" }
+      assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "not have an authenticity_token if passing protect_from_csrf: false" do
+      actual_html = form_tag('/superadmindelete', :protect_from_csrf => false) { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
+    should "not have an authenticity_token if protect_from_csrf is false on app settings" do
+      self.expects(:settings).returns(UnprotectedApp.new)
+      actual_html = form_tag('/superadmindelete') { "Demo" }
+      assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+    end
+
     should "display correct forms in erb" do
       visit '/erb/form_tag'
       assert_have_selector 'form.simple-form', :action => '/simple'
       assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
-      assert_have_selector :input, :name => 'authenticity_token'
+      assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
+      assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
     end
 
     should "display correct forms in haml" do
       visit '/haml/form_tag'
       assert_have_selector 'form.simple-form', :action => '/simple'
       assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
-      assert_have_selector :input, :name => 'authenticity_token'
+      assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
+      assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
     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'
-      assert_have_selector :input, :name => 'authenticity_token'
+      assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
+      assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
     end
   end
 
@@ -127,7 +173,7 @@ describe "FormHelpers" do
       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 => "Email must be an 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"
@@ -141,7 +187,7 @@ describe "FormHelpers" do
       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 => "Email must be an 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"
@@ -155,7 +201,7 @@ describe "FormHelpers" do
       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 => "Email must be an 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"
@@ -611,7 +657,7 @@ describe "FormHelpers" do
       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
+    should "display select tag with grouped options for a nested array" do
       opts = [
         ["Friends",["Yoda",["Obiwan",2]]],
         ["Enemies", ["Palpatine",['Darth Vader',3]]]
@@ -626,7 +672,33 @@ describe "FormHelpers" do
       assert_has_tag(:option,   :value => "3", :content => "Darth Vader") { actual_html }
     end
 
-    should "return a select tag with grouped options for a hash" do
+    should "display select tag with grouped options for a nested array and accept disabled groups" do
+      opts = [
+        ["Friends",["Yoda",["Obiwan",2]]],
+        ["Enemies", ["Palpatine",['Darth Vader',3]], true]
+      ]
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 0) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag with grouped options for a nested array and accept disabled groups and/or with disabled options" do
+      opts = [
+        ["Friends",["Yoda",["Obiwan",2, true]]],
+        ["Enemies", [["Palpatine", "Palpatine", true],['Darth Vader',3]], true]
+      ]
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 2) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:option,   :content => "Obiwan", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:option,   :value => "Palpatine", :content => "Palpatine", :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag with grouped options for a hash" do
       opts = {
         "Friends" => ["Yoda",["Obiwan",2]],
         "Enemies" => ["Palpatine",['Darth Vader',3]]
@@ -641,6 +713,33 @@ describe "FormHelpers" do
       assert_has_tag(:option,   :value => "3", :content => "Darth Vader") { actual_html }
     end
 
+    should "display select tag with grouped options for a hash and accept disabled groups" do
+      opts = {
+        "Friends" => ["Yoda",["Obiwan",2]],
+        "Enemies" => ["Palpatine",['Darth Vader',3], {:disabled => true}]
+      }
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 0) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag with grouped options for a hash and accept disabled groups and/or with disabled options" do
+      opts = {
+        "Friends" => ["Yoda",["Obiwan",2,true]],
+        "Enemies" => [["Palpatine","Palpatine",true],["Darth Vader",3], {:disabled => true}]
+      }
+      actual_html = select_tag( 'name', :grouped_options => opts )
+      assert_has_tag(:select,   :name => "name") { actual_html }
+      assert_has_tag(:option,   :disabled => 'disabled', :count => 2) { actual_html }
+      assert_has_tag(:optgroup, :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag(:option,   :content => "Obiwan", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:optgroup, :label => "Enemies", :disabled => 'disabled') { actual_html }
+      assert_has_tag(:option,   :value => "Palpatine", :content => "Palpatine", :disabled => 'disabled') { 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 }
@@ -656,6 +755,16 @@ describe "FormHelpers" do
       assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
     end
 
+    should "display options with values and accept disabled options" do
+      options = [['Green', 'green1', true], ['Blue', 'blue1'], ['Black', "black1"]]
+      actual_html = select_tag(:favorite_color, :options => options)
+      assert_has_tag(:select, :name => 'favorite_color') { actual_html }
+      assert_has_tag('select option', :disabled => 'disabled', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'Green', :value => 'green1', :disabled => 'disabled') { actual_html }
+      assert_has_tag('select option', :content => 'Blue', :value => 'blue1') { actual_html }
+      assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
+    end
+
     should "display option with values and multiple selected" do
       options = [['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
       actual_html = select_tag(:favorite_color, :options => options, :selected => ['green1', 'Black'])
@@ -680,10 +789,20 @@ describe "FormHelpers" do
       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('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')
+      assert_have_selector('select optgroup', :label => 'foo')
+      assert_have_selector('select optgroup', :label => 'bar')
+      assert_have_selector('select optgroup option', :content => 'foo', :value => 'foo')
+      assert_have_selector('select optgroup option', :content => 'bar', :value => 'bar')
+      assert_have_selector('select optgroup', :label => 'Friends')
+      assert_have_selector('select optgroup', :label => 'Enemies')
+      assert_have_selector('select optgroup option', :content => 'Yoda', :value => 'Yoda')
+      assert_have_selector('select optgroup option', :content => 'Obiwan', :value => '1')
+      assert_have_selector('select optgroup option', :content => 'Palpatine', :value => 'Palpatine')
+      assert_have_selector('select optgroup option', :content => 'Darth Vader', :value => '3')
     end
 
     should "display select tag in haml" do
@@ -692,10 +811,20 @@ describe "FormHelpers" do
       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('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')
+      assert_have_selector('select optgroup', :label => 'foo')
+      assert_have_selector('select optgroup', :label => 'bar')
+      assert_have_selector('select optgroup option', :content => 'foo', :value => 'foo')
+      assert_have_selector('select optgroup option', :content => 'bar', :value => 'bar')
+      assert_have_selector('select optgroup', :label => 'Friends')
+      assert_have_selector('select optgroup', :label => 'Enemies')
+      assert_have_selector('select optgroup option', :content => 'Yoda', :value => 'Yoda')
+      assert_have_selector('select optgroup option', :content => 'Obiwan', :value => '1')
+      assert_have_selector('select optgroup option', :content => 'Palpatine', :value => 'Palpatine')
+      assert_have_selector('select optgroup option', :content => 'Darth Vader', :value => '3')
     end
 
     should "display select tag in slim" do
@@ -704,10 +833,20 @@ describe "FormHelpers" do
       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('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')
+      assert_have_selector('select optgroup', :label => 'foo')
+      assert_have_selector('select optgroup', :label => 'bar')
+      assert_have_selector('select optgroup option', :content => 'foo', :value => 'foo')
+      assert_have_selector('select optgroup option', :content => 'bar', :value => 'bar')
+      assert_have_selector('select optgroup', :label => 'Friends')
+      assert_have_selector('select optgroup', :label => 'Enemies')
+      assert_have_selector('select optgroup option', :content => 'Yoda', :value => 'Yoda')
+      assert_have_selector('select optgroup option', :content => 'Obiwan', :value => '1')
+      assert_have_selector('select optgroup option', :content => 'Palpatine', :value => 'Palpatine')
+      assert_have_selector('select optgroup option', :content => 'Darth Vader', :value => '3')
     end
   end
 
@@ -734,6 +873,26 @@ describe "FormHelpers" do
       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
+
+    context 'for omitted args' do
+      should "display submit tag with default caption" do
+        actual_html = submit_tag()
+        assert_has_tag(:input, :type => 'submit', :value => 'Submit') { actual_html }
+      end
+    end
+
+    context 'for omitted caption arg' do
+      should "display submit tag with default caption" do
+        actual_html = submit_tag(:class => 'success')
+        assert_has_tag(:input, :type => 'submit', :class => 'success', :value => 'Submit') { actual_html }
+      end
+
+      should "display submit tag without caption value when nil" do
+        actual_html = submit_tag(nil, :class => 'success')
+        assert_has_tag(:input, :type => 'submit', :class => 'success') { actual_html }
+        assert_has_no_tag(:input, :type => 'submit', :class => 'success', :value => 'Submit') { actual_html }
+      end
+    end
   end
 
   context 'for #button_tag method' do
@@ -808,5 +967,64 @@ describe "FormHelpers" do
       end
       assert_has_tag('form button', :type => 'submit', :content => "My button's content", :title => "My button") { actual_html }
     end
+
+    should "pass options on submit button when submit_options are given" do
+      actual_html = button_to("Fancy button", '/users/1', :submit_options => { :class => :fancy })
+      assert_has_tag('form input', :type => 'submit', :value => 'Fancy button', :class => 'fancy') { actual_html }
+    end
+
+    should 'display correct button_to in erb' do
+      visit '/erb/button_to'
+      assert_have_selector('form', :action => '/foo')
+      assert_have_selector('form label', :for => 'username', :content => 'Username: ')
+      assert_have_selector('form', :action => '/bar')
+      assert_have_selector('#test-point ~ form > input[type=submit]', :value => 'Bar button')
+    end
+
+    should 'display correct button_to in haml' do
+      visit '/haml/button_to'
+      assert_have_selector('form', :action => '/foo')
+      assert_have_selector('form label', :for => 'username', :content => 'Username: ')
+      assert_have_selector('form', :action => '/bar')
+      assert_have_selector('#test-point ~ form > input[type=submit]', :value => 'Bar button')
+    end
+
+    should 'display correct button_to in slim' do
+      visit '/slim/button_to'
+      assert_have_selector('form', :action => '/foo')
+      assert_have_selector('form label', :for => 'username', :content => 'Username: ')
+      assert_have_selector('form', :action => '/bar')
+      assert_have_selector('#test-point ~ form > input[type=submit]', :value => 'Bar button')
+    end
+  end
+
+  context 'for #range_field_tag' do
+    should "create an input tag with min and max options" do
+      actual_html = range_field_tag('ranger', :min => 20, :max => 50)
+      assert_has_tag('input', :type => 'range', :name => 'ranger', :min => '20', :max => '50') { actual_html }
+    end
+
+    should "create an input tag with range" do
+      actual_html = range_field_tag('ranger', :range => 1..20)
+      assert_has_tag('input', :min => '1', :max => '20') { actual_html }
+    end
+
+    should "display correct range_field_tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_min_max', :min => '1', :max => '50', :count => 1
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_range', :min => '1', :max => '5', :count => 1
+    end
+
+    should "display correct range_field_tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_min_max', :min => '1', :max => '50', :count => 1
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_range', :min => '1', :max => '5', :count => 1
+    end
+
+    should "display correct range_field_tag in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_min_max', :min => '1', :max => '50', :count => 1
+      assert_have_selector 'input', :type => 'range', :name => 'ranger_with_range', :min => '1', :max => '5', :count => 1
+    end
   end
 end