diff options
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states')
10 files changed, 26 insertions, 38 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/__snapshots__/mr_widget_auto_merge_enabled_spec.js.snap b/spec/frontend/vue_mr_widget/components/states/__snapshots__/mr_widget_auto_merge_enabled_spec.js.snap index 5981d2d7849..56a0218b374 100644 --- a/spec/frontend/vue_mr_widget/components/states/__snapshots__/mr_widget_auto_merge_enabled_spec.js.snap +++ b/spec/frontend/vue_mr_widget/components/states/__snapshots__/mr_widget_auto_merge_enabled_spec.js.snap @@ -50,7 +50,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is disabled template should have <span class="gl-mr-3" > - The source branch will not be deleted + Does not delete the source branch </span> <gl-button-stub @@ -122,7 +122,7 @@ exports[`MRWidgetAutoMergeEnabled when graphql is enabled template should have c <span class="gl-mr-3" > - The source branch will not be deleted + Does not delete the source branch </span> <gl-button-stub diff --git a/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap b/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap index a6c36764c41..f9936f22ea3 100644 --- a/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap +++ b/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap @@ -9,7 +9,7 @@ exports[`New ready to merge state component renders permission text if canMerge /> <p - class="media-body gl-m-0! gl-font-weight-bold" + class="media-body gl-m-0! gl-font-weight-bold gl-text-gray-900!" > Ready to merge by members who can write to the target branch. @@ -27,7 +27,7 @@ exports[`New ready to merge state component renders permission text if canMerge /> <p - class="media-body gl-m-0! gl-font-weight-bold" + class="media-body gl-m-0! gl-font-weight-bold gl-text-gray-900!" > Ready to merge! diff --git a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js index 8214cedc4a1..f965fc32dc1 100644 --- a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js @@ -3,6 +3,7 @@ import CommitEdit from '~/vue_merge_request_widget/components/states/commit_edit const testCommitMessage = 'Test commit message'; const testLabel = 'Test label'; +const testTextMuted = 'Test text muted'; const testInputId = 'test-input-id'; describe('Commits edit component', () => { @@ -63,7 +64,7 @@ describe('Commits edit component', () => { beforeEach(() => { createComponent({ header: `<div class="test-header">${testCommitMessage}</div>`, - checkbox: `<label class="test-checkbox">${testLabel}</label >`, + 'text-muted': `<p class="test-text-muted">${testTextMuted}</p>`, }); }); @@ -74,11 +75,11 @@ describe('Commits edit component', () => { expect(headerSlotElement.text()).toBe(testCommitMessage); }); - it('renders checkbox slot correctly', () => { - const checkboxSlotElement = wrapper.find('.test-checkbox'); + it('renders text-muted slot correctly', () => { + const textMutedElement = wrapper.find('.test-text-muted'); - expect(checkboxSlotElement.exists()).toBe(true); - expect(checkboxSlotElement.text()).toBe(testLabel); + expect(textMutedElement.exists()).toBe(true); + expect(textMutedElement.text()).toBe(testTextMuted); }); }); }); diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js index 4c1534574f5..d0a6af9970e 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js @@ -270,8 +270,8 @@ describe('MRWidgetAutoMergeEnabled', () => { const normalizedText = wrapper.text().replace(/\s+/g, ' '); - expect(normalizedText).toContain('The source branch will be deleted'); - expect(normalizedText).not.toContain('The source branch will not be deleted'); + expect(normalizedText).toContain('Deletes the source branch'); + expect(normalizedText).not.toContain('Does not delete the source branch'); }); it('should not show delete source branch button when user not able to delete source branch', () => { diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js index 2ff94a547f4..5858654e518 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js @@ -1,4 +1,4 @@ -import { shallowMount } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; import CommitsHeader from '~/vue_merge_request_widget/components/states/commits_header.vue'; @@ -6,7 +6,7 @@ describe('Commits header component', () => { let wrapper; const createComponent = (props) => { - wrapper = shallowMount(CommitsHeader, { + wrapper = mount(CommitsHeader, { stubs: { GlSprintf, }, diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js index 9c3a6d581e8..e0f1f091129 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js @@ -191,7 +191,7 @@ describe('MRWidgetMerged', () => { }); it('shows button to copy commit SHA to clipboard', () => { - expect(selectors.copyMergeShaButton).toExist(); + expect(selectors.copyMergeShaButton).not.toBe(null); expect(selectors.copyMergeShaButton.getAttribute('data-clipboard-text')).toBe( vm.mr.mergeCommitSha, ); @@ -201,14 +201,14 @@ describe('MRWidgetMerged', () => { vm.mr.mergeCommitSha = null; Vue.nextTick(() => { - expect(selectors.copyMergeShaButton).not.toExist(); + expect(selectors.copyMergeShaButton).toBe(null); expect(vm.$el.querySelector('.mr-info-list').innerText).not.toContain('with'); done(); }); }); it('shows merge commit SHA link', () => { - expect(selectors.mergeCommitShaLink).toExist(); + expect(selectors.mergeCommitShaLink).not.toBe(null); expect(selectors.mergeCommitShaLink.text).toContain(vm.mr.shortMergeCommitSha); expect(selectors.mergeCommitShaLink.href).toBe(vm.mr.mergeCommitPath); }); diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js index b6c16958993..e6b2e9fa176 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js @@ -42,7 +42,7 @@ describe('MRWidgetMerging', () => { .trim() .replace(/\s\s+/g, ' ') .replace(/[\r\n]+/g, ' '), - ).toEqual('The changes will be merged into branch'); + ).toEqual('Merges changes into branch'); expect(wrapper.find('a').attributes('href')).toBe('/branch-path'); }); diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index f0fbb1d5851..016b6b2220b 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -269,19 +269,6 @@ describe('ReadyToMerge', () => { }); describe('methods', () => { - describe('updateMergeCommitMessage', () => { - it('should revert flag and change commitMessage', () => { - createComponent(); - - wrapper.vm.updateMergeCommitMessage(true); - - expect(wrapper.vm.commitMessage).toEqual(commitMessageWithDescription); - wrapper.vm.updateMergeCommitMessage(false); - - expect(wrapper.vm.commitMessage).toEqual(commitMessage); - }); - }); - describe('handleMergeButtonClick', () => { const returnPromise = (status) => new Promise((resolve) => { diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js index 8ead0002950..6abdbd11f5e 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js @@ -1,4 +1,4 @@ -import { GlFormCheckbox } from '@gitlab/ui'; +import { GlFormCheckbox, GlLink } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import SquashBeforeMerge from '~/vue_merge_request_widget/components/states/squash_before_merge.vue'; import { SQUASH_BEFORE_MERGE } from '~/vue_merge_request_widget/i18n'; @@ -77,7 +77,7 @@ describe('Squash before merge component', () => { value: false, }); - const aboutLink = wrapper.find('a'); + const aboutLink = wrapper.findComponent(GlLink); expect(aboutLink.exists()).toBe(false); }); @@ -88,7 +88,7 @@ describe('Squash before merge component', () => { helpPath: 'test-path', }); - const aboutLink = wrapper.find('a'); + const aboutLink = wrapper.findComponent(GlLink); expect(aboutLink.exists()).toBe(true); }); @@ -99,7 +99,7 @@ describe('Squash before merge component', () => { helpPath: 'test-path', }); - const aboutLink = wrapper.find('a'); + const aboutLink = wrapper.findComponent(GlLink); expect(aboutLink.attributes('href')).toEqual('test-path'); }); diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js index be15e4df66d..0fb0d5b0b68 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js @@ -46,7 +46,7 @@ describe('Wip', () => { is_new_mr_data: true, }; - describe('handleRemoveWIP', () => { + describe('handleRemoveDraft', () => { it('should make a request to service and handle response', (done) => { const vm = createComponent(); @@ -59,7 +59,7 @@ describe('Wip', () => { }), ); - vm.handleRemoveWIP(); + vm.handleRemoveDraft(); setImmediate(() => { expect(vm.isMakingRequest).toBeTruthy(); expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); @@ -84,7 +84,7 @@ describe('Wip', () => { expect(el.innerText).toContain('This merge request is still a draft.'); expect(el.querySelector('button').getAttribute('disabled')).toBeTruthy(); expect(el.querySelector('button').innerText).toContain('Merge'); - expect(el.querySelector('.js-remove-wip').innerText.replace(/\s\s+/g, ' ')).toContain( + expect(el.querySelector('.js-remove-draft').innerText.replace(/\s\s+/g, ' ')).toContain( 'Mark as ready', ); }); @@ -93,7 +93,7 @@ describe('Wip', () => { vm.mr.removeWIPPath = ''; Vue.nextTick(() => { - expect(el.querySelector('.js-remove-wip')).toEqual(null); + expect(el.querySelector('.js-remove-draft')).toEqual(null); done(); }); }); |