X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/16f5a5ac0c674b258996fcbde1c3fda2e651906a..1e62ae4b18c3cea2c0153709a5968f1df3a3fe8c:/test/helpers/note_helper_test.rb?ds=sidebyside
diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index 8495e21a9..bee1cdc2c 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")
+ 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 test2 .* ago$}, note_event("closed", date, users(:public_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
+ 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