Avoid wrapping time tags in abbr for note_helper

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 42fd089e47ef1105b09a4e1a0c5e024044bd4ab4..4e7e37bfb931063d0920b1975f6eb979cf36ad2d 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -4,12 +4,10 @@ module NoteHelper
   def note_event(event, at, by)
     if by.nil?
       t("notes.show.event_#{event}_by_anonymous_html",
   def note_event(event, at, by)
     if by.nil?
       t("notes.show.event_#{event}_by_anonymous_html",

-        :time_ago => tag.abbr(friendly_date_ago(at),
-                              :title => l(at)))
+        :time_ago => friendly_date_ago(at))

     else
       t("notes.show.event_#{event}_by_html",
     else
       t("notes.show.event_#{event}_by_html",

-        :time_ago => tag.abbr(friendly_date_ago(at),
-                              :title => l(at)),
+        :time_ago => friendly_date_ago(at),

         :user => note_author(by))
     end
   end
         :user => note_author(by))
     end
   end

diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index 805906d552951a9cc575bb39b81c49115e24bc22..4f36f91759cb9a39dfca78b8347637f1257ac11f 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