1 files changed, 74 insertions, 59 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
index 2ddc59acd5c..2b1ac75b9f5 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
@@ -3,82 +3,97 @@
 module QA
   RSpec.describe 'Create', :runner do
     describe 'Merge requests' do
-      let(:project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.name = 'merge-when-pipeline-succeeds'
-          project.initialize_with_readme = true
+      shared_examples 'merge when pipeline succeeds' do |repeat: 1|
+        let(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'merge-when-pipeline-succeeds'
+            project.initialize_with_readme = true
+          end
         end
-      end
 
-      let!(:runner) do
-        Resource::Runner.fabricate! do |runner|
-          runner.project = project
-          runner.name = "runner-for-#{project.name}"
-          runner.tags = ["runner-for-#{project.name}"]
+        let!(:runner) do
+          Resource::Runner.fabricate! do |runner|
+            runner.project = project
+            runner.name = "runner-for-#{project.name}"
+            runner.tags = ["runner-for-#{project.name}"]
+          end
         end
-      end
 
-      before do
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.add_files(
-            [
-              {
-                file_path: '.gitlab-ci.yml',
-                content: <<~EOF
-                  test:
-                    tags: ["runner-for-#{project.name}"]
-                    script: sleep 5
-                    only:
-                      - merge_requests
-                EOF
-              }
-            ]
-          )
+        before do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.add_files(
+              [
+                {
+                  file_path: '.gitlab-ci.yml',
+                  content: <<~EOF
+                    test:
+                      tags: ["runner-for-#{project.name}"]
+                      script: sleep 10
+                      only:
+                        - merge_requests
+                  EOF
+                }
+              ]
+            )
+          end
+
+          Flow::Login.sign_in
         end
 
-        Flow::Login.sign_in
-      end
+        after do
+          runner&.remove_via_api!
+          project&.remove_via_api!
+        end
 
-      after do
-        runner&.remove_via_api!
-        project&.remove_via_api!
-      end
+        it 'merges after pipeline succeeds' do
+          repeat.times do |i|
+            QA::Runtime::Logger.info("Transient bug test - Trial #{i}") if repeat > 1
 
-      it 'merges when pipeline succeeds', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1684' do
-        branch_name = "merge-request-test-#{SecureRandom.hex(8)}"
+            branch_name = "mr-test-#{SecureRandom.hex(6)}-#{i}"
 
-        # Create a branch that will be merged into the default branch
-        Resource::Repository::ProjectPush.fabricate! do |project_push|
-          project_push.project = project
-          project_push.new_branch = true
-          project_push.branch_name = branch_name
-          project_push.file_name = "file-#{SecureRandom.hex(8)}.txt"
-        end
+            # Create a branch that will be merged into the default branch
+            Resource::Repository::ProjectPush.fabricate! do |project_push|
+              project_push.project = project
+              project_push.new_branch = true
+              project_push.branch_name = branch_name
+              project_push.file_name = "#{branch_name}.txt"
+            end
 
-        # Create a merge request to merge the branch we just created
-        merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
-          merge_request.project = project
-          merge_request.source_branch = branch_name
-          merge_request.no_preparation = true
-        end
+            # Create a merge request to merge the branch we just created
+            merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
+              merge_request.project = project
+              merge_request.source_branch = branch_name
+              merge_request.no_preparation = true
+            end
 
-        merge_request.visit!
+            merge_request.visit!
 
-        Page::MergeRequest::Show.perform do |mr|
-          mr.merge_when_pipeline_succeeds!
+            Page::MergeRequest::Show.perform do |mr|
+              mr.merge_when_pipeline_succeeds!
 
-          expect(mr.merge_request_status).to match(/to be merged automatically when the pipeline succeeds/)
+              Support::Waiter.wait_until(sleep_interval: 5) do
+                merge_request = merge_request.reload!
+                merge_request.state == 'merged'
+              end
 
-          Support::Waiter.wait_until(sleep_interval: 5) do
-            merge_request = merge_request.reload!
-            merge_request.state == 'merged'
+              aggregate_failures do
+                expect(merge_request.merge_when_pipeline_succeeds).to be_truthy
+                expect(mr.merged?).to be_truthy, "Expected content 'The changes were merged' but it did not appear."
+              end
+            end
           end
-
-          expect(mr.merged?).to be_truthy, "Expected content 'The changes were merged' but it did not appear."
         end
       end
+
+      context 'when merging once', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1684' do
+        it_behaves_like 'merge when pipeline succeeds'
+      end
+
+      context 'when merging several times', :transient, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1684' do
+        it_behaves_like 'merge when pipeline succeeds', repeat: Runtime::Env.transient_trials
+      end
     end
   end
 end