Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 0 deletions

diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
index a37fc120b86..5cc61333bb4 100644
--- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
@@ -64,6 +64,10 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
         before do
           click_button "Merge when pipeline succeeds"
           click_link "Cancel automatic merge"
+
+          wait_for_requests
+
+          expect(page).to have_content 'Merge when pipeline succeeds', wait: 0
         end
 
         it_behaves_like 'Merge when pipeline succeeds activator'