diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 09:13:51 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 09:13:51 +0000 |
| commit | 9552db2fa7d1ea5031a3243c17f7968e5911de43 (patch) | |
| tree | d27ffe6a459b3a50cc6f86d664aa4b9c32584cf7 /spec | |
| parent | 96351a1e9f33430f4552c05fdda143792ef1c99a (diff) | |
| parent | 100cdce21e6dafa1b5d32313436fc610e8c88648 (diff) | |
| download | gitlab-ce-9552db2fa7d1ea5031a3243c17f7968e5911de43.tar.gz | |
Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master'
Make sure time_ago_with_tooltip is using a Time object
Somehow this test existed on EE but not in CE, so it started failing
after a bad CE-to-EE merge.
See merge request !2398
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/helpers/application_helper_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
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 |