Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

4 files changed, 0 insertions, 30 deletions

diff --git a/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb
index a99304f7214..ab04692616a 100644
--- a/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/clone_quick_action_shared_examples.rb
@@ -54,8 +54,6 @@ RSpec.shared_examples 'clone quick action' do
           # Note that this is missing one `-`
           add_note("/clone -with_notes #{target_project.full_path}")
 
-          wait_for_requests
-
           expect(page).to have_content 'Failed to clone this issue: wrong parameters.'
           expect(issue.reload).to be_open
         end
@@ -68,8 +66,6 @@ RSpec.shared_examples 'clone quick action' do
       it 'does not clone the issue' do
         add_note("/clone #{project_unauthorized.full_path}")
 
-        wait_for_requests
-
         expect(page).to have_content "Cloned this issue to #{project_unauthorized.full_path}."
         expect(issue.reload).to be_open
 
@@ -83,8 +79,6 @@ RSpec.shared_examples 'clone quick action' do
       it 'does not clone the issue' do
         add_note("/clone not/valid")
 
-        wait_for_requests
-
         expect(page).to have_content "Failed to clone this issue because target project doesn't exist."
         expect(issue.reload).to be_open
       end
@@ -154,7 +148,6 @@ RSpec.shared_examples 'clone quick action' do
         expect(issue.reload).not_to be_closed
 
         edit_note("/cloe #{target_project.full_path}", "test note.\n/clone #{target_project.full_path}")
-        wait_for_all_requests
 
         expect(page).to have_content 'test note.'
         expect(issue.reload).to be_open
@@ -172,7 +165,6 @@ RSpec.shared_examples 'clone quick action' do
         expect(page).not_to have_content 'Commands applied'
 
         edit_note("/cloe #{target_project.full_path}", "/clone #{target_project.full_path}")
-        wait_for_all_requests
 
         expect(page).not_to have_content "/clone #{target_project.full_path}"
         expect(issue.reload).to be_open
diff --git a/spec/support/shared_examples/quick_actions/issue/create_merge_request_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/create_merge_request_quick_action_shared_examples.rb
index 910805dbdea..9dc39c6cf73 100644
--- a/spec/support/shared_examples/quick_actions/issue/create_merge_request_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/create_merge_request_quick_action_shared_examples.rb
@@ -22,8 +22,6 @@ RSpec.shared_examples 'create_merge_request quick action' do
       branch_name = 'invalid branch name'
       add_note("/create_merge_request #{branch_name}")
 
-      wait_for_requests
-
       expect_mr_quickaction(false, branch_name)
     end
 
@@ -31,16 +29,12 @@ RSpec.shared_examples 'create_merge_request quick action' do
       branch_name = 'feature'
       add_note("/create_merge_request #{branch_name}")
 
-      wait_for_requests
-
       expect_mr_quickaction(false, branch_name)
     end
 
     it 'creates a new merge request using issue iid and title as branch name when the branch name is empty' do
       add_note("/create_merge_request")
 
-      wait_for_requests
-
       expect_mr_quickaction(true)
 
       created_mr = project.merge_requests.last
diff --git a/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
index 32c46753006..5892fc32e94 100644
--- a/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
@@ -27,8 +27,6 @@ RSpec.shared_examples 'move quick action' do
       it 'does not move the issue' do
         add_note("/move #{project_unauthorized.full_path}")
 
-        wait_for_requests
-
         expect(page).to have_content "Moved this issue to #{project_unauthorized.full_path}."
         expect(issue.reload).to be_open
       end
@@ -38,8 +36,6 @@ RSpec.shared_examples 'move quick action' do
       it 'does not move the issue' do
         add_note("/move not/valid")
 
-        wait_for_requests
-
         expect(page).to have_content "Failed to move this issue because target project doesn't exist."
         expect(issue.reload).to be_open
       end
@@ -110,7 +106,6 @@ RSpec.shared_examples 'move quick action' do
         expect(issue.reload).not_to be_closed
 
         edit_note("/mvoe #{target_project.full_path}", "test note.\n/move #{target_project.full_path}")
-        wait_for_all_requests
 
         expect(page).to have_content 'test note.'
         expect(issue.reload).to be_closed
@@ -129,7 +124,6 @@ RSpec.shared_examples 'move quick action' do
         expect(issue.reload).not_to be_closed
 
         edit_note("/mvoe #{target_project.full_path}", "/move #{target_project.full_path}")
-        wait_for_all_requests
 
         expect(page).not_to have_content "/move #{target_project.full_path}"
         expect(issue.reload).to be_closed
diff --git a/spec/support/shared_examples/quick_actions/issue/zoom_quick_actions_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/zoom_quick_actions_shared_examples.rb
index 1ea249d5f9d..34937949174 100644
--- a/spec/support/shared_examples/quick_actions/issue/zoom_quick_actions_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/zoom_quick_actions_shared_examples.rb
@@ -10,8 +10,6 @@ RSpec.shared_examples 'zoom quick actions' do
       it 'skips addition silently' do
         add_note("/zoom #{zoom_link}")
 
-        wait_for_requests
-
         expect(page).not_to have_content('Zoom meeting added')
         expect(page).not_to have_content('Failed to add a Zoom meeting')
         expect(ZoomMeeting.canonical_meeting_url(issue.reload)).not_to eq(zoom_link)
@@ -22,8 +20,6 @@ RSpec.shared_examples 'zoom quick actions' do
       it 'adds a Zoom link' do
         add_note("/zoom #{zoom_link}")
 
-        wait_for_requests
-
         expect(page).to have_content('Zoom meeting added')
         expect(ZoomMeeting.canonical_meeting_url(issue.reload)).to eq(zoom_link)
       end
@@ -35,8 +31,6 @@ RSpec.shared_examples 'zoom quick actions' do
       it 'cannot add invalid zoom link' do
         add_note("/zoom #{invalid_zoom_link}")
 
-        wait_for_requests
-
         expect(page).to have_content('Failed to add a Zoom meeting')
         expect(page).not_to have_content(zoom_link)
       end
@@ -64,8 +58,6 @@ RSpec.shared_examples 'zoom quick actions' do
       it 'skips removal silently' do
         add_note('/remove_zoom')
 
-        wait_for_requests
-
         expect(page).not_to have_content('Zoom meeting removed')
         expect(page).not_to have_content('Failed to remove a Zoom meeting')
         expect(ZoomMeeting.canonical_meeting_url(issue.reload)).to be_nil
@@ -78,8 +70,6 @@ RSpec.shared_examples 'zoom quick actions' do
       it 'removes last Zoom link' do
         add_note('/remove_zoom')
 
-        wait_for_requests
-
         expect(page).to have_content('Zoom meeting removed')
         expect(ZoomMeeting.canonical_meeting_url(issue.reload)).to be_nil
       end