Commit e31cf877 authored by Rémy Coutable's avatar Rémy Coutable

Try to fix a flaky Epic show spec

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 9f929bc4
...@@ -141,14 +141,12 @@ RSpec.describe 'Epic show', :js do ...@@ -141,14 +141,12 @@ RSpec.describe 'Epic show', :js do
let!(:notes) { create_list(:note, 2, noteable: epic) } let!(:notes) { create_list(:note, 2, noteable: epic) }
context 'when sorted by `Oldest first`' do context 'when sorted by `Oldest first`' do
it 'shows label `Oldest first`' do it 'shows comments in the correct order' do
page.within('[data-testid="sort-discussion-filter"]') do page.within('[data-testid="sort-discussion-filter"]') do
expect(find('.js-dropdown-text')).to have_content('Oldest first') expect(find('.js-dropdown-text')).to have_content('Oldest first')
end end
end
it 'shows comments in the correct order' do items = all('.timeline-entry .timeline-discussion-body .note-text')
items = all('.timeline-entry .timeline-discussion-body p')
expect(items[0]).to have_content(notes[0].note) expect(items[0]).to have_content(notes[0].note)
expect(items[1]).to have_content(notes[1].note) expect(items[1]).to have_content(notes[1].note)
end end
...@@ -163,14 +161,12 @@ RSpec.describe 'Epic show', :js do ...@@ -163,14 +161,12 @@ RSpec.describe 'Epic show', :js do
end end
end end
it 'shows label `Newest first`' do it 'shows comments in the correct order' do
page.within('[data-testid="sort-discussion-filter"]') do page.within('[data-testid="sort-discussion-filter"]') do
expect(find('.js-dropdown-text')).to have_content('Newest first') expect(find('.js-dropdown-text')).to have_content('Newest first')
end end
end
it 'shows comments in the correct order' do items = all('.timeline-entry .timeline-discussion-body .note-text')
items = all('.timeline-entry .timeline-discussion-body p')
expect(items[0]).to have_content(notes[1].note) expect(items[0]).to have_content(notes[1].note)
expect(items[1]).to have_content(notes[0].note) expect(items[1]).to have_content(notes[0].note)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment