0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* select_datetime and select_time default to Time.zone.now when config.time_zone is set [Geoff Buesing]
0
+
0
 * datetime_select defaults to Time.zone.now when config.time_zone is set [Geoff Buesing]
0
 
0
 * Remove ActionController::Base#view_controller_internals flag. [Pratik]

0
@@ -250,7 +250,7 @@
0
       #   # prefixed with 'payday' rather than 'date'
0
       #   select_datetime(my_date_time, :prefix => 'payday')
0
       #
0
-      def select_datetime(datetime = Time.now, options = {}, html_options = {})
0
+      def select_datetime(datetime = Time.current, options = {}, html_options = {})
0
         separator = options[:datetime_separator] || ''
0
         select_date(datetime, options, html_options) + separator + select_time(datetime, options, html_options)
0
        end
0
@@ -321,7 +321,7 @@
0
       #   # separated by ':' and includes an input for seconds
0
       #   select_time(my_time, :time_separator => ':', :include_seconds => true)
0
       #
0
-      def select_time(datetime = Time.now, options = {}, html_options = {})
0
+      def select_time(datetime = Time.current, options = {}, html_options = {})
0
         separator = options[:time_separator] || ''
0
         select_hour(datetime, options, html_options) + separator + select_minute(datetime, options, html_options) + (options[:include_seconds] ? separator + select_second(datetime, options, html_options) : '')
0
       end

0
@@ -933,6 +933,24 @@
0
     assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), {}, :class => 'selector')
0
     assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), {:include_seconds => false}, :class => 'selector')
0
   end
0
+  
0
+  uses_mocha 'TestDatetimeAndTimeSelectUseTimeCurrentAsDefault' do
0
+    def test_select_datetime_uses_time_current_as_default
0
+      time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
0
+      Time.expects(:current).returns time
0
+      expects(:select_date).with(time, anything, anything).returns('')
0
+      expects(:select_time).with(time, anything, anything).returns('')
0
+      select_datetime
0
+    end
0
+    
0
+    def test_select_time_uses_time_current_as_default
0
+      time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
0
+      Time.expects(:current).returns time
0
+      expects(:select_hour).with(time, anything, anything).returns('')
0
+      expects(:select_minute).with(time, anything, anything).returns('')
0
+      select_time
0
+    end
0
+  end
0
 
0
   def test_date_select
0
     @post = Post.new