diff options
Diffstat (limited to 'spec/frontend')
12 files changed, 43 insertions, 78 deletions
diff --git a/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap b/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap index 8948a9926bb..1eb9ccc9c6c 100644 --- a/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap +++ b/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap @@ -4,6 +4,7 @@ exports[`AddContextCommitsModal renders modal with 2 tabs 1`] = ` <gl-modal-stub body-class="add-review-item pt-0" cancel-variant="light" + dismisslabel="Close" modalclass="" modalid="add-review-item" ok-disabled="true" diff --git a/spec/frontend/blob/pipeline_tour_success_modal_spec.js b/spec/frontend/blob/pipeline_tour_success_modal_spec.js index 75a8994be4d..d4562019302 100644 --- a/spec/frontend/blob/pipeline_tour_success_modal_spec.js +++ b/spec/frontend/blob/pipeline_tour_success_modal_spec.js @@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; import { GlSprintf, GlModal, GlLink } from '@gitlab/ui'; import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; +import { stubComponent } from 'helpers/stub_component'; import pipelineTourSuccess from '~/blob/pipeline_tour_success_modal.vue'; import modalProps from './pipeline_tour_success_mock_data'; @@ -15,7 +16,14 @@ describe('PipelineTourSuccessModal', () => { wrapper = shallowMount(pipelineTourSuccess, { propsData: modalProps, stubs: { - GlModal, + GlModal: stubComponent(GlModal, { + template: ` + <div> + <slot name="modal-title"></slot> + <slot></slot> + <slot name="modal-footer"></slot> + </div>`, + }), GlSprintf, GlEmoji, }, diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap index f0eb54c1b3a..79ad5ad1bb9 100644 --- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap +++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap @@ -52,6 +52,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] = </gl-button-stub> <gl-modal-stub + dismisslabel="Close" modalclass="" modalid="resetWebhookModal" ok-title="Reset webhook URL" diff --git a/spec/frontend/invite_members/components/invite_members_modal_spec.js b/spec/frontend/invite_members/components/invite_members_modal_spec.js index 4eb1db70b11..fc039bdf6da 100644 --- a/spec/frontend/invite_members/components/invite_members_modal_spec.js +++ b/spec/frontend/invite_members/components/invite_members_modal_spec.js @@ -68,7 +68,7 @@ describe('InviteMembersModal', () => { }); it('renders the modal with the correct title', () => { - expect(wrapper.attributes('title')).toBe('Invite team members'); + expect(wrapper.find(GlModal).props('title')).toBe('Invite team members'); }); it('renders the Cancel button text correctly', () => { diff --git a/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap b/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap index c51130dae00..b2df1ac5ab6 100644 --- a/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap +++ b/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap @@ -34,7 +34,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -95,7 +95,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no Composer packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -156,7 +156,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no Conan packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -217,7 +217,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no Generic packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -278,7 +278,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no Maven packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -339,7 +339,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no NPM packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -400,7 +400,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no NuGet packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> @@ -461,7 +461,7 @@ exports[`packages_list_app renders 1`] = ` class="svg-250 svg-content" > <img - alt="There are no PyPI packages yet" + alt="" class="gl-max-w-full" src="helpSvg" /> diff --git a/spec/frontend/pipelines/test_reports/test_case_details_spec.js b/spec/frontend/pipelines/test_reports/test_case_details_spec.js index 9e66012818e..bfb8b43778d 100644 --- a/spec/frontend/pipelines/test_reports/test_case_details_spec.js +++ b/spec/frontend/pipelines/test_reports/test_case_details_spec.js @@ -44,7 +44,7 @@ describe('Test case details', () => { }); it('renders the test case classname as modal title', () => { - expect(findModal().attributes('title')).toBe(defaultTestCase.classname); + expect(findModal().props('title')).toBe(defaultTestCase.classname); }); it('renders the test case name', () => { diff --git a/spec/frontend/profile/account/components/update_username_spec.js b/spec/frontend/profile/account/components/update_username_spec.js index 45e5e0f885f..91c3c81ab30 100644 --- a/spec/frontend/profile/account/components/update_username_spec.js +++ b/spec/frontend/profile/account/components/update_username_spec.js @@ -84,7 +84,7 @@ describe('UpdateUsername component', () => { it('confirmation modal contains proper header and body', async () => { const { modal } = findElements(); - expect(modal.attributes('title')).toBe('Change username?'); + expect(modal.props('title')).toBe('Change username?'); expect(modal.text()).toContain( `You are going to change the username ${defaultProps.initialUsername} to ${newUsername}`, ); diff --git a/spec/frontend/projects/components/__snapshots__/project_delete_button_spec.js.snap b/spec/frontend/projects/components/__snapshots__/project_delete_button_spec.js.snap index 4eb5060cb0a..0b9f095a700 100644 --- a/spec/frontend/projects/components/__snapshots__/project_delete_button_spec.js.snap +++ b/spec/frontend/projects/components/__snapshots__/project_delete_button_spec.js.snap @@ -31,6 +31,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = ` <gl-modal-stub actioncancel="[object Object]" actionprimary="[object Object]" + dismisslabel="Close" footer-class="gl-bg-gray-10 gl-p-5" modalclass="" modalid="fakeUniqueId" diff --git a/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap b/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap index 4630415f61c..dd54db7dc0a 100644 --- a/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap +++ b/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap @@ -29,24 +29,12 @@ exports[`Project remove modal intialized matches the snapshot 1`] = ` Delete project </gl-button-stub> - <b-modal-stub - canceltitle="Cancel" - cancelvariant="secondary" - footerclass="gl-bg-gray-10 gl-p-5" - headerclosecontent="×" - headercloselabel="Close" - id="delete-project-modal-2" - ignoreenforcefocusselector="" - lazy="true" - modalclass="gl-modal," - oktitle="OK" - okvariant="danger" - size="sm" - title="" - titleclass="gl-text-red-500" - titletag="h4" + <div + footer-class="gl-bg-gray-10 gl-p-5" + ok-variant="danger" + title-class="gl-text-red-500" > - + Delete project. Are you ABSOLUTELY SURE? <div> <p @@ -70,49 +58,6 @@ exports[`Project remove modal intialized matches the snapshot 1`] = ` /> </div> - - <template /> - - <template> - Delete project. Are you ABSOLUTELY SURE? - </template> - - <template /> - - <template /> - - <template /> - - <template> - <gl-button-stub - buttontextclasses="" - category="primary" - class="js-modal-action-cancel" - icon="" - size="medium" - variant="default" - > - - Cancel, keep project - - </gl-button-stub> - - <!----> - - <gl-button-stub - buttontextclasses="" - category="primary" - class="js-modal-action-primary" - disabled="true" - icon="" - size="medium" - variant="danger" - > - - Yes, delete project - - </gl-button-stub> - </template> - </b-modal-stub> + </div> </form> `; diff --git a/spec/frontend/projects/components/shared/delete_button_spec.js b/spec/frontend/projects/components/shared/delete_button_spec.js index a6394a50011..cf7e41a2df2 100644 --- a/spec/frontend/projects/components/shared/delete_button_spec.js +++ b/spec/frontend/projects/components/shared/delete_button_spec.js @@ -1,5 +1,6 @@ import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { stubComponent } from 'helpers/stub_component'; import SharedDeleteButton from '~/projects/components/shared/delete_button.vue'; jest.mock('~/lib/utils/csrf', () => ({ token: 'test-csrf-token' })); @@ -17,12 +18,19 @@ describe('Project remove modal', () => { formPath: 'some/path', }; - const createComponent = (data = {}) => { + const createComponent = (data = {}, stubs = {}) => { wrapper = shallowMount(SharedDeleteButton, { propsData: defaultProps, data: () => data, stubs: { - GlModal, + GlModal: stubComponent(GlModal, { + template: ` + <div> + <slot name="modal-title"></slot> + <slot></slot> + </div>`, + }), + ...stubs, }, }); }; @@ -52,7 +60,7 @@ describe('Project remove modal', () => { describe('when the user input does not match the confirmPhrase', () => { beforeEach(() => { - createComponent({ userInput: 'bar' }); + createComponent({ userInput: 'bar' }, { GlModal }); }); it('the confirm button is disabled', () => { @@ -62,7 +70,7 @@ describe('Project remove modal', () => { describe('when the user input matches the confirmPhrase', () => { beforeEach(() => { - createComponent({ userInput: defaultProps.confirmPhrase }); + createComponent({ userInput: defaultProps.confirmPhrase }, { GlModal }); }); it('the confirm button is not disabled', () => { diff --git a/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap b/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap index 02d5ca6bdb3..bd05eb69080 100644 --- a/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap +++ b/spec/frontend/self_monitor/components/__snapshots__/self_monitor_form_spec.js.snap @@ -60,6 +60,7 @@ exports[`self monitor component When the self monitor project has not been creat <gl-modal-stub cancel-title="Cancel" category="primary" + dismisslabel="Close" modalclass="" modalid="delete-self-monitor-modal" ok-title="Delete project" diff --git a/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap b/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap index 6b3d65ff037..4b827301943 100644 --- a/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap +++ b/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap @@ -3,7 +3,7 @@ exports[`EmptyStateComponent should render content 1`] = ` "<section class=\\"row empty-state text-center\\"> <div class=\\"col-12\\"> - <div class=\\"svg-250 svg-content\\"><img src=\\"/image.svg\\" alt=\\"Getting started with serverless\\" class=\\"gl-max-w-full\\"></div> + <div class=\\"svg-250 svg-content\\"><img src=\\"/image.svg\\" alt=\\"\\" class=\\"gl-max-w-full\\"></div> </div> <div class=\\"col-12\\"> <div class=\\"text-content gl-mx-auto gl-my-0 gl-p-5\\"> |