Merge remote-tracking branch 'openstreetmap/pull/1154'

[rails.git] / test / helpers / note_helper_test.rb

diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index 8fb2bc07338d8e6a0e0682ecfb63f8a9d532e93f..8495e21a9998f1b2cb52a3b7dfc53f08101a94bd 100644 (file)
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"

 
 class NoteHelperTest < ActionView::TestCase
   include ERB::Util
 
 class NoteHelperTest < ActionView::TestCase
   include ERB::Util


@@ -7,14 +7,15 @@ class NoteHelperTest < ActionView::TestCase
   fixtures :users
 
   def test_note_event
   fixtures :users
 
   def test_note_event

-    date = Time.new(2014, 3, 5, 21, 37, 45)
+    date = Time.new(2014, 3, 5, 21, 37, 45, "+00:00")

 
 

-    assert_match /^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 /^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 <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))

   end
 
   def test_note_author
     assert_equal "", note_author(nil)
   end
 
   def test_note_author
     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)
   end
     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)
   end