From 84d92283b5b0c0a85697551239017d55584adf18 Mon Sep 17 00:00:00 2001
From: Vasilii Iakliushin <viakliushin@gitlab.com>
Date: Mon, 22 Jul 2024 08:35:58 +0000
Subject: [PATCH] Revert "Merge branch 'tor/defect/merge-commit-message' into
 'master'"

This reverts merge request !158881
---
 .../components/states/ready_to_merge.vue      |   8 +-
 .../states/mr_widget_ready_to_merge_spec.js   | 114 +-----------------
 2 files changed, 3 insertions(+), 119 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index 59ff7a3cede45d..4238198f0fddb3 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -415,6 +415,7 @@ export default {
 
       const options = {
         sha: latestSha || this.mr.sha,
+        commit_message: this.commitMessage,
         auto_merge_strategy: useAutoMerge ? this.preferredAutoMergeStrategy : undefined,
         should_remove_source_branch: this.removeSourceBranch === true,
         squash: this.squashBeforeMerge,
@@ -424,14 +425,10 @@ export default {
       // If users can't alter the squash message (e.g. for 1-commit merge requests),
       // we shouldn't send the commit message because that would make the backend
       // do unnecessary work.
-      if (this.shouldShowSquashBeforeMerge && this.squashCommitMessageIsTouched) {
+      if (this.shouldShowSquashBeforeMerge) {
         options.squash_commit_message = this.squashCommitMessage;
       }
 
-      if (this.commitMessageIsTouched) {
-        options.commit_message = this.commitMessage;
-      }
-
       this.isMakingRequest = true;
       this.editCommitMessage = false;
 
@@ -617,7 +614,6 @@ export default {
                     :label="__('Squash commit message')"
                     input-id="squash-message-edit"
                     class="gl-m-0! gl-p-0!"
-                    data-testid="squash-commit-message"
                     @input="setSquashCommitMessage"
                   >
                     <template #header>
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
index 31907639f1c762..20c9b49b2a6fa6 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -156,10 +156,6 @@ const findDeleteSourceBranchCheckbox = () =>
 const triggerApprovalUpdated = () => eventHub.$emit('ApprovalUpdated');
 const triggerEditCommitInput = () =>
   wrapper.find('[data-testid="widget_edit_commit_message"]').vm.$emit('input', true);
-const triggerEditSquashInput = (text) =>
-  wrapper.find('[data-testid="squash-commit-message"]').vm.$emit('input', text);
-const triggerEditMergeInput = (text) =>
-  wrapper.find('[data-testid="merge-commit-message"]').vm.$emit('input', text);
 const findMergeHelperText = () => wrapper.find('[data-testid="auto-merge-helper-text"]');
 const findTextareas = () => wrapper.findAllComponents(GlFormTextarea);
 
@@ -407,121 +403,13 @@ describe('ReadyToMerge', () => {
       expect(params).toEqual(
         expect.objectContaining({
           sha: '12345678',
+          commit_message: commitMessage,
           should_remove_source_branch: false,
           auto_merge_strategy: 'merge_when_pipeline_succeeds',
         }),
       );
     });
 
-    describe('commit message content', () => {
-      describe('with squashing', () => {
-        const NEW_SQUASH_MESSAGE = 'updated squash message';
-
-        it('sends the user-updated squash message', async () => {
-          createComponent({
-            mr: { shouldRemoveSourceBranch: false, enableSquashBeforeMerge: true },
-          });
-
-          jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
-          jest.spyOn(service, 'merge').mockResolvedValue(response('merge_when_pipeline_succeeds'));
-
-          await triggerEditCommitInput();
-          await findCheckboxElement().vm.$emit('input', true);
-          await triggerEditSquashInput(NEW_SQUASH_MESSAGE);
-
-          findMergeButton().vm.$emit('click');
-
-          await waitForPromises();
-
-          const params = service.merge.mock.calls[0][0];
-
-          expect(params).toEqual(
-            expect.objectContaining({
-              sha: '12345678',
-              should_remove_source_branch: false,
-              auto_merge_strategy: 'merge_when_pipeline_succeeds',
-              squash_commit_message: NEW_SQUASH_MESSAGE,
-            }),
-          );
-        });
-
-        it('does not send the squash message if the user has not updated it', async () => {
-          createComponent({
-            mr: { shouldRemoveSourceBranch: false, enableSquashBeforeMerge: true },
-          });
-
-          jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
-          jest.spyOn(service, 'merge').mockResolvedValue(response('merge_when_pipeline_succeeds'));
-
-          await triggerEditCommitInput();
-          await findCheckboxElement().vm.$emit('input', true);
-
-          findMergeButton().vm.$emit('click');
-
-          await waitForPromises();
-
-          const params = service.merge.mock.calls[0][0];
-
-          expect(params).toEqual(
-            expect.not.objectContaining({
-              squash_commit_message: expect.any(String),
-            }),
-          );
-        });
-      });
-
-      describe('without squashing', () => {
-        const NEW_COMMIT_MESSAGE = 'updated commit message';
-
-        it('sends the user-updated commit message', async () => {
-          createComponent({ mr: { shouldRemoveSourceBranch: false } });
-
-          jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
-          jest.spyOn(service, 'merge').mockResolvedValue(response('merge_when_pipeline_succeeds'));
-
-          await triggerEditCommitInput();
-          await triggerEditMergeInput(NEW_COMMIT_MESSAGE);
-
-          findMergeButton().vm.$emit('click');
-
-          await waitForPromises();
-
-          const params = service.merge.mock.calls[0][0];
-
-          expect(params).toEqual(
-            expect.objectContaining({
-              sha: '12345678',
-              should_remove_source_branch: false,
-              auto_merge_strategy: 'merge_when_pipeline_succeeds',
-              commit_message: NEW_COMMIT_MESSAGE,
-              squash: false,
-              skip_merge_train: false,
-            }),
-          );
-        });
-
-        it('does not send the commit message if the user has not updated it', async () => {
-          createComponent({ mr: { shouldRemoveSourceBranch: false } });
-
-          jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
-          jest.spyOn(service, 'merge').mockResolvedValue(response('merge_when_pipeline_succeeds'));
-
-          await triggerEditCommitInput(); // Note this is intentional: `commit_message` shouldn't send until they actually edit it, even if they check the box
-          findMergeButton().vm.$emit('click');
-
-          await waitForPromises();
-
-          const params = service.merge.mock.calls[0][0];
-
-          expect(params).toEqual(
-            expect.not.objectContaining({
-              commit_message: expect.any(String),
-            }),
-          );
-        });
-      });
-    });
-
     it('should handle merge failed', async () => {
       createComponent({ mr: { availableAutoMergeStrategies: [] } });
 
-- 
GitLab