Rename ATMTWPS to MTWPS (EE)

This commit does a find-and-replace from ATMTWPS -> MTWPS.

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

 import {
   MT_MERGE_STRATEGY,
-  ATMTWPS_MERGE_STRATEGY,
+  MTWPS_MERGE_STRATEGY,
   MWPS_MERGE_STRATEGY,
 } from '~/vue_merge_request_widget/constants';
 import { s__ } from '~/locale';
@@ -15,10 +15,10 @@ export default {
       return s__('mrWidget|Set by');
     },
     statusTextAfterAuthor() {
-      if (this.mr.autoMergeStrategy === ATMTWPS_MERGE_STRATEGY && this.mr.mergeTrainsCount === 0) {
+      if (this.mr.autoMergeStrategy === MTWPS_MERGE_STRATEGY && this.mr.mergeTrainsCount === 0) {
         return s__('mrWidget|to start a merge train when the pipeline succeeds');
       } else if (
-        this.mr.autoMergeStrategy === ATMTWPS_MERGE_STRATEGY &&
+        this.mr.autoMergeStrategy === MTWPS_MERGE_STRATEGY &&
         this.mr.mergeTrainsCount !== 0
       ) {
         return s__('mrWidget|to be added to the merge train when the pipeline succeeds');

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

-import { ATMTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
+import { MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
 import { __ } from '~/locale';
 
 export default {
@@ -17,7 +17,7 @@ export default {
       );
     },
     autoMergeText() {
-      if (this.mr.preferredAutoMergeStrategy === ATMTWPS_MERGE_STRATEGY) {
+      if (this.mr.preferredAutoMergeStrategy === MTWPS_MERGE_STRATEGY) {
         if (this.mr.mergeTrainsCount === 0) {
           return __('Start merge train when pipeline succeeds');
         }

ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

@@ -13,7 +13,7 @@ import CEWidgetOptions from '~/vue_merge_request_widget/mr_widget_options.vue';
 import MrWidgetApprovals from './components/approvals/approvals.vue';
 import MrWidgetGeoSecondaryNode from './components/states/mr_widget_secondary_geo_node.vue';
 import MergeTrainHelperText from './components/merge_train_helper_text.vue';
-import { ATMTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
+import { MTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
 
 export default {
   components: {
@@ -141,7 +141,7 @@ export default {
         this.mr.pipeline &&
         _.isNumber(this.mr.pipeline.id) &&
         _.isString(this.mr.pipeline.path) &&
-        this.mr.preferredAutoMergeStrategy === ATMTWPS_MERGE_STRATEGY &&
+        this.mr.preferredAutoMergeStrategy === MTWPS_MERGE_STRATEGY &&
         !this.mr.autoMergeEnabled
       );
     },

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

@@ -4,7 +4,7 @@ import MRWidgetAutoMergeEnabled from '~/vue_merge_request_widget/components/stat
 import {
   MWPS_MERGE_STRATEGY,
   MT_MERGE_STRATEGY,
-  ATMTWPS_MERGE_STRATEGY,
+  MTWPS_MERGE_STRATEGY,
 } from '~/vue_merge_request_widget/constants';
 
 describe('MRWidgetAutoMergeEnabled', () => {
@@ -27,7 +27,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
     sha: '1EA2EZ34',
     targetBranchPath: '/foo/bar',
     targetBranch: 'foo',
-    autoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+    autoMergeStrategy: MTWPS_MERGE_STRATEGY,
   };
 
   const factory = (mrUpdates = {}) => {
@@ -55,8 +55,8 @@ describe('MRWidgetAutoMergeEnabled', () => {
         expect(vm.statusTextBeforeAuthor).toBe('Added to the merge train by');
       });
 
-      it('should return "Set by" if the ATMTWPS is selected', () => {
-        factory({ autoMergeStrategy: ATMTWPS_MERGE_STRATEGY });
+      it('should return "Set by" if the MTWPS is selected', () => {
+        factory({ autoMergeStrategy: MTWPS_MERGE_STRATEGY });
 
         expect(vm.statusTextBeforeAuthor).toBe('Set by');
       });
@@ -69,18 +69,18 @@ describe('MRWidgetAutoMergeEnabled', () => {
     });
 
     describe('statusTextAfterAuthor', () => {
-      it('should return "to start a merge train..." if ATMTWPS is selected and there is no existing merge train', () => {
+      it('should return "to start a merge train..." if MTWPS is selected and there is no existing merge train', () => {
         factory({
-          autoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+          autoMergeStrategy: MTWPS_MERGE_STRATEGY,
           mergeTrainsCount: 0,
         });
 
         expect(vm.statusTextAfterAuthor).toBe('to start a merge train when the pipeline succeeds');
       });
 
-      it('should return "to be added to the merge train..." if ATMTWPS is selected and there is an existing merge train', () => {
+      it('should return "to be added to the merge train..." if MTWPS is selected and there is an existing merge train', () => {
         factory({
-          autoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+          autoMergeStrategy: MTWPS_MERGE_STRATEGY,
           mergeTrainsCount: 1,
         });
 
@@ -99,8 +99,8 @@ describe('MRWidgetAutoMergeEnabled', () => {
     });
 
     describe('cancelButtonText', () => {
-      it('should return "Cancel start merge train" if ATMTWPS is selected', () => {
-        factory({ autoMergeStrategy: ATMTWPS_MERGE_STRATEGY });
+      it('should return "Cancel start merge train" if MTWPS is selected', () => {
+        factory({ autoMergeStrategy: MTWPS_MERGE_STRATEGY });
 
         expect(vm.cancelButtonText).toBe('Cancel automatic merge');
       });
@@ -120,9 +120,9 @@ describe('MRWidgetAutoMergeEnabled', () => {
   });
 
   describe('template', () => {
-    it('should render the status text as "...to start a merge train" if ATMTWPS is selected and there is no existing merge train', () => {
+    it('should render the status text as "...to start a merge train" if MTWPS is selected and there is no existing merge train', () => {
       factory({
-        autoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+        autoMergeStrategy: MTWPS_MERGE_STRATEGY,
         mergeTrainsCount: 0,
       });
 
@@ -131,9 +131,9 @@ describe('MRWidgetAutoMergeEnabled', () => {
       expect(statusText).toBe('to start a merge train when the pipeline succeeds');
     });
 
-    it('should render the status text as "...to be added to the merge train" ATMTWPS is selected and there is an existing merge train', () => {
+    it('should render the status text as "...to be added to the merge train" MTWPS is selected and there is an existing merge train', () => {
       factory({
-        autoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+        autoMergeStrategy: MTWPS_MERGE_STRATEGY,
         mergeTrainsCount: 1,
       });
 
@@ -142,8 +142,8 @@ 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 ATMTWPS is selected', () => {
-      factory({ autoMergeStrategy: ATMTWPS_MERGE_STRATEGY });
+    it('should render the cancel button as "Cancel automatic merge" if MTWPS is selected', () => {
+      factory({ autoMergeStrategy: MTWPS_MERGE_STRATEGY });
 
       const cancelButtonText = trimText(vm.$el.querySelector('.js-cancel-auto-merge').innerText);
 

ee/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js

@@ -3,7 +3,7 @@ import ReadyToMerge from '~/vue_merge_request_widget/components/states/ready_to_
 import {
   MWPS_MERGE_STRATEGY,
   MT_MERGE_STRATEGY,
-  ATMTWPS_MERGE_STRATEGY,
+  MTWPS_MERGE_STRATEGY,
 } from '~/vue_merge_request_widget/constants';
 
 describe('ReadyToMerge', () => {
@@ -96,18 +96,18 @@ describe('ReadyToMerge', () => {
         expect(vm.mergeButtonText).toEqual('Add to merge train');
       });
 
-      it('should return "Start merge train when pipeline succeeds" when the ATMTWPS auto merge strategy is available and there is no existing merge train', () => {
+      it('should return "Start merge train when pipeline succeeds" when the MTWPS auto merge strategy is available and there is no existing merge train', () => {
         factory({
-          preferredAutoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+          preferredAutoMergeStrategy: MTWPS_MERGE_STRATEGY,
           mergeTrainsCount: 0,
         });
 
         expect(vm.mergeButtonText).toEqual('Start merge train when pipeline succeeds');
       });
 
-      it('should return "Add to merge train when pipeline succeeds" when the ATMTWPS auto merge strategy is available and a merge train already exists', () => {
+      it('should return "Add to merge train when pipeline succeeds" when the MTWPS auto merge strategy is available and a merge train already exists', () => {
         factory({
-          preferredAutoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+          preferredAutoMergeStrategy: MTWPS_MERGE_STRATEGY,
           mergeTrainsCount: 1,
         });
 
@@ -124,7 +124,7 @@ describe('ReadyToMerge', () => {
 
       it('should return Start merge train when pipeline succeeds', () => {
         factory({
-          preferredAutoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+          preferredAutoMergeStrategy: MTWPS_MERGE_STRATEGY,
           mergeTrainsCount: 0,
         });
 
@@ -133,7 +133,7 @@ describe('ReadyToMerge', () => {
 
       it('should return Add to merge train when pipeline succeeds', () => {
         factory({
-          preferredAutoMergeStrategy: ATMTWPS_MERGE_STRATEGY,
+          preferredAutoMergeStrategy: MTWPS_MERGE_STRATEGY,
           mergeTrainsCount: 1,
         });
 

ee/spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js

@@ -29,7 +29,7 @@ import {
   sastBaseAllIssues,
   sastHeadAllIssues,
 } from 'ee_spec/vue_shared/security_reports/mock_data';
-import { ATMTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
+import { MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
 
 describe('ee merge request widget options', () => {
   let vm;
@@ -795,11 +795,11 @@ describe('ee merge request widget options', () => {
     });
 
     describe('shouldRenderMergeTrainHelperText', () => {
-      it('should return true if ATMTWPS is available and the user has not yet pressed the ATMTWPS button', () => {
+      it('should return true if MTWPS is available and the user has not yet pressed the MTWPS button', () => {
         vm = mountComponent(Component, {
           mrData: {
             ...mockData,
-            available_auto_merge_strategies: [ATMTWPS_MERGE_STRATEGY],
+            available_auto_merge_strategies: [MTWPS_MERGE_STRATEGY],
             auto_merge_enabled: false,
           },
         });
@@ -907,7 +907,7 @@ describe('ee merge request widget options', () => {
   describe('merge train helper text', () => {
     const getHelperTextElement = () => vm.$el.querySelector('.js-merge-train-helper-text');
 
-    it('does not render the merge train helpe text if the ATMTWPS strategy is not available', () => {
+    it('does not render the merge train helpe text if the MTWPS strategy is not available', () => {
       vm = mountComponent(Component, {
         mrData: {
           ...mockData,
@@ -928,7 +928,7 @@ describe('ee merge request widget options', () => {
       vm = mountComponent(Component, {
         mrData: {
           ...mockData,
-          available_auto_merge_strategies: [ATMTWPS_MERGE_STRATEGY],
+          available_auto_merge_strategies: [MTWPS_MERGE_STRATEGY],
           merge_trains_count: 2,
           merge_train_when_pipeline_succeeds_docs_path: 'path/to/help',
           pipeline: {
@@ -951,7 +951,7 @@ describe('ee merge request widget options', () => {
       vm = mountComponent(Component, {
         mrData: {
           ...mockData,
-          available_auto_merge_strategies: [ATMTWPS_MERGE_STRATEGY],
+          available_auto_merge_strategies: [MTWPS_MERGE_STRATEGY],
           merge_trains_count: 0,
           merge_train_when_pipeline_succeeds_docs_path: 'path/to/help',
           pipeline: {
@@ -974,7 +974,7 @@ describe('ee merge request widget options', () => {
       vm = mountComponent(Component, {
         mrData: {
           ...mockData,
-          available_auto_merge_strategies: [ATMTWPS_MERGE_STRATEGY],
+          available_auto_merge_strategies: [MTWPS_MERGE_STRATEGY],
           merge_train_when_pipeline_succeeds_docs_path: 'path/to/help',
           pipeline: {
             ...mockData.pipeline,
@@ -996,7 +996,7 @@ describe('ee merge request widget options', () => {
       vm = mountComponent(Component, {
         mrData: {
           ...mockData,
-          available_auto_merge_strategies: [ATMTWPS_MERGE_STRATEGY],
+          available_auto_merge_strategies: [MTWPS_MERGE_STRATEGY],
           merge_train_when_pipeline_succeeds_docs_path: 'path/to/help',
           pipeline: {
             ...mockData.pipeline,