Skip to content

G
gitlab-ce
Commit 5cb10051 authored by Paul Slaughter's avatar Paul Slaughter
Browse files
Options

Merge branch '13479-rename-atmtwps-to-mtwps' into 'master' 

Resolve "Rename `ATMTWPS` to `MTWPS` in code"

Closes #13479

See merge request gitlab-org/gitlab-ee!15535
parents 160023d5 86e61771
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 49 deletions
app/assets/javascripts/vue_merge_request_widget/constants.js
View file @ 5cb10051
......@@ -5,11 +5,7 @@ export const WARNING_MESSAGE_CLASS = 'warning_message';
export const DANGER_MESSAGE_CLASS = 'danger_message';
export const MWPS_MERGE_STRATEGY = 'merge_when_pipeline_succeeds';
export const ATMTWPS_MERGE_STRATEGY = 'add_to_merge_train_when_pipeline_succeeds';
export const MTWPS_MERGE_STRATEGY = 'add_to_merge_train_when_pipeline_succeeds';
export const MT_MERGE_STRATEGY = 'merge_train';
export const AUTO_MERGE_STRATEGIES = [
MWPS_MERGE_STRATEGY,
ATMTWPS_MERGE_STRATEGY,
MT_MERGE_STRATEGY,
];
export const AUTO_MERGE_STRATEGIES = [MWPS_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY];
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ 5cb10051
......@@ -3,7 +3,7 @@ import _ from 'underscore';
import getStateKey from 'ee_else_ce/vue_merge_request_widget/stores/get_state_key';
import { stateKey } from './state_maps';
import { formatDate } from '../../lib/utils/datetime_utility';
import { ATMTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY, MWPS_MERGE_STRATEGY } from '../constants';
import { MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY, MWPS_MERGE_STRATEGY } from '../constants';
export default class MergeRequestStore {
constructor(data) {
......@@ -217,8 +217,8 @@ export default class MergeRequestStore {
}
static getPreferredAutoMergeStrategy(availableAutoMergeStrategies) {
if (_.includes(availableAutoMergeStrategies, ATMTWPS_MERGE_STRATEGY)) {
return ATMTWPS_MERGE_STRATEGY;
if (_.includes(availableAutoMergeStrategies, MTWPS_MERGE_STRATEGY)) {
return MTWPS_MERGE_STRATEGY;
} else if (_.includes(availableAutoMergeStrategies, MT_MERGE_STRATEGY)) {
return MT_MERGE_STRATEGY;
} else if (_.includes(availableAutoMergeStrategies, MWPS_MERGE_STRATEGY)) {
......
ee/app/assets/javascripts/vue_merge_request_widget/mixins/auto_merge.js
View file @ 5cb10051
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
View file @ 5cb10051
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
View file @ 5cb10051
......@@ -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
View file @ 5cb10051
......@@ -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
View file @ 5cb10051
......@@ -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
View file @ 5cb10051
......@@ -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,
......
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @ 5cb10051
......@@ -6,7 +6,7 @@ import CommitEdit from '~/vue_merge_request_widget/components/states/commit_edit
import CommitMessageDropdown from '~/vue_merge_request_widget/components/states/commit_message_dropdown.vue';
import eventHub from '~/vue_merge_request_widget/event_hub';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { MWPS_MERGE_STRATEGY, ATMTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
import { MWPS_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
const commitMessage = 'This is the commit message';
const squashCommitMessage = 'This is the squash commit message';
......@@ -164,7 +164,7 @@ describe('ReadyToMerge', () => {
});
it('returns info class for pending status', () => {
Vue.set(vm.mr, 'availableAutoMergeStrategies', [ATMTWPS_MERGE_STRATEGY]);
Vue.set(vm.mr, 'availableAutoMergeStrategies', [MTWPS_MERGE_STRATEGY]);
expect(vm.mergeButtonClass).toEqual(inActionClass);
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7