Merge branch '283903-fix-inconsistent-cancel-merge-train-button-label' into 'master'

Resolve "Fix inconsistent cancel merge train button label"

See merge request gitlab-org/gitlab!61597

app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js

@@ -9,7 +9,7 @@ export default {
       return s__('mrWidget|to be merged automatically when the pipeline succeeds');
     },
     cancelButtonText() {
-      return s__('mrWidget|Cancel automatic merge');
+      return s__('mrWidget|Cancel');
     },
   },
 };

changelogs/unreleased/283903-fix-inconsistent-cancel-merge-train-button-label.yml

+---
+title: Fix inconsistent cancel merge train button label
+merge_request: 61597
+author:
+type: other

ee/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js

@@ -32,7 +32,7 @@ export default {
         return s__('mrWidget|Remove from merge train');
       }
 
-      return s__('mrWidget|Cancel automatic merge');
+      return s__('mrWidget|Cancel');
     },
   },
 };

ee/spec/features/merge_trains/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb

@@ -59,14 +59,14 @@ RSpec.describe 'User adds to merge train when pipeline succeeds', :js do
       within('.mr-widget-section') do
         expect(page).to have_content("Set by #{user.name} to start a merge train when the pipeline succeeds")
         expect(page).to have_content('The source branch will not be deleted')
-        expect(page).to have_link('Cancel automatic merge')
+        expect(page).to have_link('Cancel')
         expect(page).to have_link('Delete source branch')
       end
     end
 
-    context "when user clicks 'Cancel automatic merge' button" do
+    context "when user clicks 'Cancel' button" do
       before do
-        click_link 'Cancel automatic merge'
+        click_link 'Cancel'
       end
 
       it 'cancels automatic merge' do

ee/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js

@@ -99,7 +99,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
       it('should return "Cancel start merge train" if MTWPS is selected', () => {
         factory({ autoMergeStrategy: MTWPS_MERGE_STRATEGY });
 
-        expect(vm.cancelButtonText).toBe('Cancel automatic merge');
+        expect(vm.cancelButtonText).toBe('Cancel');
       });
 
       it('should return "Remove from merge train" if the pipeline has been added to the merge train', () => {
@@ -108,10 +108,10 @@ describe('MRWidgetAutoMergeEnabled', () => {
         expect(vm.cancelButtonText).toBe('Remove from merge train');
       });
 
-      it('should return "Cancel automatic merge" if MWPS is selected', () => {
+      it('should return "Cancel" if MWPS is selected', () => {
         factory({ autoMergeStrategy: MWPS_MERGE_STRATEGY });
 
-        expect(vm.cancelButtonText).toBe('Cancel automatic merge');
+        expect(vm.cancelButtonText).toBe('Cancel');
       });
     });
   });
@@ -139,12 +139,12 @@ describe('MRWidgetAutoMergeEnabled', () => {
       expect(statusText).toBe('to be added to the merge train when the pipeline succeeds');
     });
 
-    it('should render the cancel button as "Cancel automatic merge" if MTWPS is selected', () => {
+    it('should render the cancel button as "Cancel" if MTWPS is selected', () => {
       factory({ autoMergeStrategy: MTWPS_MERGE_STRATEGY });
 
       const cancelButtonText = wrapper.find('.js-cancel-auto-merge').text();
 
-      expect(cancelButtonText).toBe('Cancel automatic merge');
+      expect(cancelButtonText).toBe('Cancel');
     });
   });
 

locale/gitlab.pot

@@ -38651,7 +38651,7 @@ msgstr ""
 msgid "mrWidget|Are you adding technical debt or code vulnerabilities?"
 msgstr ""
 
-msgid "mrWidget|Cancel automatic merge"
+msgid "mrWidget|Cancel"
 msgstr ""
 
 msgid "mrWidget|Check out branch"

spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
       context 'when enabled after it was previously canceled' do
         before do
           click_button "Merge when pipeline succeeds"
-          click_link "Cancel automatic merge"
+          click_link "Cancel"
 
           wait_for_requests
 
@@ -87,7 +87,7 @@ RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
         before do
           merge_request.merge_params['force_remove_source_branch'] = '0'
           merge_request.save!
-          click_link "Cancel automatic merge"
+          click_link "Cancel"
         end
 
         it_behaves_like 'Merge when pipeline succeeds activator'
@@ -114,7 +114,7 @@ RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
     end
 
     it 'allows to cancel the automatic merge' do
-      click_link "Cancel automatic merge"
+      click_link "Cancel"
 
       expect(page).to have_button "Merge when pipeline succeeds"
 

spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb

@@ -147,7 +147,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
       context 'when detached merge request pipeline is pending' do
         it 'waits the head pipeline' do
           expect(page).to have_content('to be merged automatically when the pipeline succeeds')
-          expect(page).to have_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
 
@@ -174,7 +174,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
 
         it 'waits the head pipeline' do
           expect(page).to have_content('to be merged automatically when the pipeline succeeds')
-          expect(page).to have_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
     end
@@ -369,7 +369,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
       context 'when detached merge request pipeline is pending' do
         it 'waits the head pipeline' do
           expect(page).to have_content('to be merged automatically when the pipeline succeeds')
-          expect(page).to have_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
 
@@ -395,7 +395,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
 
         it 'waits the head pipeline' do
           expect(page).to have_content('to be merged automatically when the pipeline succeeds')
-          expect(page).to have_link('Cancel automatic merge')
+          expect(page).to have_link('Cancel')
         end
       end
     end

spec/frontend/vue_mr_widget/components/states/__snapshots__/mr_widget_auto_merge_enabled_spec.js.snap

@@ -46,7 +46,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is disabled template should have
       >
         <!---->
         
-          Cancel automatic merge
+          Cancel
         
       </a>
     </h4>
@@ -138,7 +138,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is enabled template should have c
       >
         <!---->
         
-          Cancel automatic merge
+          Cancel
         
       </a>
     </h4>

spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js

@@ -192,15 +192,13 @@ describe('MRWidgetAutoMergeEnabled', () => {
         });
 
         describe('cancelButtonText', () => {
-          it('should return "Cancel automatic merge" if MWPS is selected', () => {
+          it('should return "Cancel" if MWPS is selected', () => {
             factory({
               ...defaultMrProps(),
               autoMergeStrategy: MWPS_MERGE_STRATEGY,
             });
 
-            expect(wrapper.findByTestId('cancelAutomaticMergeButton').text()).toBe(
-              'Cancel automatic merge',
-            );
+            expect(wrapper.findByTestId('cancelAutomaticMergeButton').text()).toBe('Cancel');
           });
         });
       });
@@ -329,7 +327,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
           expect(statusText).toBe('to be merged automatically when the pipeline succeeds');
         });
 
-        it('should render the cancel button as "Cancel automatic merge" if MWPS is selected', () => {
+        it('should render the cancel button as "Cancel" if MWPS is selected', () => {
           factory({
             ...defaultMrProps(),
             autoMergeStrategy: MWPS_MERGE_STRATEGY,
@@ -337,7 +335,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
 
           const cancelButtonText = trimText(wrapper.find('.js-cancel-auto-merge').text());
 
-          expect(cancelButtonText).toBe('Cancel automatic merge');
+          expect(cancelButtonText).toBe('Cancel');
         });
       });
     });