X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbd88d893f3c3fce9cafd666b94396988646d81f..3a5f0c4845ea7712e26f625c58424c309cf06881:/test/helpers/note_helper_test.rb diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index 5857af6bc..bee1cdc2c 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 $}, note_event("opened", date, nil) + assert_match %r{^Resolved by #{user.display_name} $}, note_event("closed", date, user) end def test_note_author @@ -18,7 +18,7 @@ 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 end