From 5b7e54c097e37af207b578636982c342409d3903 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 14 Nov 2024 22:59:31 -0700
Subject: [PATCH 1/3] Remove mixed v-model/@input handler

---
 .../components/states/ready_to_merge.vue                       | 3 +--
 1 file changed, 1 insertion(+), 2 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 9a39fd3e66c6bd..0c5f3a1b9b36fa 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
@@ -617,11 +617,10 @@ export default {
                 <ul class="border-top commits-list flex-list gl-list-none gl-p-0 gl-pt-4">
                   <commit-edit
                     v-if="shouldShowSquashEdit"
-                    v-model="squashCommitMessage"
                     :label="__('Squash commit message')"
+                    :value="squashCommitMessage"
                     input-id="squash-message-edit"
                     class="!gl-m-0 !gl-p-0"
-                    data-testid="squash-commit-message"
                     @input="setSquashCommitMessage"
                   >
                     <template #header>
-- 
GitLab


From 433233de88de7772571bd2928b04b5e00c02e551 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 14 Nov 2024 23:00:19 -0700
Subject: [PATCH 2/3] Replace added `data-testid` with
 findCommitEditWithInputId

---
 .../components/states/mr_widget_ready_to_merge_spec.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..026a3a7901effb 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
@@ -157,7 +157,7 @@ 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);
+  findCommitEditWithInputId('squash-message-edit').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"]');
-- 
GitLab


From b3343cee8f0a9ebb068115d2d0f7cc718cb8bf54 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 14 Nov 2024 23:01:45 -0700
Subject: [PATCH 3/3] Improve reliability of ready to merge tests

- use beforeEach
- await $emit
- remove unused spies
- narrow expectations
---
 .../states/mr_widget_ready_to_merge_spec.js   | 77 +++++--------------
 1 file changed, 20 insertions(+), 57 deletions(-)

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 026a3a7901effb..780352cfe84225 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
@@ -417,54 +417,35 @@ describe('ReadyToMerge', () => {
       describe('with squashing', () => {
         const NEW_SQUASH_MESSAGE = 'updated squash message';
 
-        it('sends the user-updated squash message', async () => {
+        beforeEach(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];
+        it('sends the user-updated squash message', async () => {
+          await triggerEditSquashInput(NEW_SQUASH_MESSAGE);
+          await findMergeButton().vm.$emit('click');
 
-          expect(params).toEqual(
+          expect(service.merge).toHaveBeenCalledWith(
             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();
+          await findMergeButton().vm.$emit('click');
 
-          const params = service.merge.mock.calls[0][0];
-
-          expect(params).toEqual(
+          expect(service.merge).toHaveBeenCalledTimes(1);
+          expect(service.merge).toHaveBeenCalledWith(
             expect.not.objectContaining({
-              squash_commit_message: expect.any(String),
+              squash_commit_message: expect.anything(),
             }),
           );
         });
@@ -473,49 +454,31 @@ describe('ReadyToMerge', () => {
       describe('without squashing', () => {
         const NEW_COMMIT_MESSAGE = 'updated commit message';
 
-        it('sends the user-updated commit message', async () => {
+        beforeEach(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
+        });
 
-          await triggerEditCommitInput();
+        it('sends the user-updated commit message', async () => {
           await triggerEditMergeInput(NEW_COMMIT_MESSAGE);
+          await findMergeButton().vm.$emit('click');
 
-          findMergeButton().vm.$emit('click');
-
-          await waitForPromises();
-
-          const params = service.merge.mock.calls[0][0];
-
-          expect(params).toEqual(
+          expect(service.merge).toHaveBeenCalledWith(
             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];
+          await findMergeButton().vm.$emit('click');
 
-          expect(params).toEqual(
+          expect(service.merge).toHaveBeenCalledTimes(1);
+          expect(service.merge).toHaveBeenCalledWith(
             expect.not.objectContaining({
-              commit_message: expect.any(String),
+              commit_message: expect.anything(),
             }),
           );
         });
-- 
GitLab