diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-08 09:09:08 +0000 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-08 09:09:08 +0000 |
commit | 17fc18ec2c04454eebd818b596e394131cb3dcc8 (patch) | |
tree | b1308d8399325e22013762fbdf7adfe45bb7c32a | |
parent | 6386e42f06bb26746a9168a8c81ad03fa0356dbd (diff) | |
download | gitlab-ce-17fc18ec2c04454eebd818b596e394131cb3dcc8.tar.gz |
Check for all possible timeago strings that can be rendered in a few minutes. We cannot rely on 'less than a minute ago'fix-notes_on_personal_snippets_spec-timeago-assertion-ce
-rw-r--r-- | spec/features/snippets/notes_on_personal_snippets_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb index 957baac02eb..c6ca89219bc 100644 --- a/spec/features/snippets/notes_on_personal_snippets_spec.rb +++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb @@ -67,6 +67,9 @@ describe 'Comments on personal snippets', :js, feature: true do end context 'when editing a note' do + # Matches `less than a minute ago`, `about a minute ago` and `N minutes ago` + let(:timeago_regex) { /((less than|about) a minute|\d+? minutes) ago/ } + it 'changes the text' do page.within("#notes-list li#note_#{snippet_notes[0].id}") do click_on 'Edit comment' @@ -80,7 +83,7 @@ describe 'Comments on personal snippets', :js, feature: true do page.within("#notes-list li#note_#{snippet_notes[0].id}") do expect(page).to have_css('.note_edited_ago') expect(page).to have_content('new content') - expect(find('.note_edited_ago').text).to match(/less than a minute ago/) + expect(find('.note_edited_ago').text).to match(timeago_regex) end end end |