From c286be669207be73c48e37b131eaf84f2a519eaf Mon Sep 17 00:00:00 2001
From: PaytonBurdette <pburdette@gitlab.com>
Date: Thu, 13 Jan 2022 08:59:44 -0500
Subject: [PATCH 1/4] Add feature flag for rebase without CI

Put the new rebase without ci option
in the UI behind a feature flag due
to not working with detached pipelines.
---
 .../components/states/mr_widget_rebase.vue      | 17 +++++++++++++++--
 .../projects/merge_requests_controller.rb       |  1 +
 .../development/rebase_without_ci_ui.yml        |  8 ++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 config/feature_flags/development/rebase_without_ci_ui.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index c44d14f08b6bdd..880cae6c1f734e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlSkeletonLoader } from '@gitlab/ui';
+import { GlButton, GlSkeletonLoader } from '@gitlab/ui';
 import createFlash from '~/flash';
 import { __ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
@@ -29,6 +29,7 @@ export default {
     statusIcon,
     GlSkeletonLoader,
     ActionsButton,
+    GlButton,
   },
   mixins: [glFeatureFlagMixin(), mergeRequestQueryVariablesMixin],
   props: {
@@ -53,6 +54,9 @@ export default {
     isLoading() {
       return this.glFeatures.mergeRequestWidgetGraphql && this.$apollo.queries.state.loading;
     },
+    showRebaseWithoutCi() {
+      return this.glFeatures?.rebaseWithoutCiUi;
+    },
     rebaseInProgress() {
       if (this.glFeatures.mergeRequestWidgetGraphql) {
         return this.state.rebaseInProgress;
@@ -196,8 +200,17 @@ export default {
           v-if="!rebaseInProgress && canPushToSourceBranch && !isMakingRequest"
           class="accept-merge-holder clearfix js-toggle-container accept-action media space-children"
         >
+          <gl-button
+            v-if="!glFeatures.restructuredMrWidget && !showRebaseWithoutCi"
+            :loading="isMakingRequest"
+            variant="confirm"
+            data-qa-selector="mr_rebase_button"
+            @click="rebase"
+          >
+            {{ __('Rebase') }}
+          </gl-button>
           <actions-button
-            v-if="!glFeatures.restructuredMrWidget"
+            v-if="!glFeatures.restructuredMrWidget && showRebaseWithoutCi"
             :actions="actions"
             :selected-key="selectedRebaseAction"
             variant="confirm"
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 07ec0b9b41ea1f..f936aeb0084964 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -43,6 +43,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:mr_changes_fluid_layout, project, default_enabled: :yaml)
     push_frontend_feature_flag(:mr_attention_requests, project, default_enabled: :yaml)
     push_frontend_feature_flag(:refactor_mr_widgets_extensions, @project, default_enabled: :yaml)
+    push_frontend_feature_flag(:rebase_without_ci_ui, @project, default_enabled: :yaml)
     # Usage data feature flags
     push_frontend_feature_flag(:users_expanding_widgets_usage_data, @project, default_enabled: :yaml)
     push_frontend_feature_flag(:diff_settings_usage_data, default_enabled: :yaml)
diff --git a/config/feature_flags/development/rebase_without_ci_ui.yml b/config/feature_flags/development/rebase_without_ci_ui.yml
new file mode 100644
index 00000000000000..9f84cc9f71bbc7
--- /dev/null
+++ b/config/feature_flags/development/rebase_without_ci_ui.yml
@@ -0,0 +1,8 @@
+---
+name: rebase_without_ci_ui
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.7'
+type: development
+group: group::pipeline execution
+default_enabled: false
-- 
GitLab


From 7d491802f1a21458d9dc4b7087788f40568b7d81 Mon Sep 17 00:00:00 2001
From: PaytonBurdette <pburdette@gitlab.com>
Date: Thu, 13 Jan 2022 09:13:09 -0500
Subject: [PATCH 2/4] Add feature flag info

---
 config/feature_flags/development/rebase_without_ci_ui.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/feature_flags/development/rebase_without_ci_ui.yml b/config/feature_flags/development/rebase_without_ci_ui.yml
index 9f84cc9f71bbc7..b05711ced29eaf 100644
--- a/config/feature_flags/development/rebase_without_ci_ui.yml
+++ b/config/feature_flags/development/rebase_without_ci_ui.yml
@@ -1,7 +1,7 @@
 ---
 name: rebase_without_ci_ui
-introduced_by_url:
-rollout_issue_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78194
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350262
 milestone: '14.7'
 type: development
 group: group::pipeline execution
-- 
GitLab


From 94256c37338693ae6b06f0039dc557aa0fe23a6e Mon Sep 17 00:00:00 2001
From: PaytonBurdette <pburdette@gitlab.com>
Date: Thu, 13 Jan 2022 09:55:40 -0500
Subject: [PATCH 3/4] Update test coverage

---
 .../components/states/mr_widget_rebase.vue    |   1 +
 .../components/mr_widget_rebase_spec.js       | 151 ++++++++++++++----
 2 files changed, 122 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index 880cae6c1f734e..bb0fb410d3ece0 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -205,6 +205,7 @@ export default {
             :loading="isMakingRequest"
             variant="confirm"
             data-qa-selector="mr_rebase_button"
+            data-testid="standard-rebase-button"
             @click="rebase"
           >
             {{ __('Rebase') }}
diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
index 950c5be6af80c7..f0b88b7c10a00d 100644
--- a/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
@@ -10,7 +10,7 @@ import {
 
 let wrapper;
 
-function createWrapper(propsData, mergeRequestWidgetGraphql) {
+function createWrapper(propsData, mergeRequestWidgetGraphql, rebaseWithoutCiUi) {
   wrapper = shallowMount(WidgetRebase, {
     propsData,
     data() {
@@ -24,7 +24,7 @@ function createWrapper(propsData, mergeRequestWidgetGraphql) {
         },
       };
     },
-    provide: { glFeatures: { mergeRequestWidgetGraphql } },
+    provide: { glFeatures: { mergeRequestWidgetGraphql, rebaseWithoutCiUi } },
     mocks: {
       $apollo: {
         queries: {
@@ -38,7 +38,8 @@ function createWrapper(propsData, mergeRequestWidgetGraphql) {
 describe('Merge request widget rebase component', () => {
   const findRebaseMessage = () => wrapper.find('[data-testid="rebase-message"]');
   const findRebaseMessageText = () => findRebaseMessage().text();
-  const findRebaseButton = () => wrapper.find(ActionsButton);
+  const findRebaseButtonActions = () => wrapper.find(ActionsButton);
+  const findStandardRebaseButton = () => wrapper.find('[data-testid="standard-rebase-button"]');
 
   afterEach(() => {
     wrapper.destroy();
@@ -65,7 +66,7 @@ describe('Merge request widget rebase component', () => {
         const rebaseMock = jest.fn().mockResolvedValue();
         const pollMock = jest.fn().mockResolvedValue({});
 
-        beforeEach(() => {
+        it('renders the warning message', () => {
           createWrapper(
             {
               mr: {
@@ -79,9 +80,7 @@ describe('Merge request widget rebase component', () => {
             },
             mergeRequestWidgetGraphql,
           );
-        });
 
-        it('renders the warning message', () => {
           const text = findRebaseMessageText();
 
           expect(text).toContain('Merge blocked');
@@ -91,6 +90,20 @@ describe('Merge request widget rebase component', () => {
         });
 
         it('renders an error message when rebasing has failed', async () => {
+          createWrapper(
+            {
+              mr: {
+                rebaseInProgress: false,
+                canPushToSourceBranch: true,
+              },
+              service: {
+                rebase: rebaseMock,
+                poll: pollMock,
+              },
+            },
+            mergeRequestWidgetGraphql,
+          );
+
           // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
           // eslint-disable-next-line no-restricted-syntax
           wrapper.setData({ rebasingError: 'Something went wrong!' });
@@ -99,13 +112,31 @@ describe('Merge request widget rebase component', () => {
           expect(findRebaseMessageText()).toContain('Something went wrong!');
         });
 
-        describe('"Rebase" button', () => {
-          it('is rendered', () => {
-            expect(findRebaseButton().exists()).toBe(true);
+        describe('Rebase button with flag rebaseWithoutCiUi', () => {
+          beforeEach(() => {
+            createWrapper(
+              {
+                mr: {
+                  rebaseInProgress: false,
+                  canPushToSourceBranch: true,
+                },
+                service: {
+                  rebase: rebaseMock,
+                  poll: pollMock,
+                },
+              },
+              mergeRequestWidgetGraphql,
+              { rebaseWithoutCiUi: true },
+            );
+          });
+
+          it('rebase button with actions is rendered', () => {
+            expect(findRebaseButtonActions().exists()).toBe(true);
+            expect(findStandardRebaseButton().exists()).toBe(false);
           });
 
           it('has rebase and rebase without CI actions', () => {
-            const actionNames = findRebaseButton()
+            const actionNames = findRebaseButtonActions()
               .props('actions')
               .map((action) => action.key);
 
@@ -113,13 +144,13 @@ describe('Merge request widget rebase component', () => {
           });
 
           it('defaults to rebase action', () => {
-            expect(findRebaseButton().props('selectedKey')).toStrictEqual(REBASE_BUTTON_KEY);
+            expect(findRebaseButtonActions().props('selectedKey')).toStrictEqual(REBASE_BUTTON_KEY);
           });
 
           it('starts the rebase when clicking', async () => {
             // ActionButtons use the actions props instead of emitting
             // a click event, therefore simulating the behavior here:
-            findRebaseButton()
+            findRebaseButtonActions()
               .props('actions')
               .find((x) => x.key === REBASE_BUTTON_KEY)
               .handle();
@@ -132,7 +163,7 @@ describe('Merge request widget rebase component', () => {
           it('starts the CI-skipping rebase when clicking on "Rebase without CI"', async () => {
             // ActionButtons use the actions props instead of emitting
             // a click event, therefore simulating the behavior here:
-            findRebaseButton()
+            findRebaseButtonActions()
               .props('actions')
               .find((x) => x.key === REBASE_WITHOUT_CI_BUTTON_KEY)
               .handle();
@@ -142,12 +173,74 @@ describe('Merge request widget rebase component', () => {
             expect(rebaseMock).toHaveBeenCalledWith({ skipCi: true });
           });
         });
+
+        describe('Rebase button without flag rebaseWithoutCiUi', () => {
+          beforeEach(() => {
+            createWrapper(
+              {
+                mr: {
+                  rebaseInProgress: false,
+                  canPushToSourceBranch: true,
+                },
+                service: {
+                  rebase: rebaseMock,
+                  poll: pollMock,
+                },
+              },
+              mergeRequestWidgetGraphql,
+            );
+          });
+
+          it('standard rebase button is rendered', () => {
+            expect(findStandardRebaseButton().exists()).toBe(true);
+            expect(findRebaseButtonActions().exists()).toBe(false);
+          });
+
+          it('calls rebase method with skip_ci false', () => {
+            findStandardRebaseButton().vm.$emit('click');
+
+            expect(rebaseMock).toHaveBeenCalledWith({ skipCi: false });
+          });
+        });
       });
 
       describe('without permissions', () => {
         const exampleTargetBranch = 'fake-branch-to-test-with';
 
-        beforeEach(() => {
+        describe('UI text', () => {
+          beforeEach(() => {
+            createWrapper(
+              {
+                mr: {
+                  rebaseInProgress: false,
+                  canPushToSourceBranch: false,
+                  targetBranch: exampleTargetBranch,
+                },
+                service: {},
+              },
+              mergeRequestWidgetGraphql,
+            );
+          });
+
+          it('renders a message explaining user does not have permissions', () => {
+            const text = findRebaseMessageText();
+
+            expect(text).toContain(
+              'Merge blocked: the source branch must be rebased onto the target branch.',
+            );
+            expect(text).toContain('the source branch must be rebased');
+          });
+
+          it('renders the correct target branch name', () => {
+            const elem = findRebaseMessage();
+
+            expect(elem.text()).toContain(
+              `Merge blocked: the source branch must be rebased onto the target branch.`,
+            );
+          });
+        });
+
+        it('does not render the rebase actions button with rebaseWithoutCiUI flag enabled', () => {
           createWrapper(
             {
               mr: {
@@ -158,28 +251,26 @@ describe('Merge request widget rebase component', () => {
               service: {},
             },
             mergeRequestWidgetGraphql,
+            { rebaseWithoutCiUi: true },
           );
-        });
 
-        it('renders a message explaining user does not have permissions', () => {
-          const text = findRebaseMessageText();
-
-          expect(text).toContain(
-            'Merge blocked: the source branch must be rebased onto the target branch.',
-          );
-          expect(text).toContain('the source branch must be rebased');
+          expect(findRebaseButtonActions().exists()).toBe(false);
         });
 
-        it('renders the correct target branch name', () => {
-          const elem = findRebaseMessage();
-
-          expect(elem.text()).toContain(
-            `Merge blocked: the source branch must be rebased onto the target branch.`,
+        it('does not render the standard rebase button with rebaseWithoutCiUI flag disabled', () => {
+          createWrapper(
+            {
+              mr: {
+                rebaseInProgress: false,
+                canPushToSourceBranch: false,
+                targetBranch: exampleTargetBranch,
+              },
+              service: {},
+            },
+            mergeRequestWidgetGraphql,
           );
-        });
 
-        it('does not render the "Rebase" button', () => {
-          expect(findRebaseButton().exists()).toBe(false);
+          expect(findStandardRebaseButton().exists()).toBe(false);
         });
       });
 
-- 
GitLab


From b33f6084de6fa55bd64c5096489222dcfe598e7b Mon Sep 17 00:00:00 2001
From: Jannik Lehmann <jlehmann@gitlab.com>
Date: Thu, 13 Jan 2022 16:29:25 +0000
Subject: [PATCH 4/4] Update test descriptions

---
 .../vue_mr_widget/components/mr_widget_rebase_spec.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
index f0b88b7c10a00d..27604868b3e161 100644
--- a/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
@@ -174,7 +174,7 @@ describe('Merge request widget rebase component', () => {
           });
         });
 
-        describe('Rebase button without flag rebaseWithoutCiUi', () => {
+        describe('Rebase button with rebaseWithoutCiUI flag disabled', () => {
           beforeEach(() => {
             createWrapper(
               {
@@ -235,7 +235,7 @@ describe('Merge request widget rebase component', () => {
             const elem = findRebaseMessage();
 
             expect(elem.text()).toContain(
-              `Merge blocked: the source branch must be rebased onto the target branch.`,
+              'Merge blocked: the source branch must be rebased onto the target branch.',
             );
           });
         });
-- 
GitLab