From 2ea76a4130bb90b105580a1980e0390a0a097f6f Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 1 Nov 2017 09:17:09 -0500 Subject: [PATCH] prevent resolve buttons from being clicked twice triggering a race condition --- spec/features/merge_requests/diff_notes_resolve_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index a1a6792d677..15d380b1bf4 100644 --- a/spec/features/merge_requests/diff_notes_resolve_spec.rb +++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb @@ -241,10 +241,8 @@ feature 'Diff notes resolve', :js do end it 'resolves discussion' do - page.all('.note').each do |note| - note.all('.line-resolve-btn').each do |button| - button.click - end + page.all('.note .line-resolve-btn').each do |button| + button.click end expect(page).to have_content('Resolved by')