From fb5d3cceb8d43f8c2dc22a5d8c74327e9397f2e8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 4 May 2023 12:17:18 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../lib/utils/confirm_via_gl_modal/confirm_action_spec.js | 2 ++ .../lib/utils/confirm_via_gl_modal/confirm_modal_spec.js | 14 ++++++++++++++ 2 files changed, 16 insertions(+) (limited to 'spec/frontend/lib') diff --git a/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_action_spec.js b/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_action_spec.js index 9b790e739fb..fab5a7b8844 100644 --- a/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_action_spec.js +++ b/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_action_spec.js @@ -66,6 +66,7 @@ describe('confirmAction', () => { modalHtmlMessage: 'Hello', title: 'title', hideCancel: true, + size: 'md', }; await renderRootComponent('', options); expect(modal.props()).toEqual( @@ -79,6 +80,7 @@ describe('confirmAction', () => { modalHtmlMessage: options.modalHtmlMessage, title: options.title, hideCancel: options.hideCancel, + size: 'md', }), ); }); diff --git a/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_modal_spec.js b/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_modal_spec.js index c135180c9df..9dcb850076c 100644 --- a/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_modal_spec.js +++ b/spec/frontend/lib/utils/confirm_via_gl_modal/confirm_modal_spec.js @@ -14,6 +14,7 @@ describe('Confirm Modal', () => { secondaryText, secondaryVariant, title, + size, hideCancel = false, } = {}) => { wrapper = mount(ConfirmModal, { @@ -24,6 +25,7 @@ describe('Confirm Modal', () => { secondaryVariant, hideCancel, title, + size, }, }); }; @@ -91,5 +93,17 @@ describe('Confirm Modal', () => { expect(findGlModal().props().title).toBe(title); }); + + it('should set modal size to `sm` by default', () => { + createComponent(); + + expect(findGlModal().props('size')).toBe('sm'); + }); + + it('should set modal size when `size` prop is set', () => { + createComponent({ size: 'md' }); + + expect(findGlModal().props('size')).toBe('md'); + }); }); }); -- cgit v1.2.3