From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Jun 2023 16:08:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4063'
X-Git-Tag: live~765
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/772e4807664a0ccaaea68018dea1cb985510d9f2?hp=e9e4b10473fa536cdb840303ee4afccf71c69329

Merge remote-tracking branch 'upstream/pull/4063'
---

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 06c1c09f8..7cd6bce89 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -56,7 +56,7 @@ class ApplicationHelperTest < ActionView::TestCase
   end
 
   def test_friendly_date
-    date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23).utc)
+    date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23))
     assert_match %r{^<span title=" *5 March 2014 at 18:58">.*</span>$}, date
 
     date = friendly_date(Time.now.utc - 1.hour)
diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index 75a0e521e..37518fb3d 100644
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -5,7 +5,7 @@ class NoteHelperTest < ActionView::TestCase
   include ApplicationHelper
 
   def test_note_event
-    date = Time.new(2014, 3, 5, 21, 37, 45, "+00:00")
+    date = Time.utc(2014, 3, 5, 21, 37, 45)
     user = create(:user)
 
     assert_match %r{^Created by anonymous <abbr title="Wed, 05 Mar 2014 21:37:45 \+0000"><span title=" 5 March 2014 at 21:37">.* ago</span></abbr>$}, note_event("opened", date, nil)
@@ -23,7 +23,7 @@ class NoteHelperTest < ActionView::TestCase
   end
 
   def test_disappear_in
-    note_closed_date = Time.new(2022, 1, 1, 12, 0, 0, "+00:00")
+    note_closed_date = Time.utc(2022, 1, 1, 12, 0, 0)
     note = create(:note, :closed_at => note_closed_date)
 
     travel_to note_closed_date + 1.day do