Merge pull request rails#47866 from ghiculescu/input-time-hh-mm

Allow a `value` formatted as `HH:MM` for `time_field`

Author: jonathanhefner

actionview/lib/action_view/helpers/tags/datetime_field.rb

@@ -6,24 +6,28 @@ module Tags # :nodoc:
       class DatetimeField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
-          options["value"] = normalize_datetime(options["value"] || value)
-          options["min"] = normalize_datetime(options["min"])
-          options["max"] = normalize_datetime(options["max"])
+          options["value"] = datetime_value(options["value"] || value)
+          options["min"] = format_datetime(parse_datetime(options["min"]))
+          options["max"] = format_datetime(parse_datetime(options["max"]))
           @options = options
           super
         end
 
         private
-          def format_datetime(value)
-            raise NotImplementedError
+          def datetime_value(value)
+            if value.is_a?(String)
+              value
+            else
+              format_datetime(value)
+            end
           end
 
-          def normalize_datetime(value)
-            format_datetime(parse_datetime(value))
+          def format_datetime(value)
+            raise NotImplementedError
           end
 
           def parse_datetime(value)
-            if value.is_a? String
+            if value.is_a?(String)
               DateTime.parse(value) rescue nil
             else
               value

actionview/test/template/form_helper_test.rb

@@ -1165,6 +1165,11 @@ def test_time_field_with_value_attr
     assert_dom_equal(expected, time_field("post", "written_on", value: value))
   end
 
+  def test_time_field_with_value_attr_that_excludes_seconds
+    expected = %{<input id="post_written_on" name="post[written_on]" type="time" value="01:45" />}
+    assert_dom_equal(expected, time_field("post", "written_on", value: "01:45"))
+  end
+
   def test_time_field_with_timewithzone_value
     previous_time_zone, Time.zone = Time.zone, "UTC"
     expected = %{<input id="post_written_on" name="post[written_on]" type="time" value="01:02:03.000" />}
@@ -1271,6 +1276,11 @@ def test_datetime_local_field_without_seconds
     assert_dom_equal(expected, datetime_local_field("post", "written_on", include_seconds: false))
   end
 
+  def test_datetime_local_field_with_value_attr_that_excludes_seconds
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T00:00" />}
+    assert_dom_equal(expected, datetime_local_field("post", "written_on", value: "2004-06-15T00:00"))
+  end
+
   def test_month_field
     expected = %{<input id="post_written_on" name="post[written_on]" type="month" value="2004-06" />}
     assert_dom_equal(expected, month_field("post", "written_on"))