summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-03 11:03:22 -0500
committerMike Greiling <mike@pixelcog.com>2017-11-03 11:03:22 -0500
commit442248104c979afaa9b23512141602a9f77da871 (patch)
treed5d15e3842496b722c8ae2719220d30f87bec62a
parent3e1168a14c60eb0a3859cc21ae4f44015bba687d (diff)
downloadgitlab-ce-442248104c979afaa9b23512141602a9f77da871.tar.gz
prevent race condition when attempting to cancel a file upload
-rw-r--r--spec/features/issues_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index a5c24b362a2..b9af77f918a 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -585,9 +585,11 @@ describe 'Issues' do
end
it "cancels a file upload correctly" do
- dropzone_file([Rails.root.join('spec', 'fixtures', 'dk.png')], 0, false)
+ slow_requests do
+ dropzone_file([Rails.root.join('spec', 'fixtures', 'dk.png')], 0, false)
- click_button 'Cancel'
+ click_button 'Cancel'
+ end
expect(page).to have_button('Attach a file')
expect(page).not_to have_button('Cancel')