diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 15:12:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 15:12:47 +0300 |
commit | c984b0faf409dbe91a7998260fe4b8299cf21ad4 (patch) | |
tree | b1e434732c9d94ecaab0727f56a811b80a61a371 /spec/frontend/notifications | |
parent | bd28d0fa02dc73794e013159512900f8d10fa10b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/notifications')
-rw-r--r-- | spec/frontend/notifications/components/custom_notifications_modal_spec.js | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/spec/frontend/notifications/components/custom_notifications_modal_spec.js b/spec/frontend/notifications/components/custom_notifications_modal_spec.js index 70749557e61..aee681e73c9 100644 --- a/spec/frontend/notifications/components/custom_notifications_modal_spec.js +++ b/spec/frontend/notifications/components/custom_notifications_modal_spec.js @@ -2,7 +2,6 @@ import { GlSprintf, GlModal, GlFormGroup, GlFormCheckbox, GlLoadingIcon } from ' import { shallowMount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { nextTick } from 'vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_OK } from '~/lib/utils/http_status'; @@ -87,24 +86,23 @@ describe('CustomNotificationsModal', () => { describe('checkbox items', () => { beforeEach(async () => { + const endpointUrl = '/api/v4/notification_settings'; + + mockAxios + .onGet(endpointUrl) + .reply(HTTP_STATUS_OK, mockNotificationSettingsResponses.default); + wrapper = createComponent(); - // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details - // eslint-disable-next-line no-restricted-syntax - wrapper.setData({ - events: [ - { id: 'new_release', enabled: true, name: 'New release', loading: false }, - { id: 'new_note', enabled: false, name: 'New note', loading: true }, - ], - }); + wrapper.findComponent(GlModal).vm.$emit('show'); - await nextTick(); + await waitForPromises(); }); it.each` index | eventId | eventName | enabled | loading ${0} | ${'new_release'} | ${'New release'} | ${true} | ${false} - ${1} | ${'new_note'} | ${'New note'} | ${false} | ${true} + ${1} | ${'new_note'} | ${'New note'} | ${false} | ${false} `( 'renders a checkbox for "$eventName" with checked=$enabled', async ({ index, eventName, enabled, loading }) => { @@ -214,16 +212,9 @@ describe('CustomNotificationsModal', () => { wrapper = createComponent({ injectedProperties }); - // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details - // eslint-disable-next-line no-restricted-syntax - wrapper.setData({ - events: [ - { id: 'new_release', enabled: true, name: 'New release', loading: false }, - { id: 'new_note', enabled: false, name: 'New note', loading: false }, - ], - }); + wrapper.findComponent(GlModal).vm.$emit('show'); - await nextTick(); + await waitForPromises(); findCheckboxAt(1).vm.$emit('change', true); @@ -241,19 +232,18 @@ describe('CustomNotificationsModal', () => { ); it('shows a toast message when the request fails', async () => { - mockAxios.onPut('/api/v4/notification_settings').reply(HTTP_STATUS_NOT_FOUND, {}); + const endpointUrl = '/api/v4/notification_settings'; + + mockAxios + .onGet(endpointUrl) + .reply(HTTP_STATUS_OK, mockNotificationSettingsResponses.default); + + mockAxios.onPut(endpointUrl).reply(HTTP_STATUS_NOT_FOUND, {}); wrapper = createComponent(); - // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details - // eslint-disable-next-line no-restricted-syntax - wrapper.setData({ - events: [ - { id: 'new_release', enabled: true, name: 'New release', loading: false }, - { id: 'new_note', enabled: false, name: 'New note', loading: false }, - ], - }); + wrapper.findComponent(GlModal).vm.$emit('show'); - await nextTick(); + await waitForPromises(); findCheckboxAt(1).vm.$emit('change', true); |