radiant 0.6.4 → 0.6.5

data/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb

@@ -0,0 +1,101 @@
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+
+Scroll = Struct.new(:id, :to_param, :title, :body, :updated_at, :created_at)
+
+class ScrollsController < ActionController::Base
+  FEEDS = {}
+  FEEDS["defaults"] = <<-EOT
+        atom_feed do |feed|
+          feed.title("My great blog!")
+          feed.updated((@scrolls.first.created_at))
+
+          for scroll in @scrolls
+            feed.entry(scroll) do |entry|
+              entry.title(scroll.title)
+              entry.content(scroll.body, :type => 'html')
+
+              entry.author do |author|
+                author.name("DHH")
+              end
+            end
+          end
+        end
+    EOT
+    FEEDS["entry_options"] = <<-EOT
+        atom_feed do |feed|
+          feed.title("My great blog!")
+          feed.updated((@scrolls.first.created_at))
+
+          for scroll in @scrolls
+            feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param, :updated => Time.utc(2007, 1, scroll.id)) do |entry|
+              entry.title(scroll.title)
+              entry.content(scroll.body, :type => 'html')
+
+              entry.author do |author|
+                author.name("DHH")
+              end
+            end
+          end
+        end
+    EOT
+
+  def index
+    @scrolls = [
+      Scroll.new(1, "1", "Hello One", "Something <i>COOL!</i>", Time.utc(2007, 12, 12, 15), Time.utc(2007, 12, 12, 15)),
+      Scroll.new(2, "2", "Hello Two", "Something Boring", Time.utc(2007, 12, 12, 15)),
+    ]
+    
+    render :inline => FEEDS[params[:id]], :type => :builder
+  end
+end
+
+class AtomFeedTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller = ScrollsController.new
+
+    @request.host = "www.nextangle.com"
+  end
+  
+  def test_feed_should_use_default_language_if_none_is_given
+    with_restful_routing(:scrolls) do
+      get :index, :id => "defaults"
+      assert_match %r{xml:lang="en-US"}, @response.body
+    end
+  end
+  
+  def test_feed_should_include_two_entries
+    with_restful_routing(:scrolls) do
+      get :index, :id => "defaults"
+      assert_select "entry", 2
+    end
+  end
+  
+  def test_entry_should_only_use_published_if_created_at_is_present
+    with_restful_routing(:scrolls) do
+      get :index, :id => "defaults"
+      assert_select "published", 1
+    end
+  end
+
+  def test_entry_with_prefilled_options_should_use_those_instead_of_querying_the_record
+    with_restful_routing(:scrolls) do
+      get :index, :id => "entry_options"
+
+      assert_select "updated", Time.utc(2007, 1, 1).xmlschema
+      assert_select "updated", Time.utc(2007, 1, 2).xmlschema
+    end
+  end
+
+
+  private
+    def with_restful_routing(resources)
+      with_routing do |set|
+        set.draw do |map|
+          map.resources(resources)
+        end
+        yield
+      end
+    end
+end

data/vendor/rails/actionpack/test/template/benchmark_helper_test.rb

@@ -1,5 +1,5 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/benchmark_helper'
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'action_view/helpers/benchmark_helper'
 
 class BenchmarkHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::BenchmarkHelper

data/vendor/rails/actionpack/test/template/compiled_templates_test.rb

@@ -1,10 +1,8 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
-require File.dirname(__FILE__) + '/../../lib/action_view/compiled_templates'
-require File.dirname(__FILE__) + "/../abstract_unit"
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'action_view/helpers/date_helper'
+require 'action_view/compiled_templates'
 
 class CompiledTemplateTests < Test::Unit::TestCase
-
   def setup
     @ct = ActionView::CompiledTemplates.new
     @v = Class.new
@@ -15,7 +13,7 @@ class CompiledTemplateTests < Test::Unit::TestCase
   end
   def teardown
     [@a, @b, @s].each do |f|
-      `rm #{f}` if File.exist?(f) || File.symlink?(f)
+      FileUtils.rm(f) if File.exist?(f) || File.symlink?(f)
     end
   end
   attr_reader :ct, :v
@@ -24,7 +22,7 @@ class CompiledTemplateTests < Test::Unit::TestCase
     hi_world = ct.method_names['hi world']
     hi_sexy = ct.method_names['hi sexy']
     wish_upon_a_star = ct.method_names['I love seeing decent error messages']
-    
+
     assert_equal hi_world, ct.method_names['hi world']
     assert_equal hi_sexy, ct.method_names['hi sexy']
     assert_equal wish_upon_a_star, ct.method_names['I love seeing decent error messages']
@@ -70,68 +68,116 @@ class CompiledTemplateTests < Test::Unit::TestCase
     assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
   end
 
+  uses_mocha 'test_compile_time' do
   def test_compile_time
+    t = Time.now
+
     File.open(@a, "w"){|f| f.puts @a}
     File.open(@b, "w"){|f| f.puts @b}
-
     # windows doesn't support symlinks (even under cygwin)
     windows = (RUBY_PLATFORM =~ /win32/)
     `ln -s #{@a} #{@s}` unless windows
 
     v = ActionView::Base.new
     v.base_path = '.'
-    v.cache_template_loading = false;
+    v.cache_template_loading = false
 
-    sleep 1
-    t = Time.now
-    sleep 1
+    # All templates were created at t+1
+    File::Stat.any_instance.expects(:mtime).times(windows ? 2 : 3).returns(t + 1.second)
+
+    # private methods template_changed_since? and compile_template?
+    # should report true for all since they have not been compiled
+    assert v.send(:template_changed_since?, @a, t)
+    assert v.send(:template_changed_since?, @b, t)
+    assert v.send(:template_changed_since?, @s, t) unless windows
 
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    assert v.send(:compile_template?, nil, @a, {})
+    assert v.send(:compile_template?, nil, @b, {})
+    assert v.send(:compile_template?, nil, @s, {}) unless windows
 
+    @handler = ActionView::Base.handler_for_extension(:rhtml)
+
+    # All templates are rendered at t+2
+    Time.expects(:now).times(windows ? 2 : 3).returns(t + 2.seconds)
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s) unless windows
     a_n = v.method_names[@a]
     b_n = v.method_names[@b]
-    s_n = v.method_names[@s]  unless windows
-    ct_a = v.compile_time[a_n]
-    ct_b = v.compile_time[b_n]
-    ct_s = v.compile_time[s_n] unless windows
+    s_n = v.method_names[@s] unless windows
     # all of the files have changed since last compile
     assert v.compile_time[a_n] > t
     assert v.compile_time[b_n] > t
     assert v.compile_time[s_n] > t unless windows
 
-    sleep 1
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    # private methods template_changed_since? and compile_template?
+    # should report false for all since none have changed since compile
+    File::Stat.any_instance.expects(:mtime).times(windows ? 6 : 12).returns(t + 1.second)
+    assert !v.send(:template_changed_since?, @a, v.compile_time[a_n])
+    assert !v.send(:template_changed_since?, @b, v.compile_time[b_n])
+    assert !v.send(:template_changed_since?, @s, v.compile_time[s_n]) unless windows
+    assert !v.send(:compile_template?, nil, @a, {})
+    assert !v.send(:compile_template?, nil, @b, {})
+    assert !v.send(:compile_template?, nil, @s, {}) unless windows
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s)  unless windows
     # none of the files have changed since last compile
-    # so they should not have been recmpiled
-    assert_equal ct_a, v.compile_time[a_n]
-    assert_equal ct_b, v.compile_time[b_n]
-    assert_equal ct_s, v.compile_time[s_n] unless windows
+    assert v.compile_time[a_n] < t + 3.seconds
+    assert v.compile_time[b_n] < t + 3.seconds
+    assert v.compile_time[s_n] < t + 3.seconds  unless windows
 
     `rm #{@s}; ln -s #{@b} #{@s}` unless windows
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    # private methods template_changed_since? and compile_template?
+    # should report true for symlink since it has changed since compile
+    
+    # t + 3.seconds is for the symlink
+    File::Stat.any_instance.expects(:mtime).times(windows ? 6 : 9).returns(
+      *(windows ? [ t + 1.second, t + 1.second ] :
+        [ t + 1.second, t + 1.second, t + 3.second ]) * 3)
+    assert !v.send(:template_changed_since?, @a, v.compile_time[a_n])
+    assert !v.send(:template_changed_since?, @b, v.compile_time[b_n])
+    assert v.send(:template_changed_since?, @s, v.compile_time[s_n]) unless windows
+    assert !v.send(:compile_template?, nil, @a, {})
+    assert !v.send(:compile_template?, nil, @b, {})
+    assert v.send(:compile_template?, nil, @s, {}) unless windows
+
+    # Only the symlink template gets rendered at t+3
+    Time.stubs(:now).returns(t + 3.seconds) unless windows
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s) unless windows
     # the symlink has changed since last compile
-    assert_equal ct_a, v.compile_time[a_n]
-    assert_equal ct_b, v.compile_time[b_n]
-    assert v.compile_time[s_n] > t unless windows
+    assert v.compile_time[a_n] < t + 3.seconds
+    assert v.compile_time[b_n] < t + 3.seconds
+    assert_equal v.compile_time[s_n], t + 3.seconds unless windows
 
-    sleep 1
     FileUtils.touch @b
-    t = Time.now
-    sleep 1
-    v.compile_and_render_template(:rhtml, '', @a)
-    v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s) unless windows
+    # private methods template_changed_since? and compile_template?
+    # should report true for symlink and file at end of symlink
+    # since it has changed since last compile
+    #
+    # t+4 is for @b and also for the file that @s points to, which is @b
+    File::Stat.any_instance.expects(:mtime).times(windows ? 6 : 12).returns(
+      *(windows ? [ t + 1.second, t + 4.seconds ] :
+        [ t + 1.second, t + 4.seconds, t + 3.second, t + 4.seconds ]) * 3)
+    assert !v.send(:template_changed_since?, @a, v.compile_time[a_n])
+    assert v.send(:template_changed_since?, @b, v.compile_time[b_n])
+    assert v.send(:template_changed_since?, @s, v.compile_time[s_n]) unless windows
+    assert !v.send(:compile_template?, nil, @a, {})
+    assert v.send(:compile_template?, nil, @b, {})
+    assert v.send(:compile_template?, nil, @s, {}) unless windows
+
+    Time.expects(:now).times(windows ? 1 : 2).returns(t + 5.seconds)
+    v.send(:compile_and_render_template, @handler, '', @a)
+    v.send(:compile_and_render_template, @handler, '', @b)
+    v.send(:compile_and_render_template, @handler, '', @s) unless windows
     # the file at the end of the symlink has changed since last compile
     # both the symlink and the file at the end of it should be recompiled
-    assert v.compile_time[a_n] < t
-    assert v.compile_time[b_n] > t
-    assert v.compile_time[s_n] > t unless windows
+    assert v.compile_time[a_n] < t + 5.seconds
+    assert_equal v.compile_time[b_n], t + 5.seconds
+    assert_equal v.compile_time[s_n], t + 5.seconds unless windows
+  end
   end
 end
 

data/vendor/rails/actionpack/test/template/date_helper_test.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require File.dirname(__FILE__) + "/../abstract_unit"
+require "#{File.dirname(__FILE__)}/../abstract_unit"
 
 class DateHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::DateHelper
@@ -14,11 +13,14 @@ class DateHelperTest < Test::Unit::TestCase
       def id_before_type_cast
         123
       end
+      def to_param
+        '123'
+      end
     end
   end
 
   def test_distance_in_words
-    from = Time.mktime(2004, 3, 6, 21, 45, 0)
+    from = Time.mktime(2004, 6, 6, 21, 45, 0)
 
     # 0..1 with include_seconds
     assert_equal "less than 5 seconds", distance_of_time_in_words(from, from + 0.seconds, true)
@@ -64,16 +66,16 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal "about 1 month", distance_of_time_in_words(from, from + 29.days + 23.hours + 59.minutes + 30.seconds)
     assert_equal "about 1 month", distance_of_time_in_words(from, from + 59.days + 23.hours + 59.minutes + 29.seconds)
 
-    # 86400..525959
+    # 86400..525599
     assert_equal "2 months", distance_of_time_in_words(from, from + 59.days + 23.hours + 59.minutes + 30.seconds)
     assert_equal "12 months", distance_of_time_in_words(from, from + 1.years - 31.seconds)
 
-    # 525960..1051919
+    # 525600..1051199
     assert_equal "about 1 year", distance_of_time_in_words(from, from + 1.years - 30.seconds)
     assert_equal "about 1 year", distance_of_time_in_words(from, from + 2.years - 31.seconds)
 
-    # > 1051920
-    assert_equal "over 2 years", distance_of_time_in_words(from, from + 2.years - 30.seconds)
+    # > 1051199
+    assert_equal "over 2 years", distance_of_time_in_words(from, from + 2.years + 30.seconds)
     assert_equal "over 10 years", distance_of_time_in_words(from, from + 10.years)
 
     # test to < from
@@ -94,8 +96,7 @@ class DateHelperTest < Test::Unit::TestCase
   end
 
   def test_time_ago_in_words
-    t = Time.now - 1.years
-    assert_equal "about 1 year", time_ago_in_words(t)
+    assert_equal "about 1 year", time_ago_in_words(1.year.ago - 1.day)
   end
 
   def test_select_day
@@ -226,6 +227,14 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal expected, select_month(8, :use_month_names => month_names)
   end
 
+  def test_select_month_with_hidden
+    assert_dom_equal "<input type=\"hidden\" id=\"date_month\" name=\"date[month]\" value=\"8\" />\n", select_month(8, :use_hidden => true)
+  end
+
+  def test_select_month_with_hidden_and_field_name
+    assert_dom_equal "<input type=\"hidden\" id=\"date_mois\" name=\"date[mois]\" value=\"8\" />\n", select_month(8, :use_hidden => true, :field_name => 'mois')
+  end
+
   def test_select_year
     expected = %(<select id="date_year" name="date[year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
@@ -273,6 +282,14 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal expected, select_year(2005, :start_year => 2005, :end_year => 2003)
   end
 
+  def test_select_year_with_hidden
+    assert_dom_equal "<input type=\"hidden\" id=\"date_year\" name=\"date[year]\" value=\"2007\" />\n", select_year(2007, :use_hidden => true)
+  end
+
+  def test_select_year_with_hidden_and_field_name
+    assert_dom_equal "<input type=\"hidden\" id=\"date_anno\" name=\"date[anno]\" value=\"2007\" />\n", select_year(2007, :use_hidden => true, :field_name => 'anno')
+  end
+
   def test_select_hour
     expected = %(<select id="date_hour" name="date[hour]">\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" selected="selected">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)
@@ -369,6 +386,14 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal expected, select_minute(nil, { :include_blank => true , :minute_step => 15 })
   end
 
+  def test_select_minute_with_hidden
+    assert_dom_equal "<input type=\"hidden\" id=\"date_minute\" name=\"date[minute]\" value=\"8\" />\n", select_minute(8, :use_hidden => true)
+  end
+
+  def test_select_minute_with_hidden_and_field_name
+    assert_dom_equal "<input type=\"hidden\" id=\"date_minuto\" name=\"date[minuto]\" value=\"8\" />\n", select_minute(8, :use_hidden => true, :field_name => 'minuto')
+  end
+
   def test_select_second
     expected = %(<select id="date_second" name="date[second]">\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" selected="selected">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)
@@ -786,6 +811,23 @@ class DateHelperTest < Test::Unit::TestCase
     assert_equal expected, date_select("post", "written_on")
   end
 
+  def test_date_select_without_day
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = "<input type=\"hidden\" id=\"post_written_on_3i\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
+
+    expected <<  %{<select id="post_written_on_2i" name="post[written_on(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_written_on_1i" name="post[written_on(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"
+
+    assert_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
+  end
+
   def test_date_select_within_fields_for
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -1319,4 +1361,78 @@ class DateHelperTest < Test::Unit::TestCase
 
     assert_equal expected, datetime_select("post", "updated_at", :order => [:day, :month])
   end
+
+  def test_datetime_select_with_default_value_as_time
+    @post = Post.new
+    @post.updated_at = nil
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    2001.upto(2011) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2006}>#{i}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 9}>#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 19}>#{i}</option>\n) }
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    0.upto(23) { |i| expected << %(<option value="#{leading_zero_on_single_digits(i)}"#{' selected="selected"' if i == 15}>#{leading_zero_on_single_digits(i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
+    0.upto(59) { |i| expected << %(<option value="#{leading_zero_on_single_digits(i)}"#{' selected="selected"' if i == 16}>#{leading_zero_on_single_digits(i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_equal expected, datetime_select("post", "updated_at", :default => Time.local(2006, 9, 19, 15, 16, 35))
+  end
+
+  def test_include_blank_overrides_default_option
+    @post = Post.new
+    @post.updated_at = nil
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    expected << %(<option value=""></option>\n)
+    2002.upto(2012) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    expected << %(<option value=""></option>\n)
+    1.upto(12) { |i| expected << %(<option value="#{i}">#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    expected << %(<option value=""></option>\n)
+    1.upto(31) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
+    expected << "</select>\n"
+
+    assert_equal expected, date_select("post", "updated_at", :default => Time.local(2006, 9, 19, 15, 16, 35), :include_blank => true)
+  end
+
+  def test_datetime_select_with_default_value_as_hash
+    @post = Post.new
+    @post.updated_at = nil
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    (Time.now.year - 5).upto(Time.now.year + 5) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == Time.now.year}>#{i}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 10}>#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == Time.now.day}>#{i}</option>\n) }
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    0.upto(23) { |i| expected << %(<option value="#{leading_zero_on_single_digits(i)}"#{' selected="selected"' if i == 9}>#{leading_zero_on_single_digits(i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
+    0.upto(59) { |i| expected << %(<option value="#{leading_zero_on_single_digits(i)}"#{' selected="selected"' if i == 42}>#{leading_zero_on_single_digits(i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_equal expected, datetime_select("post", "updated_at", :default => { :month => 10, :minute => 42, :hour => 9 })
+  end
 end