X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47a5d2f37d6c66600a31ca111b295d4bdea2fa0a..9c9edb60540d66c5ddd01581f0a90fc228d81af8:/test/helpers/note_helper_test.rb diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index 5857af6bc..37518fb3d 100644 --- a/test/helpers/note_helper_test.rb +++ b/test/helpers/note_helper_test.rb @@ -5,11 +5,11 @@ 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 .* ago$}, note_event("open", date, nil) - assert_match %r{^Resolved by #{user.display_name} .* ago$}, note_event("closed", date, user) + assert_match %r{^Created by anonymous .* ago$}, note_event("opened", date, nil) + assert_match %r{^Resolved by #{user.display_name} .* ago$}, note_event("closed", date, user) end def test_note_author @@ -18,7 +18,16 @@ class NoteHelperTest < ActionView::TestCase assert_equal "", note_author(nil) assert_equal "deleted", note_author(deleted_user) - assert_equal "#{user.display_name}", note_author(user) - assert_equal "#{user.display_name}", note_author(user, :only_path => false) + assert_equal "#{user.display_name}", note_author(user) + assert_equal "#{user.display_name}", note_author(user, :only_path => false) + end + + def test_disappear_in + 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 + assert_match %r{^6 days$}, disappear_in(note) + end end end