Bring abstract_controller up to date with rails/master

Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368e6a6715966f69216e3ee86bf1a82a7
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e92afad579998aa80144588e8865ac3
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb99504705419ad6edac14d00e71cef5f12
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46c04970b5e7684998d09405648ecbd4
      3942cb406e1d5db0ac00e03153809cc8dc4cc4db
      f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690
      e3b166aab37ddc2fbab030b146eb61713b91bf55
      ae9f258e03c9fd5088da12c1c6cd216cc89a01f7
      44423126c6f6133a1d9cf1d0832b527e8711d40f

0cb020b4d6d838025859bd60fb8151c8e21b8e84
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a831aadb159f3daaffa4208064c30af0e
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b162463f13bd50d27398f020769460a770e3
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.

19 files changed, 1397 insertions, 995 deletions

diff --git a/actionpack/test/template/active_record_helper_i18n_test.rb b/actionpack/test/template/active_record_helper_i18n_test.rb
index 7e6bf70706..9d04c882c8 100644
--- a/actionpack/test/template/active_record_helper_i18n_test.rb
+++ b/actionpack/test/template/active_record_helper_i18n_test.rb
@@ -4,43 +4,44 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
   include ActionView::Helpers::ActiveRecordHelper
   
   attr_reader :request
-  uses_mocha 'active_record_helper_i18n_test' do
-    def setup
-      @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
-      @object_name = 'book'
-      stubs(:content_tag).returns 'content_tag'
-
-      I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
-      I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
-    end
-
-    def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
-      I18n.expects(:translate).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
-      error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
-    end
-
-    def test_error_messages_for_given_no_header_option_it_translates_header_message
-      I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
-      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :locale => 'en')
-    end
-
-    def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
-      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :message => 'message', :locale => 'en')
-    end
-
-    def test_error_messages_for_given_no_message_option_it_translates_message
-      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
-      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :locale => 'en')
-    end
-    
-    def test_error_messages_for_given_object_name_it_translates_object_name
-      I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
-      I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
-      error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
-    end
+
+  def setup
+    @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
+    @object_name = 'book_seller'
+    @object_name_without_underscore = 'book seller'
+
+    stubs(:content_tag).returns 'content_tag'
+
+    I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
+    I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+  end
+
+  def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
+    I18n.expects(:translate).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
+    error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
+  end
+
+  def test_error_messages_for_given_no_header_option_it_translates_header_message
+    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
+    I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+    error_messages_for(:object => @object, :locale => 'en')
+  end
+
+  def test_error_messages_for_given_a_message_option_it_does_not_translate_message
+    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
+    I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+    error_messages_for(:object => @object, :message => 'message', :locale => 'en')
+  end
+
+  def test_error_messages_for_given_no_message_option_it_translates_message
+    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+    I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+    error_messages_for(:object => @object, :locale => 'en')
+  end
+  
+  def test_error_messages_for_given_object_name_it_translates_object_name
+    I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name_without_underscore).returns "1 error prohibited this #{@object_name_without_underscore} from being saved"
+    I18n.expects(:t).with(@object_name, :default => @object_name_without_underscore, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name_without_underscore
+    error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
   end
 end
diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index f03998231e..b4b8cbe074 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -19,6 +19,30 @@ class ActiveRecordHelperTest < ActionView::TestCase
     Column = Struct.new("Column", :type, :name, :human_name)
   end
 
+  class DirtyPost
+    class Errors
+      def empty?
+        false
+      end
+
+      def count
+        1
+      end
+
+      def full_messages
+        ["Author name can't be <em>empty</em>"]
+      end
+
+      def on(field)
+        "can't be <em>empty</em>"
+      end
+    end
+
+    def errors
+      Errors.new
+    end
+  end
+
   def setup_post
     @post = Post.new
     def @post.errors
@@ -196,10 +220,20 @@ class ActiveRecordHelperTest < ActionView::TestCase
     assert_equal %(<div class="errorDeathByClass"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => nil, :header_tag => "h1")
   end
 
+  def test_error_messages_for_escapes_html
+    @dirty_post = DirtyPost.new
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this dirty post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be &lt;em&gt;empty&lt;/em&gt;</li></ul></div>), error_messages_for("dirty_post")
+  end
+
   def test_error_messages_for_handles_nil
     assert_equal "", error_messages_for("notthere")
   end
 
+  def test_error_message_on_escapes_html
+    @dirty_post = DirtyPost.new
+    assert_dom_equal "<div class=\"formError\">can't be &lt;em&gt;empty&lt;/em&gt;</div>", error_message_on(:dirty_post, :author_name)
+  end
+
   def test_error_message_on_handles_nil
     assert_equal "", error_message_on("notthere", "notthere")
   end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 44eca55a0e..76ceff8d6c 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -229,20 +229,18 @@ class AssetTagHelperTest < ActionView::TestCase
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
-  uses_mocha 'test image tag with windows behaviour' do
-    def test_image_tag_windows_behaviour
-      old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
-      # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
-      # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
-      # OS X, linux etc will return false in this case.
-      File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
-      assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
-    ensure
-      if old_asset_id
-        ENV["RAILS_ASSET_ID"] = old_asset_id
-      else
-        ENV.delete("RAILS_ASSET_ID")
-      end
+  def test_image_tag_windows_behaviour
+    old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
+    # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
+    # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
+    # OS X, linux etc will return false in this case.
+    File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
+    assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
+  ensure
+    if old_asset_id
+      ENV["RAILS_ASSET_ID"] = old_asset_id
+    else
+      ENV.delete("RAILS_ASSET_ID")
     end
   end
 
diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
new file mode 100644
index 0000000000..4c82b75cdc
--- /dev/null
+++ b/actionpack/test/template/body_parts_test.rb
@@ -0,0 +1,22 @@
+require 'abstract_unit'
+
+class BodyPartsTest < ActionController::TestCase
+  RENDERINGS = [Object.new, Object.new, Object.new]
+
+  class TestController < ActionController::Base
+    def index
+      RENDERINGS.each do |rendering|
+        response.template.punctuate_body! rendering
+      end
+      @performed_render = true
+    end
+  end
+
+  tests TestController
+
+  def test_body_parts
+    get :index
+    assert_equal RENDERINGS, @response.body_parts
+    assert_equal RENDERINGS.join, @response.body
+  end
+end
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index caea1bd643..a7ed13cf57 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -1,87 +1,85 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 
-uses_mocha 'TestTemplateRecompilation' do
-  class CompiledTemplatesTest < Test::Unit::TestCase
-    def setup
-      @compiled_templates = ActionView::Base::CompiledTemplates
-      @compiled_templates.instance_methods.each do |m|
-        @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
-      end
+class CompiledTemplatesTest < Test::Unit::TestCase
+  def setup
+    @compiled_templates = ActionView::Base::CompiledTemplates
+    @compiled_templates.instance_methods.each do |m|
+      @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
     end
+  end
 
-    def test_template_gets_compiled
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      assert_equal 1, @compiled_templates.instance_methods.size
-    end
+  def test_template_gets_compiled
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    assert_equal 1, @compiled_templates.instance_methods.size
+  end
 
-    def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb", :locals => {:foo => "bar"})
-      assert_equal 2, @compiled_templates.instance_methods.size
-    end
+  def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb", :locals => {:foo => "bar"})
+    assert_equal 2, @compiled_templates.instance_methods.size
+  end
 
-    def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      ActionView::Template.any_instance.expects(:compile!).never
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-    end
+  def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    ActionView::Template.any_instance.expects(:compile!).never
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+  end
 
-    def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
-      ActionView::Template.any_instance.expects(:recompile?).times(3).returns(true)
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
-      ActionView::Template.any_instance.expects(:compile!).times(3)
-      3.times { assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
-      assert_equal 1, @compiled_templates.instance_methods.size
-    end
+  def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
+    ActionView::Template.any_instance.expects(:recompile?).times(3).returns(true)
+    assert_equal 0, @compiled_templates.instance_methods.size
+    assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
+    ActionView::Template.any_instance.expects(:compile!).times(3)
+    3.times { assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
+    assert_equal 1, @compiled_templates.instance_methods.size
+  end
 
-    def test_template_changes_are_not_reflected_with_cached_templates
-      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      modify_template "test/hello_world.erb", "Goodbye world!" do
-        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
-      end
+  def test_template_changes_are_not_reflected_with_cached_templates
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    modify_template "test/hello_world.erb", "Goodbye world!" do
       assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     end
+    assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+  end
 
-    def test_template_changes_are_reflected_with_uncached_templates
-      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
-      modify_template "test/hello_world.erb", "Goodbye world!" do
-        assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
-      end
-      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+  def test_template_changes_are_reflected_with_uncached_templates
+    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+    modify_template "test/hello_world.erb", "Goodbye world!" do
+      assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
     end
+    assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+  end
 
-    private
-      def render(*args)
-        render_with_cache(*args)
-      end
+  private
+    def render(*args)
+      render_with_cache(*args)
+    end
 
-      def render_with_cache(*args)
-        view_paths = ActionController::Base.view_paths
-        assert_equal ActionView::Template::EagerPath, view_paths.first.class
-        ActionView::Base.new(view_paths, {}).render(*args)
-      end
+    def render_with_cache(*args)
+      view_paths = ActionController::Base.view_paths
+      assert_equal ActionView::Template::EagerPath, view_paths.first.class
+      ActionView::Base.new(view_paths, {}).render(*args)
+    end
 
-      def render_without_cache(*args)
-        path = ActionView::Template::Path.new(FIXTURE_LOAD_PATH)
-        view_paths = ActionView::Base.process_view_paths(path)
-        assert_equal ActionView::Template::Path, view_paths.first.class
-        ActionView::Base.new(view_paths, {}).render(*args)
-      end
+    def render_without_cache(*args)
+      path = ActionView::Template::Path.new(FIXTURE_LOAD_PATH)
+      view_paths = ActionView::Base.process_view_paths(path)
+      assert_equal ActionView::Template::Path, view_paths.first.class
+      ActionView::Base.new(view_paths, {}).render(*args)
+    end
 
-      def modify_template(template, content)
-        filename = "#{FIXTURE_LOAD_PATH}/#{template}"
-        old_content = File.read(filename)
-        begin
-          File.open(filename, "wb+") { |f| f.write(content) }
-          yield
-        ensure
-          File.open(filename, "wb+") { |f| f.write(old_content) }
-        end
+    def modify_template(template, content)
+      filename = "#{FIXTURE_LOAD_PATH}/#{template}"
+      old_content = File.read(filename)
+      begin
+        File.open(filename, "wb+") { |f| f.write(content) }
+        yield
+      ensure
+        File.open(filename, "wb+") { |f| f.write(old_content) }
       end
-  end
+    end
 end
diff --git a/actionpack/test/template/date_helper_i18n_test.rb b/actionpack/test/template/date_helper_i18n_test.rb
index fac30da128..bc011f59b8 100644
--- a/actionpack/test/template/date_helper_i18n_test.rb
+++ b/actionpack/test/template/date_helper_i18n_test.rb
@@ -8,66 +8,64 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
     @from = Time.mktime(2004, 6, 6, 21, 45, 0)
   end
 
-  uses_mocha 'date_helper_distance_of_time_in_words_i18n_test' do
-    # distance_of_time_in_words
-
-    def test_distance_of_time_in_words_calls_i18n
-      { # with include_seconds
-        [2.seconds,  true]  => [:'less_than_x_seconds', 5],
-        [9.seconds,  true]  => [:'less_than_x_seconds', 10],
-        [19.seconds, true]  => [:'less_than_x_seconds', 20],
-        [30.seconds, true]  => [:'half_a_minute',       nil],
-        [59.seconds, true]  => [:'less_than_x_minutes', 1],
-        [60.seconds, true]  => [:'x_minutes',           1],
-
-        # without include_seconds
-        [29.seconds, false] => [:'less_than_x_minutes', 1],
-        [60.seconds, false] => [:'x_minutes',           1],
-        [44.minutes, false] => [:'x_minutes',           44],
-        [61.minutes, false] => [:'about_x_hours',       1],
-        [24.hours,   false] => [:'x_days',              1],
-        [30.days,    false] => [:'about_x_months',      1],
-        [60.days,    false] => [:'x_months',            2],
-        [1.year,     false] => [:'about_x_years',       1],
-        [3.years,    false] => [:'over_x_years',        3]
-
-        }.each do |passed, expected|
-        assert_distance_of_time_in_words_translates_key passed, expected
-      end
+  # distance_of_time_in_words
+
+  def test_distance_of_time_in_words_calls_i18n
+    { # with include_seconds
+      [2.seconds,  true]  => [:'less_than_x_seconds', 5],
+      [9.seconds,  true]  => [:'less_than_x_seconds', 10],
+      [19.seconds, true]  => [:'less_than_x_seconds', 20],
+      [30.seconds, true]  => [:'half_a_minute',       nil],
+      [59.seconds, true]  => [:'less_than_x_minutes', 1],
+      [60.seconds, true]  => [:'x_minutes',           1],
+
+      # without include_seconds
+      [29.seconds, false] => [:'less_than_x_minutes', 1],
+      [60.seconds, false] => [:'x_minutes',           1],
+      [44.minutes, false] => [:'x_minutes',           44],
+      [61.minutes, false] => [:'about_x_hours',       1],
+      [24.hours,   false] => [:'x_days',              1],
+      [30.days,    false] => [:'about_x_months',      1],
+      [60.days,    false] => [:'x_months',            2],
+      [1.year,     false] => [:'about_x_years',       1],
+      [3.years,    false] => [:'over_x_years',        3]
+
+      }.each do |passed, expected|
+      assert_distance_of_time_in_words_translates_key passed, expected
     end
+  end
 
-    def assert_distance_of_time_in_words_translates_key(passed, expected)
-      diff, include_seconds = *passed
-      key, count = *expected
-      to = @from + diff
+  def assert_distance_of_time_in_words_translates_key(passed, expected)
+    diff, include_seconds = *passed
+    key, count = *expected
+    to = @from + diff
 
-      options = {:locale => 'en', :scope => :'datetime.distance_in_words'}
-      options[:count] = count if count
+    options = {:locale => 'en', :scope => :'datetime.distance_in_words'}
+    options[:count] = count if count
 
-      I18n.expects(:t).with(key, options)
-      distance_of_time_in_words(@from, to, include_seconds, :locale => 'en')
-    end
+    I18n.expects(:t).with(key, options)
+    distance_of_time_in_words(@from, to, include_seconds, :locale => 'en')
+  end
 
-    def test_distance_of_time_pluralizations
-      { [:'less_than_x_seconds', 1]   => 'less than 1 second',
-        [:'less_than_x_seconds', 2]   => 'less than 2 seconds',
-        [:'less_than_x_minutes', 1]   => 'less than a minute',
-        [:'less_than_x_minutes', 2]   => 'less than 2 minutes',
-        [:'x_minutes',           1]   => '1 minute',
-        [:'x_minutes',           2]   => '2 minutes',
-        [:'about_x_hours',       1]   => 'about 1 hour',
-        [:'about_x_hours',       2]   => 'about 2 hours',
-        [:'x_days',              1]   => '1 day',
-        [:'x_days',              2]   => '2 days',
-        [:'about_x_years',       1]   => 'about 1 year',
-        [:'about_x_years',       2]   => 'about 2 years',
-        [:'over_x_years',        1]   => 'over 1 year',
-        [:'over_x_years',        2]   => 'over 2 years' 
-
-        }.each do |args, expected|
-        key, count = *args
-        assert_equal expected, I18n.t(key, :count => count, :scope => 'datetime.distance_in_words')
-      end
+  def test_distance_of_time_pluralizations
+    { [:'less_than_x_seconds', 1]   => 'less than 1 second',
+      [:'less_than_x_seconds', 2]   => 'less than 2 seconds',
+      [:'less_than_x_minutes', 1]   => 'less than a minute',
+      [:'less_than_x_minutes', 2]   => 'less than 2 minutes',
+      [:'x_minutes',           1]   => '1 minute',
+      [:'x_minutes',           2]   => '2 minutes',
+      [:'about_x_hours',       1]   => 'about 1 hour',
+      [:'about_x_hours',       2]   => 'about 2 hours',
+      [:'x_days',              1]   => '1 day',
+      [:'x_days',              2]   => '2 days',
+      [:'about_x_years',       1]   => 'about 1 year',
+      [:'about_x_years',       2]   => 'about 2 years',
+      [:'over_x_years',        1]   => 'over 1 year',
+      [:'over_x_years',        2]   => 'over 2 years' 
+
+      }.each do |args, expected|
+      key, count = *args
+      assert_equal expected, I18n.t(key, :count => count, :scope => 'datetime.distance_in_words')
     end
   end
 end
@@ -76,49 +74,47 @@ class DateHelperSelectTagsI18nTests < Test::Unit::TestCase
   include ActionView::Helpers::DateHelper
   attr_reader :request
 
-  uses_mocha 'date_helper_select_tags_i18n_tests' do
-    def setup
-      @prompt_defaults = {:year => 'Year', :month => 'Month', :day => 'Day', :hour => 'Hour', :minute => 'Minute', :second => 'Seconds'}
-
-      I18n.stubs(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
-    end
+  def setup
+    @prompt_defaults = {:year => 'Year', :month => 'Month', :day => 'Day', :hour => 'Hour', :minute => 'Minute', :second => 'Seconds'}
 
-    # select_month
+    I18n.stubs(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
+  end
 
-    def test_select_month_given_use_month_names_option_does_not_translate_monthnames
-      I18n.expects(:translate).never
-      select_month(8, :locale => 'en', :use_month_names => Date::MONTHNAMES)
-    end
+  # select_month
 
-    def test_select_month_translates_monthnames
-      I18n.expects(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
-      select_month(8, :locale => 'en')
-    end
+  def test_select_month_given_use_month_names_option_does_not_translate_monthnames
+    I18n.expects(:translate).never
+    select_month(8, :locale => 'en', :use_month_names => Date::MONTHNAMES)
+  end
 
-    def test_select_month_given_use_short_month_option_translates_abbr_monthnames
-      I18n.expects(:translate).with(:'date.abbr_month_names', :locale => 'en').returns Date::ABBR_MONTHNAMES
-      select_month(8, :locale => 'en', :use_short_month => true)
-    end
+  def test_select_month_translates_monthnames
+    I18n.expects(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
+    select_month(8, :locale => 'en')
+  end
 
-    def test_date_or_time_select_translates_prompts
-      @prompt_defaults.each do |key, prompt|
-        I18n.expects(:translate).with(('datetime.prompts.' + key.to_s).to_sym, :locale => 'en').returns prompt
-      end
+  def test_select_month_given_use_short_month_option_translates_abbr_monthnames
+    I18n.expects(:translate).with(:'date.abbr_month_names', :locale => 'en').returns Date::ABBR_MONTHNAMES
+    select_month(8, :locale => 'en', :use_short_month => true)
+  end
 
-      I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
-      datetime_select('post', 'updated_at', :locale => 'en', :include_seconds => true, :prompt => true)
+  def test_date_or_time_select_translates_prompts
+    @prompt_defaults.each do |key, prompt|
+      I18n.expects(:translate).with(('datetime.prompts.' + key.to_s).to_sym, :locale => 'en').returns prompt
     end
 
-    # date_or_time_select
+    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+    datetime_select('post', 'updated_at', :locale => 'en', :include_seconds => true, :prompt => true)
+  end
 
-    def test_date_or_time_select_given_an_order_options_does_not_translate_order
-      I18n.expects(:translate).never
-      datetime_select('post', 'updated_at', :order => [:year, :month, :day], :locale => 'en')
-    end
+  # date_or_time_select
 
-    def test_date_or_time_select_given_no_order_options_translates_order
-      I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
-      datetime_select('post', 'updated_at', :locale => 'en')
-    end
+  def test_date_or_time_select_given_an_order_options_does_not_translate_order
+    I18n.expects(:translate).never
+    datetime_select('post', 'updated_at', :order => [:year, :month, :day], :locale => 'en')
+  end
+
+  def test_date_or_time_select_given_no_order_options_translates_order
+    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+    datetime_select('post', 'updated_at', :locale => 'en')
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 92cdce2e45..2e4763f446 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1726,40 +1726,38 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at")
   end
 
-  uses_mocha 'TestDatetimeSelectDefaultsToTimeZoneNowWhenConfigTimeZoneIsSet' do
-    def test_datetime_select_defaults_to_time_zone_now_when_config_time_zone_is_set
-      time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
-      time_zone = mock()
-      time_zone.expects(:now).returns time
-      Time.zone_default = time_zone
-      @post = Post.new
-
-      expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-      expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
-      expected << "</select>\n"
-
-      expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
-      expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
-      expected << "</select>\n"
-
-      expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
-      expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
-      expected << "</select>\n"
-
-      expected << " &mdash; "
-
-      expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
-      expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
-      expected << "</select>\n"
-      expected << " : "
-      expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
-      expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
-      expected << "</select>\n"
-
-      assert_dom_equal expected, datetime_select("post", "updated_at")
-    ensure
-      Time.zone_default = nil
-    end
+  def test_datetime_select_defaults_to_time_zone_now_when_config_time_zone_is_set
+    time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
+    time_zone = mock()
+    time_zone.expects(:now).returns time
+    Time.zone_default = time_zone
+    @post = Post.new
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
+    expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, datetime_select("post", "updated_at")
+  ensure
+    Time.zone_default = nil
   end
 
   def test_datetime_select_with_html_options_within_fields_for
@@ -1822,60 +1820,60 @@ class DateHelperTest < ActionView::TestCase
 
   def test_datetime_select_with_default_prompt
     @post = Post.new
-    @post.updated_at = Time.local(2004, 6, 15, 16, 35)
+    @post.updated_at = nil
 
     expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-    expected << %{<option value="">Year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << %{<option value="">Year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
     expected << "</select>\n"
 
     expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
-    expected << %{<option value="">Month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << %{<option value="">Month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
     expected << "</select>\n"
 
     expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
-    expected << %{<option value="">Day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << %{<option value="">Day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
     expected << "</select>\n"
 
     expected << " &mdash; "
 
     expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
-    expected << %{<option value="">Hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << %{<option value="">Hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
     expected << "</select>\n"
     expected << " : "
     expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
-    expected << %{<option value="">Minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << %{<option value="">Minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
     expected << "</select>\n"
 
-    assert_dom_equal expected, datetime_select("post", "updated_at", :prompt => true)
+    assert_dom_equal expected, datetime_select("post", "updated_at", :start_year=>1999, :end_year=>2009,  :prompt => true)
   end
 
   def test_datetime_select_with_custom_prompt
     @post = Post.new
-    @post.updated_at = Time.local(2004, 6, 15, 16, 35)
+    @post.updated_at = nil
 
     expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-    expected << %{<option value="">Choose year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << %{<option value="">Choose year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
     expected << "</select>\n"
 
     expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
-    expected << %{<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << %{<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
     expected << "</select>\n"
 
     expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
-    expected << %{<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << %{<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
     expected << "</select>\n"
 
     expected << " &mdash; "
 
     expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
-    expected << %{<option value="">Choose hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << %{<option value="">Choose hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
     expected << "</select>\n"
     expected << " : "
     expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
-    expected << %{<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << %{<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
     expected << "</select>\n"
 
-    assert_dom_equal expected, datetime_select("post", "updated_at", :prompt => {:year => 'Choose year', :month => 'Choose month', :day => 'Choose day', :hour => 'Choose hour', :minute => 'Choose minute'})
+    assert_dom_equal expected, datetime_select("post", "updated_at", :start_year=>1999, :end_year=>2009, :prompt => {:year => 'Choose year', :month => 'Choose month', :day => 'Choose day', :hour => 'Choose hour', :minute => 'Choose minute'})
   end
 
   def test_date_select_with_zero_value_and_no_start_year
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index e268728c79..104649deac 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -15,21 +15,31 @@ silence_warnings do
     def new_record?
       @new_record
     end
+
+    attr_accessor :author
+    def author_attributes=(attributes); end
+
+    attr_accessor :comments
+    def comments_attributes=(attributes); end
   end
 
   class Comment
     attr_reader :id
     attr_reader :post_id
+    def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
     def save; @id = 1; @post_id = 1 end
     def new_record?; @id.nil? end
     def to_param; @id; end
     def name
-      @id.nil? ? 'new comment' : "comment ##{@id}"
+      @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
     end
   end
-end
 
-class Comment::Nested < Comment; end
+  class Author < Comment
+    attr_accessor :post
+    def post_attributes=(attributes); end
+  end
+end
 
 class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
@@ -161,36 +171,36 @@ class FormHelperTest < ActionView::TestCase
 
   def test_check_box
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     @post.secret = 0
     assert_dom_equal(
-      '<input id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret" ,{"checked"=>"checked"})
     )
     @post.secret = true
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret?")
     )
 
     @post.secret = ['0']
     assert_dom_equal(
-      '<input id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     @post.secret = ['1']
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
   end
@@ -198,14 +208,14 @@ class FormHelperTest < ActionView::TestCase
   def test_check_box_with_explicit_checked_and_unchecked_values
     @post.secret = "on"
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" /><input name="post[secret]" type="hidden" value="off" />',
+      '<input name="post[secret]" type="hidden" value="off" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" />',
       check_box("post", "secret", {}, "on", "off")
     )
   end
 
   def test_checkbox_disabled_still_submits_checked_value
     assert_dom_equal(
-      '<input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="1" />',
+      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret", { :disabled => :true })
     )
   end
@@ -280,7 +290,7 @@ class FormHelperTest < ActionView::TestCase
       text_area("post", "body", "name" => "really!")
     )
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" /><input name="i mean it" type="hidden" value="0" />',
+      '<input name="i mean it" type="hidden" value="0" /><input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" />',
       check_box("post", "secret", "name" => "i mean it")
     )
     assert_dom_equal text_field("post", "title", "name" => "dont guess"),
@@ -300,7 +310,7 @@ class FormHelperTest < ActionView::TestCase
       text_area("post", "body", "id" => "really!")
     )
     assert_dom_equal(
-      '<input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret", "id" => "i mean it")
     )
     assert_dom_equal text_field("post", "title", "id" => "dont guess"),
@@ -325,7 +335,7 @@ class FormHelperTest < ActionView::TestCase
       text_area("post[]", "body")
     )
     assert_dom_equal(
-      "<input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" />",
+      "<input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" /><input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" />",
       check_box("post[]", "secret")
     )
    assert_dom_equal(
@@ -351,8 +361,8 @@ class FormHelperTest < ActionView::TestCase
       "<label for='post_title'>Title</label>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='commit' id='post_submit' type='submit' value='Create post' />" +
       "</form>"
 
@@ -371,8 +381,8 @@ class FormHelperTest < ActionView::TestCase
       "<div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -389,8 +399,8 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' id='create-post' method='post'>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -409,8 +419,8 @@ class FormHelperTest < ActionView::TestCase
       "<label for=\"post_123_title\">Title</label>" +
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -427,8 +437,8 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' method='post'>" +
       "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -480,7 +490,7 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-  def test_nested_fields_for_with_index
+  def test_form_for_with_index_and_nested_fields_for
     form_for(:post, @post, :index => 1) do |f|
       f.fields_for(:comment, @post) do |c|
         concat c.text_field(:title)
@@ -559,6 +569,158 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_a_new_record_on_a_nested_attributes_one_to_one_association
+    @post.author = Author.new
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:author) do |af|
+        concat af.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="new author" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_explicitly_passed_object_on_a_nested_attributes_one_to_one_association
+    form_for(:post, @post) do |f|
+      f.fields_for(:author, Author.new(123)) do |af|
+        assert_not_nil af.object
+        assert_equal 123, af.object.id
+      end
+    end
+  end
+
+  def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association
+    @post.author = Author.new(321)
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:author) do |af|
+        concat af.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
+               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.text_field(:name)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_new_records_on_a_nested_attributes_collection_association
+    @post.comments = [Comment.new, Comment.new]
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.text_field(:name)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="new comment" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_and_new_records_on_a_nested_attributes_collection_association
+    @post.comments = [Comment.new(321), Comment.new]
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.text_field(:name)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_on_a_nested_attributes_collection_association_yields_only_builder
+    @post.comments = [Comment.new(321), Comment.new]
+    yielded_comments = []
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments) do |cf|
+        concat cf.text_field(:name)
+        yielded_comments << cf.object
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+    assert_equal yielded_comments, @post.comments
+  end
+
+  def test_nested_fields_for_with_child_index_option_override_on_a_nested_attributes_collection_association
+    @post.comments = []
+
+    form_for(:post, @post) do |f|
+      f.fields_for(:comments, Comment.new(321), :child_index => 'abc') do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />' +
+               '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_fields_for
     fields_for(:post, @post) do |f|
       concat f.text_field(:title)
@@ -569,8 +731,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' />"
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -585,8 +747,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
-      "<input name='post[123][secret]' type='hidden' value='0' />"
+      "<input name='post[123][secret]' type='hidden' value='0' />" +
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -601,8 +763,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
-      "<input name='post[][secret]' type='hidden' value='0' />"
+      "<input name='post[][secret]' type='hidden' value='0' />" +
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -617,8 +779,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[abc][title]' size='30' type='text' id='post_abc_title' value='Hello World' />" +
       "<textarea name='post[abc][body]' id='post_abc_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />" +
-      "<input name='post[abc][secret]' type='hidden' value='0' />"
+      "<input name='post[abc][secret]' type='hidden' value='0' />" +
+      "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -633,8 +795,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' />"
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -649,8 +811,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' />"
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -695,8 +857,8 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' id='create-post' method='post'>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
+      "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -744,8 +906,7 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' method='post'>" +
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -765,8 +926,7 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' method='post'>" +
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -821,8 +981,7 @@ class FormHelperTest < ActionView::TestCase
        %(<form action="http://www.example.com" onsubmit="new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" method="post">) +
        "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
        "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-       "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-       "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>" +
        "</form>"
 
      assert_dom_equal expected, output_buffer
@@ -838,12 +997,52 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' /><br/>"
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
 
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_for_with_labelled_builder_with_nested_fields_for_without_options_hash
+    klass = nil
+
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new) do |nested_fields|
+        klass = nested_fields.class
+        ''
+      end
+    end
+
+    assert_equal LabelledFormBuilder, klass
+  end
+
+  def test_form_for_with_labelled_builder_with_nested_fields_for_with_options_hash
+    klass = nil
+
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new, :index => 'foo') do |nested_fields|
+        klass = nested_fields.class
+        ''
+      end
+    end
+
+    assert_equal LabelledFormBuilder, klass
+  end
+
+  class LabelledFormBuilderSubclass < LabelledFormBuilder; end
+
+  def test_form_for_with_labelled_builder_with_nested_fields_for_with_custom_builder
+    klass = nil
+
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new, :builder => LabelledFormBuilderSubclass) do |nested_fields|
+        klass = nested_fields.class
+        ''
+      end
+    end
+
+    assert_equal LabelledFormBuilderSubclass, klass
+  end
+
   def test_form_for_with_html_options_adds_options_to_form_tag
     form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
     expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\"></form>"
@@ -975,4 +1174,4 @@ class FormHelperTest < ActionView::TestCase
     def protect_against_forgery?
       false
     end
-end
+end
\ No newline at end of file
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 6821832ee9..78db87971b 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -3,727 +3,749 @@ require 'tzinfo'
 
 TZInfo::Timezone.cattr_reader :loaded_zones
 
-uses_mocha "FormOptionsHelperTest" do
-  class FormOptionsHelperTest < ActionView::TestCase
-    tests ActionView::Helpers::FormOptionsHelper
-
-    silence_warnings do
-      Post        = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
-      Continent   = Struct.new('Continent', :continent_name, :countries)
-      Country     = Struct.new('Country', :country_id, :country_name)
-      Firm        = Struct.new('Firm', :time_zone)
-      Album       = Struct.new('Album', :id, :title, :genre)
-    end
+class FormOptionsHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::FormOptionsHelper
+
+  silence_warnings do
+    Post        = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
+    Continent   = Struct.new('Continent', :continent_name, :countries)
+    Country     = Struct.new('Country', :country_id, :country_name)
+    Firm        = Struct.new('Firm', :time_zone)
+    Album       = Struct.new('Album', :id, :title, :genre)
+  end
 
-    def setup
-      super
-      @fake_timezones = %w(A B C D E).inject([]) do |zones, id|
-        tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id)
-        ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz)
-        zones << tz
-      end
-      ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones)
+  def setup
+    @fake_timezones = %w(A B C D E).inject([]) do |zones, id|
+      tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id)
+      ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz)
+      zones << tz
     end
+    ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones)
+  end
 
-    def test_collection_options
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_collection_options
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title")
+    )
+  end
 
+
+  def test_collection_options_with_preselected_value
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", "Babe")
+    )
+  end
+
+  def test_collection_options_with_preselected_value_array
       assert_dom_equal(
-        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
-        options_from_collection_for_select(@posts, "author_name", "title")
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
+        options_from_collection_for_select(dummy_posts, "author_name", "title", [ "Babe", "Cabe" ])
       )
-    end
+  end
 
+  def test_collection_options_with_proc_for_selected
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", lambda{|p| p.author_name == 'Babe' })
+    )
+  end
 
-    def test_collection_options_with_preselected_value
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_collection_options_with_disabled_value
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => "Babe")
+    )
+  end
 
-      assert_dom_equal(
-        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
-        options_from_collection_for_select(@posts, "author_name", "title", "Babe")
-      )
-    end
+  def test_collection_options_with_disabled_array
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => [ "Babe", "Cabe" ])
+    )
+  end
 
-    def test_collection_options_with_preselected_value_array
-        @posts = [
-          Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-          Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-          Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-        ]
-
-        assert_dom_equal(
-          "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
-          options_from_collection_for_select(@posts, "author_name", "title", [ "Babe", "Cabe" ])
-        )
-    end
+  def test_collection_options_with_preselected_and_disabled_value
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :selected => "Cabe", :disabled => "Babe")
+    )
+  end
 
-    def test_array_options_for_select
-      assert_dom_equal(
-        "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
-        options_for_select([ "<Denmark>", "USA", "Sweden" ])
-      )
-    end
+  def test_collection_options_with_proc_for_disabled
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => lambda{|p| %w(Babe Cabe).include? p.author_name })
+    )
+  end
+
+  def test_array_options_for_select
+    assert_dom_equal(
+      "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "<Denmark>", "USA", "Sweden" ])
+    )
+  end
 
-    def test_array_options_for_select_with_selection
+  def test_array_options_for_select_with_selection
+    assert_dom_equal(
+      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
+    )
+  end
+
+  def test_array_options_for_select_with_selection_array
       assert_dom_equal(
-        "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
-        options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
+        "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
+        options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
       )
-    end
+  end
 
-    def test_array_options_for_select_with_selection_array
-        assert_dom_equal(
-          "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
-          options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
-        )
-    end
+  def test_array_options_for_select_with_disabled_value
+    assert_dom_equal(
+      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" disabled=\"disabled\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], :disabled => "<USA>")
+    )
+  end
 
-    def test_array_options_for_string_include_in_other_string_bug_fix
-        assert_dom_equal(
-          "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
-          options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
-        )
-        assert_dom_equal(
-          "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
-          options_for_select([ "ruby", "rubyonrails" ], "ruby")
-        )
-        assert_dom_equal(
-          %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
-          options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
-        )
-    end
+  def test_array_options_for_select_with_disabled_array
+    assert_dom_equal(
+      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" disabled=\"disabled\">&lt;USA&gt;</option>\n<option value=\"Sweden\" disabled=\"disabled\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], :disabled => ["<USA>", "Sweden"])
+    )
+  end
 
-    def test_hash_options_for_select
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-        options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
-      )
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
-      )
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
-      )
-    end
+  def test_array_options_for_select_with_selection_and_disabled_value
+    assert_dom_equal(
+      "<option value=\"Denmark\" selected=\"selected\">Denmark</option>\n<option value=\"&lt;USA&gt;\" disabled=\"disabled\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], :selected => "Denmark", :disabled => "<USA>")
+    )
+  end
 
-    def test_ducktyped_options_for_select
-      quack = Struct.new(:first, :last)
+  def test_array_options_for_string_include_in_other_string_bug_fix
       assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
+        "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
+        options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
       )
       assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
+        "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
+        options_for_select([ "ruby", "rubyonrails" ], "ruby")
       )
       assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
+        %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
+        options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
       )
-    end
-
-    def test_option_groups_from_collection_for_select
-      @continents = [
-        Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
-        Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
-      ]
+  end
 
-      assert_dom_equal(
-        "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
-        option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
-      )
-    end
+  def test_hash_options_for_select
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+      options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
+    )
+  end
 
-    def test_grouped_options_for_select_with_array
-      assert_dom_equal(
-        "<optgroup label=\"North America\"><option value=\"US\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"GB\">Great Britain</option>\n<option value=\"Germany\">Germany</option></optgroup>",
-        grouped_options_for_select([
-           ["North America",
-               [['United States','US'],"Canada"]],
-           ["Europe",
-               [["Great Britain","GB"], "Germany"]]
-         ])
-      )
-    end
+  def test_ducktyped_options_for_select
+    quack = Struct.new(:first, :last)
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
+    )
+  end
 
-    def test_grouped_options_for_select_with_selected_and_prompt
-      assert_dom_equal(
-          "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
-          grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...")
-      )
-    end
+  def test_option_groups_from_collection_for_select
+    @continents = [
+      Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
+      Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
+    ]
 
-    def test_optgroups_with_with_options_with_hash
-      assert_dom_equal(
-         "<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>",
-         grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']})
-      )
-    end
+    assert_dom_equal(
+      "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
+      option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
+    )
+  end
 
-    def test_time_zone_options_no_parms
-      opts = time_zone_options_for_select
-      assert_dom_equal "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>\n" +
-                   "<option value=\"E\">E</option>",
-                   opts
-    end
+  def test_grouped_options_for_select_with_array
+    assert_dom_equal(
+      "<optgroup label=\"North America\"><option value=\"US\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"GB\">Great Britain</option>\n<option value=\"Germany\">Germany</option></optgroup>",
+      grouped_options_for_select([
+         ["North America",
+             [['United States','US'],"Canada"]],
+         ["Europe",
+             [["Great Britain","GB"], "Germany"]]
+       ])
+    )
+  end
 
-    def test_time_zone_options_with_selected
-      opts = time_zone_options_for_select( "D" )
-      assert_dom_equal "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>",
-                   opts
-    end
+  def test_grouped_options_for_select_with_selected_and_prompt
+    assert_dom_equal(
+        "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+        grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...")
+    )
+  end
 
-    def test_time_zone_options_with_unknown_selected
-      opts = time_zone_options_for_select( "K" )
-      assert_dom_equal "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>\n" +
-                   "<option value=\"E\">E</option>",
-                   opts
-    end
+  def test_optgroups_with_with_options_with_hash
+    assert_dom_equal(
+       "<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>",
+       grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']})
+    )
+  end
 
-    def test_time_zone_options_with_priority_zones
-      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
-      opts = time_zone_options_for_select( nil, zones )
-      assert_dom_equal "<option value=\"B\">B</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>",
-                   opts
-    end
+  def test_time_zone_options_no_parms
+    opts = time_zone_options_for_select
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>\n" +
+                 "<option value=\"E\">E</option>",
+                 opts
+  end
 
-    def test_time_zone_options_with_selected_priority_zones
-      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
-      opts = time_zone_options_for_select( "E", zones )
-      assert_dom_equal "<option value=\"B\">B</option>\n" +
-                   "<option value=\"E\" selected=\"selected\">E</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>",
-                   opts
-    end
+  def test_time_zone_options_with_selected
+    opts = time_zone_options_for_select( "D" )
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>",
+                 opts
+  end
 
-    def test_time_zone_options_with_unselected_priority_zones
-      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
-      opts = time_zone_options_for_select( "C", zones )
-      assert_dom_equal "<option value=\"B\">B</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"C\" selected=\"selected\">C</option>\n" +
-                   "<option value=\"D\">D</option>",
-                   opts
-    end
+  def test_time_zone_options_with_unknown_selected
+    opts = time_zone_options_for_select( "K" )
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>\n" +
+                 "<option value=\"E\">E</option>",
+                 opts
+  end
 
-    def test_select
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest))
-      )
-    end
+  def test_time_zone_options_with_priority_zones
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+    opts = time_zone_options_for_select( nil, zones )
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>",
+                 opts
+  end
 
-    def test_select_under_fields_for
-      @post = Post.new
-      @post.category = "<mus>"
+  def test_time_zone_options_with_selected_priority_zones
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+    opts = time_zone_options_for_select( "E", zones )
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
+                 "<option value=\"E\" selected=\"selected\">E</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>",
+                 opts
+  end
 
-      fields_for :post, @post do |f|
-        concat f.select(:category, %w( abe <mus> hest))
-      end
-    
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        output_buffer
-      )
-    end
+  def test_time_zone_options_with_unselected_priority_zones
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+    opts = time_zone_options_for_select( "C", zones )
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"C\" selected=\"selected\">C</option>\n" +
+                 "<option value=\"D\">D</option>",
+                 opts
+  end
 
-    def test_select_under_fields_for_with_index
-      @post = Post.new
-      @post.category = "<mus>"
+  def test_select
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest))
+    )
+  end
 
-      fields_for :post, @post, :index => 108 do |f|
-        concat f.select(:category, %w( abe <mus> hest))
-      end
+  def test_select_under_fields_for
+    @post = Post.new
+    @post.category = "<mus>"
 
-      assert_dom_equal(
-        "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        output_buffer
-      )
+    fields_for :post, @post do |f|
+      concat f.select(:category, %w( abe <mus> hest))
     end
+  
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      output_buffer
+    )
+  end
 
-    def test_select_under_fields_for_with_auto_index
-      @post = Post.new
-      @post.category = "<mus>"
-      def @post.to_param; 108; end
-
-      fields_for "post[]", @post do |f|
-        concat f.select(:category, %w( abe <mus> hest))
-      end
+  def test_select_under_fields_for_with_index
+    @post = Post.new
+    @post.category = "<mus>"
 
-      assert_dom_equal(
-        "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        output_buffer
-      )
+    fields_for :post, @post, :index => 108 do |f|
+      concat f.select(:category, %w( abe <mus> hest))
     end
 
-    def test_select_with_blank
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :include_blank => true)
-      )
-    end
+    assert_dom_equal(
+      "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      output_buffer
+    )
+  end
 
-    def test_select_with_blank_as_string
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">None</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :include_blank => 'None')
-      )
-    end
+  def test_select_under_fields_for_with_auto_index
+    @post = Post.new
+    @post.category = "<mus>"
+    def @post.to_param; 108; end
 
-    def test_select_with_default_prompt
-      @post = Post.new
-      @post.category = ""
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => true)
-      )
+    fields_for "post[]", @post do |f|
+      concat f.select(:category, %w( abe <mus> hest))
     end
 
-    def test_select_no_prompt_when_select_has_value
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => true)
-      )
-    end
+    assert_dom_equal(
+      "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      output_buffer
+    )
+  end
 
-    def test_select_with_given_prompt
-      @post = Post.new
-      @post.category = ""
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
-      )
-    end
+  def test_select_with_blank
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :include_blank => true)
+    )
+  end
 
-    def test_select_with_prompt_and_blank
-      @post = Post.new
-      @post.category = ""
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
-      )
-    end
+  def test_select_with_blank_as_string
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">None</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :include_blank => 'None')
+    )
+  end
 
-    def test_select_with_selected_value
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
-      )
-    end
-  
-    def test_select_with_index_option
-      @album = Album.new
-      @album.id = 1
-    
-      expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
+  def test_select_with_default_prompt
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => true)
+    )
+  end
 
-      assert_dom_equal(
-        expected, 
-        select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
-      )
-    end
+  def test_select_no_prompt_when_select_has_value
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => true)
+    )
+  end
 
-    def test_select_with_selected_nil
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest ), :selected => nil)
-      )
-    end
+  def test_select_with_given_prompt
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
+    )
+  end
 
-    def test_collection_select
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_select_with_prompt_and_blank
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
+    )
+  end
 
-      @post = Post.new
-      @post.author_name = "Babe"
+  def test_select_with_selected_value
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
+    )
+  end
 
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        collection_select("post", "author_name", @posts, "author_name", "author_name")
-      )
-    end
+  def test_select_with_index_option
+    @album = Album.new
+    @album.id = 1
+  
+    expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
 
-    def test_collection_select_under_fields_for
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+    assert_dom_equal(
+      expected, 
+      select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
+    )
+  end
 
-      @post = Post.new
-      @post.author_name = "Babe"
+  def test_select_with_selected_nil
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :selected => nil)
+    )
+  end
 
-      fields_for :post, @post do |f|
-        concat f.collection_select(:author_name, @posts, :author_name, :author_name)
-      end
-    
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        output_buffer
-      )
-    end
+  def test_select_with_disabled_value
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\" disabled=\"disabled\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :disabled => 'hest')
+    )
+  end
 
-    def test_collection_select_under_fields_for_with_index
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_select_with_disabled_array
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" disabled=\"disabled\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\" disabled=\"disabled\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :disabled => ['hest', 'abe'])
+    )
+  end
 
-      @post = Post.new
-      @post.author_name = "Babe"
+  def test_collection_select
+    @post = Post.new
+    @post.author_name = "Babe"
 
-      fields_for :post, @post, :index => 815 do |f|
-        concat f.collection_select(:author_name, @posts, :author_name, :author_name)
-      end
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name")
+    )
+  end
 
-      assert_dom_equal(
-        "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        output_buffer
-      )
+  def test_collection_select_under_fields_for
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    fields_for :post, @post do |f|
+      concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
+  
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      output_buffer
+    )
+  end
 
-    def test_collection_select_under_fields_for_with_auto_index
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_collection_select_under_fields_for_with_index
+    @post = Post.new
+    @post.author_name = "Babe"
 
-      @post = Post.new
-      @post.author_name = "Babe"
-      def @post.to_param; 815; end
+    fields_for :post, @post, :index => 815 do |f|
+      concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
+    end
 
-      fields_for "post[]", @post do |f|
-        concat f.collection_select(:author_name, @posts, :author_name, :author_name)
-      end
+    assert_dom_equal(
+      "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      output_buffer
+    )
+  end
 
-      assert_dom_equal(
-        "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        output_buffer
-      )
+  def test_collection_select_under_fields_for_with_auto_index
+    @post = Post.new
+    @post.author_name = "Babe"
+    def @post.to_param; 815; end
+
+    fields_for "post[]", @post do |f|
+      concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
 
-    def test_collection_select_with_blank_and_style
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+    assert_dom_equal(
+      "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      output_buffer
+    )
+  end
 
-      @post = Post.new
-      @post.author_name = "Babe"
+  def test_collection_select_with_blank_and_style
+    @post = Post.new
+    @post.author_name = "Babe"
 
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
-      )
-    end
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
+    )
+  end
 
-    def test_collection_select_with_blank_as_string_and_style
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_collection_select_with_blank_as_string_and_style
+    @post = Post.new
+    @post.author_name = "Babe"
 
-      @post = Post.new
-      @post.author_name = "Babe"
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\">No Selection</option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px")
+    )
+  end
 
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\">No Selection</option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px")
-      )
-    end
+  def test_collection_select_with_multiple_option_appends_array_brackets
+    @post = Post.new
+    @post.author_name = "Babe"
 
-    def test_collection_select_with_multiple_option_appends_array_brackets
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+    expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
 
-      @post = Post.new
-      @post.author_name = "Babe"
+    # Should suffix default name with [].
+    assert_dom_equal expected, collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
 
-      expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
+    # Shouldn't suffix custom name with [].
+    assert_dom_equal expected, collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
+  end
 
-      # Should suffix default name with [].
-      assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
+  def test_collection_select_with_blank_and_selected
+    @post = Post.new
+    @post.author_name = "Babe"
 
-      # Shouldn't suffix custom name with [].
-      assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
-    end
+    assert_dom_equal(
+      %{<select id="post_author_name" name="post[author_name]"><option value=""></option>\n<option value="&lt;Abe&gt;" selected="selected">&lt;Abe&gt;</option>\n<option value="Babe">Babe</option>\n<option value="Cabe">Cabe</option></select>},
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", {:include_blank => true, :selected => "<Abe>"})
+    )
+  end
 
-    def test_collection_select_with_blank_and_selected
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_collection_select_with_disabled
+    @post = Post.new
+    @post.author_name = "Babe"
 
-      @post = Post.new
-      @post.author_name = "Babe"
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", :disabled => 'Cabe')
+       )
+  end
 
-      assert_dom_equal(
-        %{<select id="post_author_name" name="post[author_name]"><option value=""></option>\n<option value="&lt;Abe&gt;" selected="selected">&lt;Abe&gt;</option>\n<option value="Babe">Babe</option>\n<option value="Cabe">Cabe</option></select>},
-        collection_select("post", "author_name", @posts, "author_name", "author_name", {:include_blank => true, :selected => "<Abe>"})
-      )
-    end
+  def test_time_zone_select
+    @firm = Firm.new("D")
+    html = time_zone_select( "firm", "time_zone" )
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
 
-    def test_time_zone_select
-      @firm = Firm.new("D")
-      html = time_zone_select( "firm", "time_zone" )
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
+  def test_time_zone_select_under_fields_for
+    @firm = Firm.new("D")
+
+    fields_for :firm, @firm do |f|
+      concat f.time_zone_select(:time_zone)
     end
+  
+    assert_dom_equal(
+      "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+      "<option value=\"A\">A</option>\n" +
+      "<option value=\"B\">B</option>\n" +
+      "<option value=\"C\">C</option>\n" +
+      "<option value=\"D\" selected=\"selected\">D</option>\n" +
+      "<option value=\"E\">E</option>" +
+      "</select>",
+      output_buffer
+    )
+  end
 
-    def test_time_zone_select_under_fields_for
-      @firm = Firm.new("D")
+  def test_time_zone_select_under_fields_for_with_index
+    @firm = Firm.new("D")
 
-      fields_for :firm, @firm do |f|
-        concat f.time_zone_select(:time_zone)
-      end
-    
-      assert_dom_equal(
-        "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-        "<option value=\"A\">A</option>\n" +
-        "<option value=\"B\">B</option>\n" +
-        "<option value=\"C\">C</option>\n" +
-        "<option value=\"D\" selected=\"selected\">D</option>\n" +
-        "<option value=\"E\">E</option>" +
-        "</select>",
-        output_buffer
-      )
+    fields_for :firm, @firm, :index => 305 do |f|
+      concat f.time_zone_select(:time_zone)
     end
 
-    def test_time_zone_select_under_fields_for_with_index
-      @firm = Firm.new("D")
+    assert_dom_equal(
+      "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
+      "<option value=\"A\">A</option>\n" +
+      "<option value=\"B\">B</option>\n" +
+      "<option value=\"C\">C</option>\n" +
+      "<option value=\"D\" selected=\"selected\">D</option>\n" +
+      "<option value=\"E\">E</option>" +
+      "</select>",
+      output_buffer
+    )
+  end
 
-      fields_for :firm, @firm, :index => 305 do |f|
-        concat f.time_zone_select(:time_zone)
-      end
+  def test_time_zone_select_under_fields_for_with_auto_index
+    @firm = Firm.new("D")
+    def @firm.to_param; 305; end
 
-      assert_dom_equal(
-        "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
-        "<option value=\"A\">A</option>\n" +
-        "<option value=\"B\">B</option>\n" +
-        "<option value=\"C\">C</option>\n" +
-        "<option value=\"D\" selected=\"selected\">D</option>\n" +
-        "<option value=\"E\">E</option>" +
-        "</select>",
-        output_buffer
-      )
+    fields_for "firm[]", @firm do |f|
+      concat f.time_zone_select(:time_zone)
     end
 
-    def test_time_zone_select_under_fields_for_with_auto_index
-      @firm = Firm.new("D")
-      def @firm.to_param; 305; end
+    assert_dom_equal(
+      "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
+      "<option value=\"A\">A</option>\n" +
+      "<option value=\"B\">B</option>\n" +
+      "<option value=\"C\">C</option>\n" +
+      "<option value=\"D\" selected=\"selected\">D</option>\n" +
+      "<option value=\"E\">E</option>" +
+      "</select>",
+      output_buffer
+    )
+  end
 
-      fields_for "firm[]", @firm do |f|
-        concat f.time_zone_select(:time_zone)
-      end
+  def test_time_zone_select_with_blank
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"\"></option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
 
-      assert_dom_equal(
-        "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
-        "<option value=\"A\">A</option>\n" +
-        "<option value=\"B\">B</option>\n" +
-        "<option value=\"C\">C</option>\n" +
-        "<option value=\"D\" selected=\"selected\">D</option>\n" +
-        "<option value=\"E\">E</option>" +
-        "</select>",
-        output_buffer
-      )
-    end
+  def test_time_zone_select_with_blank_as_string
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone')
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"\">No Zone</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
 
-    def test_time_zone_select_with_blank
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"\"></option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
+  def test_time_zone_select_with_style
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil, {},
+      "style" => "color: red")
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
+      :style => "color: red")
+  end
 
-    def test_time_zone_select_with_blank_as_string
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone')
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"\">No Zone</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
+  def test_time_zone_select_with_blank_and_style
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil,
+      { :include_blank => true }, "style" => "color: red")
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                 "<option value=\"\"></option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
+      { :include_blank => true }, :style => "color: red")
+  end
 
-    def test_time_zone_select_with_style
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil, {},
-        "style" => "color: red")
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-      assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
-        :style => "color: red")
-    end
+  def test_time_zone_select_with_blank_as_string_and_style
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil,
+      { :include_blank => 'No Zone' }, "style" => "color: red")
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                 "<option value=\"\">No Zone</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
+      { :include_blank => 'No Zone' }, :style => "color: red")
+  end
 
-    def test_time_zone_select_with_blank_and_style
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil,
-        { :include_blank => true }, "style" => "color: red")
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                   "<option value=\"\"></option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-      assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
-        { :include_blank => true }, :style => "color: red")
-    end
+  def test_time_zone_select_with_priority_zones
+    @firm = Firm.new("D")
+    zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
+    html = time_zone_select("firm", "time_zone", zones )
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
 
-    def test_time_zone_select_with_blank_as_string_and_style
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil,
-        { :include_blank => 'No Zone' }, "style" => "color: red")
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                   "<option value=\"\">No Zone</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-      assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
-        { :include_blank => 'No Zone' }, :style => "color: red")
-    end
+  def test_time_zone_select_with_priority_zones_as_regexp
+    @firm = Firm.new("D")
+    @fake_timezones.each_with_index do |tz, i|
+      tz.stubs(:=~).returns(i.zero? || i == 3)
+    end
+
+    html = time_zone_select("firm", "time_zone", /A|D/)
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
 
-    def test_time_zone_select_with_priority_zones
-      @firm = Firm.new("D")
-      zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
-      html = time_zone_select("firm", "time_zone", zones )
+  def test_time_zone_select_with_default_time_zone_and_nil_value
+     @firm = Firm.new()
+     @firm.time_zone = nil
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
       assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                    "<option value=\"A\">A</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
+                   "<option value=\"B\" selected=\"selected\">B</option>\n" +
                    "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\">D</option>\n" +
                    "<option value=\"E\">E</option>" +
                    "</select>",
                    html
-    end
-
-    def test_time_zone_select_with_priority_zones_as_regexp
-      @firm = Firm.new("D")
-      @fake_timezones.each_with_index do |tz, i|
-        tz.stubs(:=~).returns(i.zero? || i == 3)
-      end
+  end
 
-      html = time_zone_select("firm", "time_zone", /A|D/)
+  def test_time_zone_select_with_default_time_zone_and_value
+     @firm = Firm.new('D')
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
       assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                    "<option value=\"A\">A</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
                    "<option value=\"B\">B</option>\n" +
                    "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
                    "<option value=\"E\">E</option>" +
                    "</select>",
                    html
-    end
+  end
 
-    def test_time_zone_select_with_default_time_zone_and_nil_value
-       @firm = Firm.new()
-       @firm.time_zone = nil
-        html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
-        assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                     "<option value=\"A\">A</option>\n" +
-                     "<option value=\"B\" selected=\"selected\">B</option>\n" +
-                     "<option value=\"C\">C</option>\n" +
-                     "<option value=\"D\">D</option>\n" +
-                     "<option value=\"E\">E</option>" +
-                     "</select>",
-                     html
-    end
+  private
 
-    def test_time_zone_select_with_default_time_zone_and_value
-       @firm = Firm.new('D')
-        html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
-        assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                     "<option value=\"A\">A</option>\n" +
-                     "<option value=\"B\">B</option>\n" +
-                     "<option value=\"C\">C</option>\n" +
-                     "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                     "<option value=\"E\">E</option>" +
-                     "</select>",
-                     html
+    def dummy_posts
+      [ Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!") ]
     end
-
-  end
 end
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 9d4dac64f2..ea0be4a27a 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -267,11 +267,18 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_submit_tag_with_confirmation
     assert_dom_equal(
-      %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),
+      %(<input name='commit' type='submit' value='Save' onclick="if (!confirm('Are you sure?')) return false; return true;"/>),
       submit_tag("Save", :confirm => "Are you sure?")
     )
   end
-  
+
+  def test_submit_tag_with_confirmation_and_with_disable_with
+    assert_dom_equal(
+      %(<input name="commit" type="submit" value="Save" onclick="if (!confirm('Are you sure?')) return false; if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = this.cloneNode(false);hiddenCommit.setAttribute('type', 'hidden');this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Saving...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" />),
+      submit_tag("Save", :disable_with => "Saving...", :confirm => "Are you sure?")
+    )
+  end
+
   def test_image_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input type="image" src="/images/save.gif" onclick="return confirm('Are you sure?');"/>),
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index cf79480ab5..f9bc92c7c9 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -46,11 +46,6 @@ class JavaScriptHelperTest < ActionView::TestCase
       link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
   end
 
-  def test_link_to_function_with_href
-    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
-  end
-
   def test_button_to_function
     assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
       button_to_function("Greeting", "alert('Hello world!')")
diff --git a/actionpack/test/template/number_helper_i18n_test.rb b/actionpack/test/template/number_helper_i18n_test.rb
index 3fdf991a44..bf5b81292f 100644
--- a/actionpack/test/template/number_helper_i18n_test.rb
+++ b/actionpack/test/template/number_helper_i18n_test.rb
@@ -5,67 +5,65 @@ class NumberHelperI18nTests < Test::Unit::TestCase
 
   attr_reader :request
 
-  uses_mocha 'number_helper_i18n_tests' do
-    def setup
-      @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' }
-      @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 }
-      @human_defaults = { :precision => 1 }
-      @human_storage_units_format_default = "%n %u"
-      @human_storage_units_units_byte_other = "Bytes"
-      @human_storage_units_units_kb_other = "KB"
-      @percentage_defaults = { :delimiter => '' }
-      @precision_defaults = { :delimiter => '' }
+  def setup
+    @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' }
+    @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 }
+    @human_defaults = { :precision => 1 }
+    @human_storage_units_format_default = "%n %u"
+    @human_storage_units_units_byte_other = "Bytes"
+    @human_storage_units_units_kb_other = "KB"
+    @percentage_defaults = { :delimiter => '' }
+    @precision_defaults = { :delimiter => '' }
 
-      I18n.backend.store_translations 'en', :number => { :format => @number_defaults,
-        :currency => { :format => @currency_defaults }, :human => @human_defaults }
-    end
+    I18n.backend.store_translations 'en', :number => { :format => @number_defaults,
+      :currency => { :format => @currency_defaults }, :human => @human_defaults }
+  end
 
-    def test_number_to_currency_translates_currency_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.currency.format', :locale => 'en',
-                                    :raise => true).returns(@currency_defaults)
-      number_to_currency(1, :locale => 'en')
-    end
+  def test_number_to_currency_translates_currency_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.currency.format', :locale => 'en',
+                                  :raise => true).returns(@currency_defaults)
+    number_to_currency(1, :locale => 'en')
+  end
 
-    def test_number_with_precision_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.precision.format', :locale => 'en',
-                                    :raise => true).returns(@precision_defaults)
-      number_with_precision(1, :locale => 'en')
-    end
+  def test_number_with_precision_translates_number_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.precision.format', :locale => 'en',
+                                  :raise => true).returns(@precision_defaults)
+    number_with_precision(1, :locale => 'en')
+  end
 
-    def test_number_with_delimiter_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      number_with_delimiter(1, :locale => 'en')
-    end
+  def test_number_with_delimiter_translates_number_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    number_with_delimiter(1, :locale => 'en')
+  end
 
-    def test_number_to_percentage_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en',
-                                    :raise => true).returns(@percentage_defaults)
-      number_to_percentage(1, :locale => 'en')
-    end
+  def test_number_to_percentage_translates_number_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en',
+                                  :raise => true).returns(@percentage_defaults)
+    number_to_percentage(1, :locale => 'en')
+  end
 
-    def test_number_to_human_size_translates_human_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
-                                    :raise => true).returns(@human_defaults)
-      I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en',
-                                    :raise => true).returns(@human_storage_units_format_default)
-      I18n.expects(:translate).with(:'number.human.storage_units.units.kb', :locale => 'en', :count => 2,
-                                    :raise => true).returns(@human_storage_units_units_kb_other)
-      # 2KB
-      number_to_human_size(2048, :locale => 'en')
+  def test_number_to_human_size_translates_human_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
+                                  :raise => true).returns(@human_defaults)
+    I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en',
+                                  :raise => true).returns(@human_storage_units_format_default)
+    I18n.expects(:translate).with(:'number.human.storage_units.units.kb', :locale => 'en', :count => 2,
+                                  :raise => true).returns(@human_storage_units_units_kb_other)
+    # 2KB
+    number_to_human_size(2048, :locale => 'en')
 
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
-                                    :raise => true).returns(@human_defaults)
-      I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en',
-                                    :raise => true).returns(@human_storage_units_format_default)
-      I18n.expects(:translate).with(:'number.human.storage_units.units.byte', :locale => 'en', :count => 42,
-                                    :raise => true).returns(@human_storage_units_units_byte_other)
-      # 42 Bytes
-      number_to_human_size(42, :locale => 'en')
-    end
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
+                                  :raise => true).returns(@human_defaults)
+    I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en',
+                                  :raise => true).returns(@human_storage_units_format_default)
+    I18n.expects(:translate).with(:'number.human.storage_units.units.byte', :locale => 'en', :count => 42,
+                                  :raise => true).returns(@human_storage_units_units_byte_other)
+    # 42 Bytes
+    number_to_human_size(42, :locale => 'en')
   end
 end
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 9c9f54936c..29cb60fd73 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -4,6 +4,7 @@ class NumberHelperTest < ActionView::TestCase
   tests ActionView::Helpers::NumberHelper
 
   def test_number_to_phone
+    assert_equal("555-1234", number_to_phone(5551234))
     assert_equal("800-555-1212", number_to_phone(8005551212))
     assert_equal("(800) 555-1212", number_to_phone(8005551212, {:area_code => true}))
     assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "}))
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
new file mode 100644
index 0000000000..6d8eab63dc
--- /dev/null
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -0,0 +1,35 @@
+require 'abstract_unit'
+
+class OutputBufferTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      render :text => 'foo'
+    end
+  end
+
+  tests TestController
+
+  def test_flush_output_buffer
+    # Start with the default body parts
+    get :index
+    assert_equal ['foo'], @response.body_parts
+    assert_nil @response.template.output_buffer
+
+    # Nil output buffer is skipped
+    @response.template.flush_output_buffer
+    assert_nil @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Empty output buffer is skipped
+    @response.template.output_buffer = ''
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Flushing appends the output buffer to the body parts
+    @response.template.output_buffer = 'bar'
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo', 'bar'], @response.body_parts
+  end
+end
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index c61191d475..8bad866ce3 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'abstract_unit'
 require 'controller/fake_models'
 
@@ -9,9 +10,10 @@ module RenderTestCases
     # Reload and register danish language for testing
     I18n.reload!
     I18n.backend.store_translations 'da', {}
+    I18n.backend.store_translations 'pt-BR', {}
 
     # Ensure original are still the same since we are reindexing view paths
-    assert_equal ORIGINAL_LOCALES, I18n.available_locales
+    assert_equal ORIGINAL_LOCALES, I18n.available_locales.map(&:to_s).sort
   end
 
   def test_render_file
@@ -38,6 +40,39 @@ module RenderTestCases
     end
   end
 
+  def test_render_file_with_dashed_locale
+    old_locale = I18n.locale
+    pending do
+      I18n.locale = :"pt-BR"
+      assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
+    end
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_render_implicit_html_template_from_xhr_request
+    old_format = @view.formats
+    pending do
+      @view.formats = [:js]
+      assert_equal "Hello HTML!", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+    end
+  ensure
+    @view.formats = old_format
+  end
+
+  def test_render_implicit_html_template_from_xhr_request_with_localization
+    old_locale = I18n.locale
+    old_format = @view.formats
+    pending do
+      I18n.locale = :da
+      @view.formats = [:js]
+      assert_equal "Hey HTML!\n", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+    end
+  ensure
+    I18n.locale = old_locale
+    @view.formats = old_format
+  end
+
   def test_render_file_at_top_level
     assert_equal 'Elastica', @view.render(:file => '/shared')
   end
@@ -120,6 +155,10 @@ module RenderTestCases
     assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
   end
 
+  def test_render_object
+    assert_equal "Hello: david", @view.render(:partial => "test/customer", :object => Customer.new("david"))
+  end
+
   def test_render_partial_collection
     assert_equal "Hello: davidHello: mary", @view.render(:partial => "test/customer", :collection => [ Customer.new("david"), Customer.new("mary") ])
   end
@@ -199,6 +238,16 @@ module RenderTestCases
     assert_equal 'source: Hello, <%= name %>!; locals: {:name=>"Josh"}', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
   end
 
+  def test_render_ignores_templates_with_malformed_template_handlers
+    %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name|
+      assert_raise(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") }
+    end
+  end
+
+  def test_template_with_malformed_template_handler_is_reachable_through_its_exact_filename
+    assert_equal "Don't render me!", @view.render(:file => 'test/malformed/malformed.html.erb~')
+  end
+
   def test_render_with_layout
     assert_equal %(<title></title>\nHello world!\n),
       @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield")
@@ -208,6 +257,14 @@ module RenderTestCases
     assert_equal %(<title>title</title>\n<div id="column">column</div>\n<div id="content">content</div>\n),
       @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")
   end
+
+  if '1.9'.respond_to?(:force_encoding)
+    def test_render_utf8_template
+      result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield")
+      assert_equal "Русский текст\n日本語のテキスト", result
+      assert_equal Encoding::UTF_8, result.encoding
+    end
+  end
 end
 
 class CachedViewRenderTest < ActiveSupport::TestCase
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index c35a264abf..dd07a6d438 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -39,12 +39,10 @@ class PeopleHelperTest < ActionView::TestCase
     assert_equal "http://test.host/people", homepage_url
   end
 
-  uses_mocha "link_to_person" do
-    def test_link_to_person
-      person = mock(:name => "David")
-      expects(:mocha_mock_path).with(person).returns("/people/1")
-      assert_equal '<a href="/people/1">David</a>', link_to_person(person)
-    end
+  def test_link_to_person
+    person = mock(:name => "David")
+    expects(:mocha_mock_path).with(person).returns("/people/1")
+    assert_equal '<a href="/people/1">David</a>', link_to_person(person)
   end
 end
 
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index c420e1f13d..be7163888e 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -376,6 +376,12 @@ class TextHelperTest < ActionView::TestCase
     assert_equal "{link: #{link3_result}}", auto_link("{link: #{link3_raw}}")
   end
 
+  def test_auto_link_in_tags
+    link_raw    = 'http://www.rubyonrails.org/images/rails.png'
+    link_result = %Q(<img src="#{link_raw}" />)
+    assert_equal link_result, auto_link(link_result)
+  end
+
   def test_auto_link_at_eol
     url1 = "http://api.rubyonrails.com/Foo.html"
     url2 = "http://www.ruby-doc.org/core/Bar.html"
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index d0d65cb450..a20f3c394c 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -5,24 +5,28 @@ class TranslationHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TranslationHelper
   
   attr_reader :request
-  uses_mocha 'translation_helper_test' do
-    def setup
-    end
-    
-    def test_delegates_to_i18n_setting_the_raise_option
-      I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
-      translate :foo, :locale => 'en'
-    end
-    
-    def test_returns_missing_translation_message_wrapped_into_span
-      expected = '<span class="translation_missing">en, foo</span>'
-      assert_equal expected, translate(:foo)
-    end
+  def setup
+  end
+  
+  def test_delegates_to_i18n_setting_the_raise_option
+    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
+    translate :foo, :locale => 'en'
+  end
+  
+  def test_returns_missing_translation_message_wrapped_into_span
+    expected = '<span class="translation_missing">en, foo</span>'
+    assert_equal expected, translate(:foo)
+  end
+
+  def test_delegates_localize_to_i18n
+    @time = Time.utc(2008, 7, 8, 12, 18, 38)
+    I18n.expects(:localize).with(@time)
+    localize @time
+  end
   
-    def test_delegates_localize_to_i18n
-      @time = Time.utc(2008, 7, 8, 12, 18, 38)
-      I18n.expects(:localize).with(@time)
-      localize @time
-    end
+  def test_scoping_by_partial
+    expects(:template).returns(stub(:path_without_format_and_extension => "people/index"))
+    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true)
+    translate ".foo", :locale => 'en'
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index c5147c2417..f3d2f87b4a 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -221,7 +221,7 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_link_tag_using_post_javascript_and_popup
-    assert_raises(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :method => :post, :confirm => "Are you serious?") }
+    assert_raise(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :method => :post, :confirm => "Are you serious?") }
   end
 
   def test_link_tag_using_block_in_erb
@@ -253,6 +253,27 @@ class UrlHelperTest < ActionView::TestCase
     assert_equal "Showing", link_to_if(false, "Showing", :action => "show", :controller => "weblog", :id => 1)
   end
 
+  def test_current_page_with_simple_url
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @controller.url = "http://www.example.com/weblog/show"
+    assert current_page?({ :action => "show", :controller => "weblog" })
+    assert current_page?("http://www.example.com/weblog/show")
+  end
+  
+  def test_current_page_ignoring_params
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
+    assert current_page?({ :action => "show", :controller => "weblog" })
+    assert current_page?("http://www.example.com/weblog/show")
+  end
+  
+  def test_current_page_with_params_that_match
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
+    assert current_page?({ :action => "show", :controller => "weblog", :order => "desc", :page => "1" })
+    assert current_page?("http://www.example.com/weblog/show?order=desc&amp;page=1")
+  end
+  
   def test_link_unless_current
     @controller.request = RequestMock.new("http://www.example.com/weblog/show")
     @controller.url = "http://www.example.com/weblog/show"
@@ -264,11 +285,23 @@ class UrlHelperTest < ActionView::TestCase
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
 
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
+    assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog", :order=>'desc', :page=>'1' })
+    assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&amp;page=1")
+    assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1")
+
     @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc")
     @controller.url = "http://www.example.com/weblog/show?order=asc"
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=asc")
 
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=2"
+    assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&amp;page=2\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
+    assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&amp;page=2\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=2")
+
+
     @controller.request = RequestMock.new("http://www.example.com/weblog/show")
     @controller.url = "http://www.example.com/weblog/list"
     assert_equal "<a href=\"http://www.example.com/weblog/list\">Listing</a>",
@@ -320,7 +353,7 @@ class UrlHelperTest < ActionView::TestCase
     assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
     assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
   end
-
+  
   def protect_against_forgery?
     false
   end