Merge remote-tracking branch 'upstream/master' into routing

[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..3c87c4f6b1671807b8f3a0a81c08d4d029e0c902 100644 (file)
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -7,7 +7,7 @@ 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 /^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))