diff --git a/backend/tests/integration/api/global-preferences/webhook.test.ts b/backend/tests/integration/api/global-preferences/webhook.test.ts index 5d8be86..9d01097 100644 --- a/backend/tests/integration/api/global-preferences/webhook.test.ts +++ b/backend/tests/integration/api/global-preferences/webhook.test.ts @@ -1,6 +1,8 @@ import { afterAll, afterEach, beforeAll, describe, expect, it } from '@jest/globals'; import { Request } from 'express'; +import { container } from '../../../../src/config/dependency-injector.config.js'; import { MEET_INITIAL_WEBHOOK_ENABLED, MEET_INITIAL_WEBHOOK_URL } from '../../../../src/environment.js'; +import { MeetStorageService } from '../../../../src/services/index.js'; import { expectValidationError } from '../../../helpers/assertion-helpers.js'; import { getWebbhookPreferences, @@ -10,21 +12,14 @@ import { } from '../../../helpers/request-helpers.js'; import { startWebhookServer, stopWebhookServer } from '../../../helpers/test-scenarios.js'; -const restoreDefaultWebhookPreferences = async () => { - const defaultPreferences = { - enabled: MEET_INITIAL_WEBHOOK_ENABLED === 'true', - url: MEET_INITIAL_WEBHOOK_URL - }; - await updateWebbhookPreferences(defaultPreferences); -}; - describe('Webhook Preferences API Tests', () => { beforeAll(() => { startTestServer(); }); afterEach(async () => { - await restoreDefaultWebhookPreferences(); + const storageService = container.get(MeetStorageService); + await storageService['initializeGlobalPreferences'](); }); describe('Update webhook preferences', () => { diff --git a/backend/tests/integration/webhooks/webhook.test.ts b/backend/tests/integration/webhooks/webhook.test.ts index d3d115d..8145c68 100644 --- a/backend/tests/integration/webhooks/webhook.test.ts +++ b/backend/tests/integration/webhooks/webhook.test.ts @@ -3,25 +3,24 @@ import { Request } from 'express'; import http from 'http'; import { container } from '../../../src/config/dependency-injector.config.js'; import { MeetStorageService } from '../../../src/services/index.js'; +import { MeetRecordingInfo, MeetRecordingStatus } from '../../../src/typings/ce/recording.model.js'; +import { MeetWebhookEvent, MeetWebhookEventType } from '../../../src/typings/ce/webhook.model.js'; import { - startTestServer, deleteAllRecordings, - sleep, - endMeeting, - updateWebbhookPreferences, deleteAllRooms, deleteRoom, - disconnectFakeParticipants + disconnectFakeParticipants, + endMeeting, + sleep, + startTestServer, + updateWebbhookPreferences } from '../../helpers/request-helpers.js'; -import { MeetWebhookEvent, MeetWebhookEventType } from '../../../src/typings/ce/webhook.model.js'; - import { setupSingleRoom, setupSingleRoomWithRecording, startWebhookServer, stopWebhookServer } from '../../helpers/test-scenarios.js'; -import { MeetRecordingInfo, MeetRecordingStatus } from '../../../src/typings/ce/recording.model.js'; describe('Webhook Integration Tests', () => { let receivedWebhooks: { headers: http.IncomingHttpHeaders; body: MeetWebhookEvent }[] = []; @@ -51,8 +50,8 @@ describe('Webhook Integration Tests', () => { afterAll(async () => { await stopWebhookServer(); - const defaultPreferences = await storageService['getDefaultPreferences'](); - await updateWebbhookPreferences(defaultPreferences.webhooksPreferences); + await storageService['initializeGlobalPreferences'](); + await disconnectFakeParticipants(); await Promise.all([deleteAllRooms(), deleteAllRecordings()]); });