Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 74 insertions, 1 deletions

diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_rebase_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_rebase_spec.js
index 534c0baf35d..05c259de370 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_rebase_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_rebase_spec.js
@@ -110,7 +110,7 @@ describe('Merge request widget rebase component', () => {
           expect(findRebaseMessageText()).toContain('Something went wrong!');
         });
 
-        describe('Rebase buttons with', () => {
+        describe('Rebase buttons', () => {
           beforeEach(() => {
             createWrapper(
               {
@@ -148,6 +148,79 @@ describe('Merge request widget rebase component', () => {
             expect(rebaseMock).toHaveBeenCalledWith({ skipCi: true });
           });
         });
+
+        describe('Rebase when pipelines must succeed is enabled', () => {
+          beforeEach(() => {
+            createWrapper(
+              {
+                mr: {
+                  rebaseInProgress: false,
+                  canPushToSourceBranch: true,
+                  onlyAllowMergeIfPipelineSucceeds: true,
+                },
+                service: {
+                  rebase: rebaseMock,
+                  poll: pollMock,
+                },
+              },
+              mergeRequestWidgetGraphql,
+            );
+          });
+
+          it('renders only the rebase button', () => {
+            expect(findRebaseWithoutCiButton().exists()).toBe(false);
+            expect(findStandardRebaseButton().exists()).toBe(true);
+          });
+
+          it('starts the rebase when clicking', async () => {
+            findStandardRebaseButton().vm.$emit('click');
+
+            await nextTick();
+
+            expect(rebaseMock).toHaveBeenCalledWith({ skipCi: false });
+          });
+        });
+
+        describe('Rebase when pipelines must succeed and skipped pipelines are considered successful are enabled', () => {
+          beforeEach(() => {
+            createWrapper(
+              {
+                mr: {
+                  rebaseInProgress: false,
+                  canPushToSourceBranch: true,
+                  onlyAllowMergeIfPipelineSucceeds: true,
+                  allowMergeOnSkippedPipeline: true,
+                },
+                service: {
+                  rebase: rebaseMock,
+                  poll: pollMock,
+                },
+              },
+              mergeRequestWidgetGraphql,
+            );
+          });
+
+          it('renders both rebase buttons', () => {
+            expect(findRebaseWithoutCiButton().exists()).toBe(true);
+            expect(findStandardRebaseButton().exists()).toBe(true);
+          });
+
+          it('starts the rebase when clicking', async () => {
+            findStandardRebaseButton().vm.$emit('click');
+
+            await nextTick();
+
+            expect(rebaseMock).toHaveBeenCalledWith({ skipCi: false });
+          });
+
+          it('starts the CI-skipping rebase when clicking on "Rebase without CI"', async () => {
+            findRebaseWithoutCiButton().vm.$emit('click');
+
+            await nextTick();
+
+            expect(rebaseMock).toHaveBeenCalledWith({ skipCi: true });
+          });
+        });
       });
 
       describe('without permissions', () => {