diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-12-11 13:57:49 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-11 13:57:49 -0500 |
commit | 456ddb5eb7f905899bd1a6258617eb505f4dc289 (patch) | |
tree | 2e398831b9bb23cc521ed7fd55b2f6c7e0d093df /spec | |
parent | 722f14816c85bc5996caac33adb4e4c54e6efdfc (diff) | |
download | gitlab-ce-456ddb5eb7f905899bd1a6258617eb505f4dc289.tar.gz |
Fix time_ago_with_tooltip for activity feedrs-timeago
Closes #4002
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/application_helper_spec.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 5568f06639c..68527c3a4f8 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -263,11 +263,12 @@ describe ApplicationHelper do end it 'includes a default js-timeago class' do - expect(element.attr('class')).to eq 'time_ago js-timeago' + expect(element.attr('class')).to eq 'time_ago js-timeago js-timeago-pending' end it 'accepts a custom html_class' do - expect(element(html_class: 'custom_class').attr('class')).to eq 'custom_class js-timeago' + expect(element(html_class: 'custom_class').attr('class')). + to eq 'custom_class js-timeago js-timeago-pending' end it 'accepts a custom tooltip placement' do @@ -278,7 +279,7 @@ describe ApplicationHelper do el = element.next_element expect(el.name).to eq 'script' - expect(el.text).to include "$('.js-timeago').last().timeago()" + expect(el.text).to include "$('.js-timeago-pending').removeClass('js-timeago-pending').timeago()" end it 'allows the script tag to be excluded' do |