diff --git a/frontend/src/components/form/api/__tests__/ApiCheckbox.spec.js b/frontend/src/components/form/api/__tests__/ApiCheckbox.spec.js index 42b77ba19a..0f511d9a04 100644 --- a/frontend/src/components/form/api/__tests__/ApiCheckbox.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiCheckbox.spec.js @@ -2,6 +2,7 @@ import ApiCheckbox from '../ApiCheckbox.vue' import ApiWrapper from '@/components/form/api/ApiWrapper.vue' import Vue from 'vue' import Vuetify from 'vuetify' +import { vi } from 'vitest' import flushPromises from 'flush-promises' import formBaseComponents from '@/plugins/formBaseComponents' import merge from 'lodash/merge' @@ -26,7 +27,7 @@ describe('An ApiCheckbox', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() wrapper.destroy() }) diff --git a/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js b/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js index f420b0616b..34f6f07439 100644 --- a/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiColorPicker.spec.js @@ -5,6 +5,7 @@ import user from '@testing-library/user-event' import { ApiMock } from '@/components/form/api/__tests__/ApiMock' import { extend } from 'vee-validate' import { regex } from 'vee-validate/dist/rules' +import { vi } from 'vitest' extend('regex', regex) @@ -22,7 +23,7 @@ describe('An ApiColorPicker', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() }) test('triggers api.patch and status update if input changes', async () => { diff --git a/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js b/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js index 259f3cfbd5..8c201698ad 100644 --- a/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiDatePicker.spec.js @@ -2,6 +2,7 @@ import ApiDatePicker from '../ApiDatePicker.vue' import { screen, waitFor } from '@testing-library/vue' import { render, setTestLocale } from '@/test/renderWithVuetify.js' import user from '@testing-library/user-event' +import { vi } from 'vitest' import { ApiMock } from '@/components/form/api/__tests__/ApiMock' describe('An ApiDatePicker', () => { @@ -19,7 +20,7 @@ describe('An ApiDatePicker', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() }) it('triggers api.patch and status update if input changes', async () => { diff --git a/frontend/src/components/form/api/__tests__/ApiSelect.spec.js b/frontend/src/components/form/api/__tests__/ApiSelect.spec.js index c0dddb78e1..7f06dee49d 100644 --- a/frontend/src/components/form/api/__tests__/ApiSelect.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiSelect.spec.js @@ -10,6 +10,7 @@ import flushPromises from 'flush-promises' import ApiWrapper from '@/components/form/api/ApiWrapper.vue' import { i18n } from '@/plugins' import merge from 'lodash/merge' +import { vi } from 'vitest' import { ApiMock } from '@/components/form/api/__tests__/ApiMock' import { waitForDebounce } from '@/test/util' @@ -40,7 +41,7 @@ describe('An ApiSelect', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() wrapper.destroy() }) diff --git a/frontend/src/components/form/api/__tests__/ApiSwitch.spec.js b/frontend/src/components/form/api/__tests__/ApiSwitch.spec.js index 76df733769..ded2c53138 100644 --- a/frontend/src/components/form/api/__tests__/ApiSwitch.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiSwitch.spec.js @@ -2,6 +2,7 @@ import ApiSwitch from '../ApiSwitch.vue' import ApiWrapper from '@/components/form/api/ApiWrapper.vue' import Vue from 'vue' import Vuetify from 'vuetify' +import { vi } from 'vitest' import flushPromises from 'flush-promises' import formBaseComponents from '@/plugins/formBaseComponents' import merge from 'lodash/merge' @@ -26,7 +27,7 @@ describe('An ApiSwitch', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() wrapper.destroy() }) diff --git a/frontend/src/components/form/api/__tests__/ApiTextField.spec.js b/frontend/src/components/form/api/__tests__/ApiTextField.spec.js index 729655f5b0..cd5127cbd7 100644 --- a/frontend/src/components/form/api/__tests__/ApiTextField.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiTextField.spec.js @@ -2,6 +2,7 @@ import ApiTextField from '../ApiTextField.vue' import ApiWrapper from '@/components/form/api/ApiWrapper.vue' import Vue from 'vue' import Vuetify from 'vuetify' +import { vi } from 'vitest' import flushPromises from 'flush-promises' import formBaseComponents from '@/plugins/formBaseComponents' import merge from 'lodash/merge' @@ -30,7 +31,7 @@ describe('An ApiTextField', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() wrapper.destroy() }) diff --git a/frontend/src/components/form/api/__tests__/ApiTextarea.spec.js b/frontend/src/components/form/api/__tests__/ApiTextarea.spec.js index 9d9340e084..f97233a287 100644 --- a/frontend/src/components/form/api/__tests__/ApiTextarea.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiTextarea.spec.js @@ -2,6 +2,7 @@ import ApiTextarea from '@/components/form/api/ApiTextarea.vue' import ApiWrapper from '@/components/form/api/ApiWrapper.vue' import Vue from 'vue' import Vuetify from 'vuetify' +import { vi } from 'vitest' import flushPromises from 'flush-promises' import formBaseComponents from '@/plugins/formBaseComponents' import merge from 'lodash/merge' @@ -32,7 +33,7 @@ describe('An ApiTextarea', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() wrapper.destroy() }) diff --git a/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js b/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js index ff904ce248..aba12f1856 100644 --- a/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiTimePicker.spec.js @@ -3,6 +3,7 @@ import { screen, waitFor } from '@testing-library/vue' import { render, setTestLocale } from '@/test/renderWithVuetify.js' import user from '@testing-library/user-event' import { ApiMock } from '@/components/form/api/__tests__/ApiMock' +import { vi } from 'vitest' describe('An ApiTimePicker', () => { let apiMock @@ -19,7 +20,7 @@ describe('An ApiTimePicker', () => { }) afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() }) it('triggers api.patch and status update if input changes', async () => { diff --git a/frontend/src/components/form/api/__tests__/ApiWrapper.spec.js b/frontend/src/components/form/api/__tests__/ApiWrapper.spec.js index 4910424445..eac4ac56cc 100644 --- a/frontend/src/components/form/api/__tests__/ApiWrapper.spec.js +++ b/frontend/src/components/form/api/__tests__/ApiWrapper.spec.js @@ -99,7 +99,7 @@ describe('Testing ApiWrapper [autoSave=true; manual external value]', () => { wrapper = shallowMount(ApiWrapper, config) vm = wrapper.vm - apiPatch = jest.spyOn(config.mocks.api, 'patch') + apiPatch = vi.spyOn(config.mocks.api, 'patch') validateCalled = new Promise((resolve) => (validateResolveFunction = resolve)) diff --git a/frontend/src/components/form/base/__tests__/ECheckbox.spec.js b/frontend/src/components/form/base/__tests__/ECheckbox.spec.js index c09770c48a..b0c31e76eb 100644 --- a/frontend/src/components/form/base/__tests__/ECheckbox.spec.js +++ b/frontend/src/components/form/base/__tests__/ECheckbox.spec.js @@ -4,6 +4,7 @@ import Vuetify from 'vuetify' import formBaseComponents from '@/plugins/formBaseComponents' import { mount as mountComponent } from '@vue/test-utils' +import { vi } from 'vitest' import ECheckbox from '../ECheckbox.vue' Vue.use(Vuetify) @@ -78,7 +79,7 @@ describe('An ECheckbox', () => { await input.trigger('click') expect(wrapper.vm.data).toBe(true) - jest.resetAllMocks() + vi.resetAllMocks() await input.trigger('click') expect(wrapper.vm.data).toBe(false) }) diff --git a/frontend/src/components/form/base/__tests__/ESwitch.spec.js b/frontend/src/components/form/base/__tests__/ESwitch.spec.js index 94ab8d13aa..9547af64ea 100644 --- a/frontend/src/components/form/base/__tests__/ESwitch.spec.js +++ b/frontend/src/components/form/base/__tests__/ESwitch.spec.js @@ -4,6 +4,7 @@ import Vuetify from 'vuetify' import formBaseComponents from '@/plugins/formBaseComponents' import { mount as mountComponent } from '@vue/test-utils' +import { vi } from 'vitest' import ESwitch from '@/components/form/base/ESwitch.vue' import { touch } from '@/test/util' @@ -88,7 +89,7 @@ describe('An ESwitch', () => { touch(wrapper.find('.v-input--selection-controls__ripple')).start(0, 0).end(20, 0) expect(wrapper.vm.data).toBe(true) - jest.resetAllMocks() + vi.resetAllMocks() touch(wrapper.find('.v-input--selection-controls__ripple')).start(0, 0).end(-20, 0) expect(wrapper.vm.data).toBe(false) }) @@ -103,7 +104,7 @@ describe('An ESwitch', () => { input.trigger('keydown.right') expect(wrapper.vm.data).toBe(true) - jest.resetAllMocks() + vi.resetAllMocks() input.trigger('keydown.left') expect(wrapper.vm.data).toBe(false) }) diff --git a/frontend/src/helpers/__tests__/serverError.spec.js b/frontend/src/helpers/__tests__/serverError.spec.js index d16f05e75e..1002587796 100644 --- a/frontend/src/helpers/__tests__/serverError.spec.js +++ b/frontend/src/helpers/__tests__/serverError.spec.js @@ -1,6 +1,7 @@ import { transformViolations } from '@/helpers/serverError' import cloneDeep from 'lodash/cloneDeep' import { fallbackLocale } from '@/plugins/i18n' +import { vi } from 'vitest' describe('transformViolations', () => { describe('without i18n', () => { @@ -31,8 +32,8 @@ describe('transformViolations', () => { }) describe('with i18n', () => { - const te = jest.fn() - const tc = jest.fn() + const te = vi.fn() + const tc = vi.fn() const i18n = { te, tc } beforeEach(() => { diff --git a/frontend/src/plugins/__tests__/auth.spec.js b/frontend/src/plugins/__tests__/auth.spec.js index d45381843b..5f06cdb504 100644 --- a/frontend/src/plugins/__tests__/auth.spec.js +++ b/frontend/src/plugins/__tests__/auth.spec.js @@ -63,7 +63,7 @@ vi.mock('@/router', async () => { describe('authentication logic', () => { afterEach(() => { - jest.restoreAllMocks() + vi.restoreAllMocks() Cookies.remove('localhost_jwt_hp') window.environment = cloneDeep(envBackup) }) @@ -110,7 +110,7 @@ describe('authentication logic', () => { it('sends a POST request to the API', async () => { // given store.replaceState(createState()) - jest.spyOn(apiStore, 'post').mockImplementation(async () => {}) + vi.spyOn(apiStore, 'post').mockImplementation(async () => {}) // when await auth.register({ email: 'bar', password: 'baz' }) @@ -128,7 +128,7 @@ describe('authentication logic', () => { it('resolves to true if the user successfully logs in', async () => { // given store.replaceState(createState()) - jest.spyOn(apiStore, 'post').mockImplementation(async () => { + vi.spyOn(apiStore, 'post').mockImplementation(async () => { Cookies.set('localhost_jwt_hp', validJWTPayload) }) @@ -146,7 +146,7 @@ describe('authentication logic', () => { it('resolves to false if the login fails', async () => { // given - jest.spyOn(apiStore, 'post').mockImplementation(async () => { + vi.spyOn(apiStore, 'post').mockImplementation(async () => { // login fails, no cookie added }) @@ -167,7 +167,7 @@ describe('authentication logic', () => { it('resolves to null if not logged in', async () => { // given store.replaceState(createState()) - jest.spyOn(apiStore, 'get') + vi.spyOn(apiStore, 'get') // when const result = await auth.loadUser() @@ -181,7 +181,7 @@ describe('authentication logic', () => { // given store.replaceState(createState()) Cookies.set('localhost_jwt_hp', validJWTPayload) - jest.spyOn(apiStore, 'get') + vi.spyOn(apiStore, 'get') // when const result = await auth.loadUser() @@ -208,8 +208,8 @@ describe('authentication logic', () => { }), }, } - jest.spyOn(apiStore, 'get').mockImplementation(() => user) - jest.spyOn(auth, 'logout') + vi.spyOn(apiStore, 'get').mockImplementation(() => user) + vi.spyOn(auth, 'logout') // when const result = await auth.loadUser() diff --git a/frontend/src/views/camp/__tests__/Dashboard.spec.js b/frontend/src/views/camp/__tests__/Dashboard.spec.js index e98272b576..7a4d32db2c 100644 --- a/frontend/src/views/camp/__tests__/Dashboard.spec.js +++ b/frontend/src/views/camp/__tests__/Dashboard.spec.js @@ -1,5 +1,6 @@ import Dashboard from '../Dashboard.vue' import { shallowMount } from '@vue/test-utils' +import { vi } from 'vitest' describe('Dashboard view', () => { it('Renders View', async () => { @@ -29,10 +30,10 @@ const ROUTE = () => ({ query: {}, }) const ROUTER = () => ({ - replace: jest.fn(), + replace: vi.fn(), }) const AUTH = { - loadUser: jest.fn(), + loadUser: vi.fn(), } function createCampWithRole(role) {