diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 06:08:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 06:08:02 +0300 |
commit | 173b547fb98ab12ae41f295915453e598be3a647 (patch) | |
tree | 2ade7b72b501275292e6984c6cba2cbaba9d9aa6 /spec/frontend | |
parent | a77c9fccd057514a8b78a10642779f54a22f3f76 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js | 28 |
1 files changed, 4 insertions, 24 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 1e4e089e7c1..080e3af5254 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 @@ -180,26 +180,6 @@ describe('ReadyToMerge', () => { expect(wrapper.vm.status).toEqual('failed'); }); }); - - describe('status icon', () => { - it('defaults to tick icon', () => { - createComponent({ mr: { mergeable: true } }); - - expect(wrapper.vm.iconClass).toEqual('success'); - }); - - it('shows tick for success status', () => { - createComponent({ mr: { pipeline: { status: 'SUCCESS' }, mergeable: true } }); - - expect(wrapper.vm.iconClass).toEqual('success'); - }); - - it('shows tick for pending status', () => { - createComponent({ mr: { pipeline: { active: true }, mergeable: true } }); - - expect(wrapper.vm.iconClass).toEqual('success'); - }); - }); }); describe('merge button text', () => { @@ -209,18 +189,18 @@ describe('ReadyToMerge', () => { expect(findMergeButton().text()).toBe('Merge'); }); - it('should return "Merge when pipeline succeeds" when the MWPS auto merge strategy is available', () => { + it('should return "Set auto-merge" when the MWPS auto merge strategy is available', () => { createComponent({ mr: { preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY }, }); - expect(findMergeButton().text()).toBe('Merge when pipeline succeeds'); + expect(findMergeButton().text()).toBe('Set auto-merge'); }); - it('should return Merge when pipeline succeeds', () => { + it('should return set auto-merge', () => { createComponent({ mr: { preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY } }); - expect(findMergeButton().text()).toBe('Merge when pipeline succeeds'); + expect(findMergeButton().text()).toBe('Set auto-merge'); }); }); |