Merge pull request #25469 from herminiotorres/update-datetime-to-datetime-local-by-html-specification

Change datetime to datetime-local helper tag

2 files changed, 20 insertions, 84 deletions

diff --git a/actionview/test/template/form_helper_test.rb b/actionview/test/template/form_helper_test.rb
index 931f5a3cf2..54da2b0c9c 100644
--- a/actionview/test/template/form_helper_test.rb
+++ b/actionview/test/template/form_helper_test.rb
@@ -1123,76 +1123,60 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_datetime_field
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T00:00:00.000+0000" />}
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on"))
-    end
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T00:00:00" />}
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
   end
 
   def test_datetime_field_with_datetime_value
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T01:02:03.000+0000" />}
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
     @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on"))
-    end
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
   end
 
   def test_datetime_field_with_extra_attrs
-    expected = %{<input id="post_written_on" step="60" max="2010-08-15T10:25:00.000+0000" min="2000-06-15T20:45:30.000+0000" name="post[written_on]" type="datetime" value="2004-06-15T01:02:03.000+0000" />}
+    expected = %{<input id="post_written_on" step="60" max="2010-08-15T10:25:00" min="2000-06-15T20:45:30" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
     @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
     min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
     max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
     step = 60
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value, step: step))
-    end
+    assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_datetime_field_with_value_attr
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2013-06-29T13:37:00+00:00" />}
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2013-06-29T13:37:00+00:00" />}
     value = DateTime.new(2013,6,29,13,37)
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on", value: value))
-    end
+    assert_dom_equal(expected, datetime_field("post", "written_on", value: value))
   end
 
   def test_datetime_field_with_timewithzone_value
     previous_time_zone, Time.zone = Time.zone, 'UTC'
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T15:30:45.000+0000" />}
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T15:30:45" />}
     @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on"))
-    end
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
   ensure
     Time.zone = previous_time_zone
   end
 
   def test_datetime_field_with_nil_value
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" />}
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" />}
     @post.written_on = nil
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on"))
-    end
+    assert_dom_equal(expected, datetime_field("post", "written_on"))
   end
 
   def test_datetime_field_with_string_values_for_min_and_max
-    expected = %{<input id="post_written_on" max="2010-08-15T10:25:00.000+0000" min="2000-06-15T20:45:30.000+0000" name="post[written_on]" type="datetime" value="2004-06-15T01:02:03.000+0000" />}
+    expected = %{<input id="post_written_on" max="2010-08-15T10:25:00" min="2000-06-15T20:45:30" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
     @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
-    min_value = "2000-06-15T20:45:30.000+0000"
-    max_value = "2010-08-15T10:25:00.000+0000"
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value))
-    end
+    min_value = "2000-06-15T20:45:30"
+    max_value = "2010-08-15T10:25:00"
+    assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value))
   end
 
   def test_datetime_field_with_invalid_string_values_for_min_and_max
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime" value="2004-06-15T01:02:03.000+0000" />}
+    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
     @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
     min_value = "foo"
     max_value = "bar"
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value))
-    end
+    assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value))
   end
 
   def test_datetime_local_field
@@ -1200,52 +1184,6 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal(expected, datetime_local_field("post", "written_on"))
   end
 
-  def test_datetime_local_field_with_datetime_value
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
-    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
-    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
-  end
-
-  def test_datetime_local_field_with_extra_attrs
-    expected = %{<input id="post_written_on" step="60" max="2010-08-15T10:25:00" min="2000-06-15T20:45:30" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
-    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
-    min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
-    max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
-    step = 60
-    assert_dom_equal(expected, datetime_local_field("post", "written_on", min: min_value, max: max_value, step: step))
-  end
-
-  def test_datetime_local_field_with_timewithzone_value
-    previous_time_zone, Time.zone = Time.zone, 'UTC'
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T15:30:45" />}
-    @post.written_on = Time.zone.parse('2004-06-15 15:30:45')
-    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
-  ensure
-    Time.zone = previous_time_zone
-  end
-
-  def test_datetime_local_field_with_nil_value
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" />}
-    @post.written_on = nil
-    assert_dom_equal(expected, datetime_local_field("post", "written_on"))
-  end
-
-  def test_datetime_local_field_with_string_values_for_min_and_max
-    expected = %{<input id="post_written_on" max="2010-08-15T10:25:00" min="2000-06-15T20:45:30" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
-    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
-    min_value = "2000-06-15T20:45:30"
-    max_value = "2010-08-15T10:25:00"
-    assert_dom_equal(expected, datetime_local_field("post", "written_on", min: min_value, max: max_value))
-  end
-
-  def test_datetime_local_field_with_invalid_string_values_for_min_and_max
-    expected = %{<input id="post_written_on" name="post[written_on]" type="datetime-local" value="2004-06-15T01:02:03" />}
-    @post.written_on = DateTime.new(2004, 6, 15, 1, 2, 3)
-    min_value = "foo"
-    max_value = "bar"
-    assert_dom_equal(expected, datetime_local_field("post", "written_on", min: min_value, max: max_value))
-  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"))
diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb
index 5b0b708618..4fdca4976f 100644
--- a/actionview/test/template/form_tag_helper_test.rb
+++ b/actionview/test/template/form_tag_helper_test.rb
@@ -621,10 +621,8 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_datetime_field_tag
-    expected = %{<input id="appointment" name="appointment" type="datetime" />}
-    assert_deprecated do
-      assert_dom_equal(expected, datetime_field_tag("appointment"))
-    end
+    expected = %{<input id="appointment" name="appointment" type="datetime-local" />}
+    assert_dom_equal(expected, datetime_field_tag("appointment"))
   end
 
   def test_datetime_local_field_tag