summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-12 13:13:16 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-12 13:13:16 -0500
commit100cdce21e6dafa1b5d32313436fc610e8c88648 (patch)
treeb075f6fdbcbe02d04984873ea47cdb1574f91a96
parentd047db910a7cbac7f61b74bb580df3986acb767e (diff)
downloadgitlab-ce-100cdce21e6dafa1b5d32313436fc610e8c88648.tar.gz
Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversion
Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--spec/helpers/application_helper_spec.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2b9bad9c9ea..f35b8ead1f7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -205,7 +205,7 @@ module ApplicationHelper
def time_ago_with_tooltip(time, placement: 'top', html_class: 'time_ago', skip_js: false)
element = content_tag :time, time.to_s,
class: "#{html_class} js-timeago js-timeago-pending",
- datetime: time.getutc.iso8601,
+ datetime: time.to_time.getutc.iso8601,
title: time.in_time_zone.to_s(:medium),
data: { toggle: 'tooltip', placement: placement, container: 'body' }
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index efc850eb705..30e353148a8 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -285,6 +285,10 @@ describe ApplicationHelper do
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
end
describe 'render_markup' do