X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3238bf567c5c8a0e807343588b8f38f86d65c1cd..7377cb63939f8743ca31e67ea3965c2b15d20057:/test/helpers/note_helper_test.rb diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index 8495e21a9..408236879 100644 --- a/test/helpers/note_helper_test.rb +++ b/test/helpers/note_helper_test.rb @@ -4,19 +4,21 @@ class NoteHelperTest < ActionView::TestCase include ERB::Util include ApplicationHelper - fixtures :users - def test_note_event date = Time.new(2014, 3, 5, 21, 37, 45, "+00:00") + user = create(:user) assert_match %r{^Created by anonymous .* ago$}, note_event("open", date, nil) - assert_match %r{^Resolved by test2 .* ago$}, note_event("closed", date, users(:public_user)) + assert_match %r{^Resolved by #{user.display_name} .* ago$}, note_event("closed", date, user) end def test_note_author + deleted_user = create(:user, :deleted) + user = create(:user) + assert_equal "", note_author(nil) - assert_equal "deleted", note_author(users(:deleted_user)) - assert_equal "test2", note_author(users(:public_user)) - assert_equal "test2", note_author(users(:public_user), :only_path => false) + 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) end end