From 17fc18ec2c04454eebd818b596e394131cb3dcc8 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Mon, 8 May 2017 09:09:08 +0000 Subject: [PATCH 1/2] Check for all possible timeago strings that can be rendered in a few minutes. We cannot rely on 'less than a minute ago' --- spec/features/snippets/notes_on_personal_snippets_spec.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 4c25701dc61ab0d3182c8c19e3251431517afbb1 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Mon, 8 May 2017 11:06:09 +0000 Subject: [PATCH 2/2] Just assert the existence of the timeago element --- spec/features/snippets/notes_on_personal_snippets_spec.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb index c6ca89219bc..698eb46573f 100644 --- a/spec/features/snippets/notes_on_personal_snippets_spec.rb +++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb @@ -67,9 +67,6 @@ 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' @@ -81,9 +78,11 @@ describe 'Comments on personal snippets', :js, feature: true do end page.within("#notes-list li#note_#{snippet_notes[0].id}") do + edited_text = find('.edited-text') + expect(page).to have_css('.note_edited_ago') expect(page).to have_content('new content') - expect(find('.note_edited_ago').text).to match(timeago_regex) + expect(edited_text).to have_selector('.note_edited_ago') end end end