Merge remote-tracking branch 'upstream/pull/4654'

[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 805906d552951a9cc575bb39b81c49115e24bc22..bee1cdc2c5485291cf52cdfb5d09e3b0520ee6cd 100644 (file)
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -8,8 +8,8 @@ class NoteHelperTest < ActionView::TestCase
     date = Time.utc(2014, 3, 5, 21, 37, 45)
     user = create(:user)
 
     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"><time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time></abbr>$}, note_event("opened", date, nil)
-    assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <abbr title="Wed, 05 Mar 2014 21:37:45 \+0000"><time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time></abbr>$}, note_event("closed", date, 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
   end
 
   def test_note_author


@@ -21,13 +21,4 @@ class NoteHelperTest < ActionView::TestCase
     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
     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

-
-  def test_disappear_in
-    note_closed_date = Time.utc(2022, 1, 1, 12, 0, 0)
-    note = create(:note, :closed_at => note_closed_date)
-
-    travel_to note_closed_date + 1.day do
-      assert_match %r{^<span title=" 8 January 2022 at 12:00">6 days</span>$}, disappear_in(note)
-    end
-  end

 end
 end