X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..332fad14bb66da4b858034e6c544b6f4361ffde5:/test/helpers/note_helper_test.rb?ds=inline

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 <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.*</span> ago</abbr>$}, note_event("open", date, nil)
-    assert_match %r{^Resolved by <a href="/user/test2">test2</a> <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.*</span> ago</abbr>$}, note_event("closed", date, users(:public_user))
+    assert_match %r{^Created by anonymous <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("opened", date, nil)
+    assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, 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 "<a href=\"/user/test2\">test2</a>", note_author(users(:public_user))
-    assert_equal "<a href=\"http://test.host/user/test2\">test2</a>", note_author(users(:public_user), :only_path => false)
+    assert_equal "deleted", note_author(deleted_user)
+    assert_equal "<a href=\"/user/#{ERB::Util.u(user.display_name)}\">#{user.display_name}</a>", note_author(user)
+    assert_equal "<a href=\"http://test.host/user/#{ERB::Util.u(user.display_name)}\">#{user.display_name}</a>", note_author(user, :only_path => false)
   end
 end