summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-01 09:17:09 -0500
committerMike Greiling <mike@pixelcog.com>2017-11-01 09:17:09 -0500
commit2ea76a4130bb90b105580a1980e0390a0a097f6f (patch)
treec57f3e5accca16f93fd5a54442ea84637c552e93
parent9985406a9137dfed1f2e84546d255889165e11ad (diff)
downloadgitlab-ce-2ea76a4130bb90b105580a1980e0390a0a097f6f.tar.gz
prevent resolve buttons from being clicked twice triggering a race condition
-rw-r--r--spec/features/merge_requests/diff_notes_resolve_spec.rb6
1 files 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')