Fixed ruby issues from feedback

Fixed failing tests

5 files changed, 12 insertions, 28 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cc4d2a8877d..f99a14c0e01 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -168,7 +168,6 @@ module ApplicationHelper
   # time       - Time object
   # placement  - Tooltip placement String (default: "top")
   # html_class - Custom class for `time` element (default: "time_ago")
-  # skip_js    - When true, exclude the `script` tag (default: false)
   #
   # By default also includes a `script` element with Javascript necessary to
   # initialize the `timeago` jQuery extension. If this method is called many
@@ -180,7 +179,7 @@ module ApplicationHelper
   # `html_class` argument is provided.
   #
   # Returns an HTML-safe String
-  def time_ago_with_tooltip(time, placement: 'top', html_class: 'time_ago', skip_js: false)
+  def time_ago_with_tooltip(time, placement: 'top', html_class: 'time_ago')
     element = content_tag :time, time.to_s,
       class: "#{html_class} js-timeago",
       datetime: time.to_time.getutc.iso8601,
@@ -190,21 +189,17 @@ module ApplicationHelper
     element
   end
 
-  def edited_time_ago_with_tooltip(object, placement: 'top', html_class: 'time_ago', skip_js: false, include_author: false)
-    return nil if object.updated_at == object.created_at
+  def edited_time_ago_with_tooltip(object, placement: 'top', html_class: 'time_ago', include_author: false)
+    return if object.updated_at == object.created_at
 
     content_tag :small, class: "edited-text" do
-      output = content_tag :span do
-        "Edited "
-      end
-      output += time_ago_with_tooltip(object.updated_at)
+      output = content_tag(:span, "Edited ")
+      output << time_ago_with_tooltip(object.updated_at, placement: placement, html_class: html_class)
 
       if include_author
         if object.updated_by && object.updated_by != object.author
-          output += content_tag :span do
-            " by "
-          end
-          output += link_to_member(object.project, object.updated_by, avatar: false, author_class: nil)
+          output << content_tag(:span, " by ")
+          output << link_to_member(object.project, object.updated_by, avatar: false, author_class: nil)
         end
       end
 
diff --git a/app/views/projects/_last_commit.html.haml b/app/views/projects/_last_commit.html.haml
index 386d72e7787..a47aea7ff1b 100644
--- a/app/views/projects/_last_commit.html.haml
+++ b/app/views/projects/_last_commit.html.haml
@@ -8,5 +8,5 @@
   = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
   = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit), class: "commit-row-message"
   &middot;
-  #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} by
+  #{time_ago_with_tooltip(commit.committed_date)} by
   = commit_author_link(commit, avatar: true, size: 24)
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 5f9a92ff93f..1ae83c2383e 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -29,7 +29,7 @@
                 .light
                   = commit_author_link(commit, avatar: false)
                   authored
-                  #{time_ago_with_tooltip(commit.committed_date, skip_js: true)}
+                  #{time_ago_with_tooltip(commit.committed_date)}
             %td.line-numbers
               - line_count = blame_group[:lines].count
               - (current_line...(current_line + line_count)).each do |i|
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 7f2903589a9..4df4a8ca9e2 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -38,5 +38,5 @@
       = commit_author_link(commit, avatar: true, size: 24)
       authored
       .committed_ago
-        #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} &nbsp;
+        #{time_ago_with_tooltip(commit.committed_date)} &nbsp;
       = link_to_browse_code(project, commit)
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 8013b31524f..2c27e6a031e 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -263,29 +263,18 @@ describe ApplicationHelper do
     end
 
     it 'includes a default js-timeago class' do
-      expect(element.attr('class')).to eq 'time_ago js-timeago js-timeago-pending'
+      expect(element.attr('class')).to eq 'time_ago js-timeago'
     end
 
     it 'accepts a custom html_class' do
       expect(element(html_class: 'custom_class').attr('class')).
-        to eq 'custom_class js-timeago js-timeago-pending'
+        to eq 'custom_class js-timeago'
     end
 
     it 'accepts a custom tooltip placement' do
       expect(element(placement: 'bottom').attr('data-placement')).to eq 'bottom'
     end
 
-    it 're-initializes timeago Javascript' do
-      el = element.next_element
-
-      expect(el.name).to eq 'script'
-      expect(el.text).to include "$('.js-timeago-pending').removeClass('js-timeago-pending').timeago()"
-    end
-
-    it 'allows the script tag to be excluded' do
-      expect(element(skip_js: true)).not_to include 'script'
-    end
-
     it 'converts to Time' do
       expect { helper.time_ago_with_tooltip(Date.today) }.not_to raise_error
     end