From 8b848912c91dbde7e4d7a30c6347b69a49c79b0d Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 22 Feb 2024 12:03:58 +0800 Subject: [PATCH] fix tests --- packages/api/test/global-teardown.ts | 2 +- packages/api/test/gql/sanitize-directive.test.ts | 2 +- packages/api/test/routers/emails.test.ts | 4 ++-- packages/api/test/routers/pages.test.ts | 2 +- .../api/test/services/create_page_save_request.test.ts | 2 +- packages/api/test/services/highlights.test.ts | 6 +++--- packages/api/test/util.ts | 6 +++--- packages/api/test/utils/helper.test.ts | 2 +- packages/api/test/utils/parser.test.ts | 10 +++++----- packages/api/tsconfig.json | 8 ++------ 10 files changed, 20 insertions(+), 24 deletions(-) diff --git a/packages/api/test/global-teardown.ts b/packages/api/test/global-teardown.ts index 45b0760b6..922d5db46 100644 --- a/packages/api/test/global-teardown.ts +++ b/packages/api/test/global-teardown.ts @@ -15,7 +15,7 @@ export const mochaGlobalTeardown = async () => { console.log('redis connection closed') if (redisDataSource.workerRedisClient) { - stopWorker() + await stopWorker() console.log('worker closed') } } diff --git a/packages/api/test/gql/sanitize-directive.test.ts b/packages/api/test/gql/sanitize-directive.test.ts index 13a7c2119..a5f799635 100644 --- a/packages/api/test/gql/sanitize-directive.test.ts +++ b/packages/api/test/gql/sanitize-directive.test.ts @@ -26,7 +26,7 @@ describe('Sanitize Directive', () => { }) describe('Update user with a bio that is too long', () => { - let bio = ''.padStart(500, '*') + const bio = ''.padStart(500, '*') let query: string beforeEach(() => { diff --git a/packages/api/test/routers/emails.test.ts b/packages/api/test/routers/emails.test.ts index 18a181848..316a411ca 100644 --- a/packages/api/test/routers/emails.test.ts +++ b/packages/api/test/routers/emails.test.ts @@ -30,7 +30,7 @@ describe('Emails Router', () => { user = await createTestUser('fakeUser') newsletterEmail = await createNewsletterEmail(user.id) - token = process.env.PUBSUB_VERIFICATION_TOKEN! + token = process.env.PUBSUB_VERIFICATION_TOKEN || '' receivedEmail = await saveReceivedEmail( from, newsletterEmail.address, @@ -52,7 +52,7 @@ describe('Emails Router', () => { describe('forward', () => { const html = 'test html' - beforeEach(async () => { + beforeEach(() => { sinon.replace( sendNotification, 'sendMulticastPushNotifications', diff --git a/packages/api/test/routers/pages.test.ts b/packages/api/test/routers/pages.test.ts index a78da8f87..99e130991 100644 --- a/packages/api/test/routers/pages.test.ts +++ b/packages/api/test/routers/pages.test.ts @@ -1,5 +1,5 @@ -import { request } from '../util' import 'mocha' +import { request } from '../util' describe('Upload Router', () => { const token = process.env.PUBSUB_VERIFICATION_TOKEN || '' diff --git a/packages/api/test/services/create_page_save_request.test.ts b/packages/api/test/services/create_page_save_request.test.ts index 0164e20c4..39d99c265 100644 --- a/packages/api/test/services/create_page_save_request.test.ts +++ b/packages/api/test/services/create_page_save_request.test.ts @@ -1,5 +1,5 @@ -import 'mocha' import { expect } from 'chai' +import 'mocha' import { validateUrl } from '../../src/services/create_page_save_request' describe('validateUrl', () => { diff --git a/packages/api/test/services/highlights.test.ts b/packages/api/test/services/highlights.test.ts index 1a6a7221e..3bbd27bd3 100644 --- a/packages/api/test/services/highlights.test.ts +++ b/packages/api/test/services/highlights.test.ts @@ -1,12 +1,12 @@ -import 'mocha' import { expect } from 'chai' +import 'mocha' import { getHighlightLocation } from '../../src/services/highlights' describe('getHighlightLocation', () => { let patch: string let location: number - before(async () => { + before(() => { location = 109 patch = `@@ -${location + 1},16 +${location + 1},36 @@ . We're @@ -18,7 +18,7 @@ describe('getHighlightLocation', () => { coming` }) - it('returns highlight location from patch', async () => { + it('returns highlight location from patch', () => { const result = getHighlightLocation(patch) expect(result).to.eql(location) }) diff --git a/packages/api/test/util.ts b/packages/api/test/util.ts index 2cae36704..6717fdbe1 100644 --- a/packages/api/test/util.ts +++ b/packages/api/test/util.ts @@ -20,7 +20,7 @@ export const stopApolloServer = async () => { await apollo.stop() } -export const startWorker = async (connection: ConnectionOptions) => { +export const startWorker = (connection: ConnectionOptions) => { worker = createWorker(connection) queueEvents = new QueueEvents(QUEUE_NAME, { connection, @@ -28,8 +28,8 @@ export const startWorker = async (connection: ConnectionOptions) => { } export const stopWorker = async () => { - queueEvents.close() - worker.close() + await queueEvents.close() + await worker.close() } export const waitUntilJobsDone = async (jobs: Job[]) => { diff --git a/packages/api/test/utils/helper.test.ts b/packages/api/test/utils/helper.test.ts index 9cb5796f0..766f20834 100644 --- a/packages/api/test/utils/helper.test.ts +++ b/packages/api/test/utils/helper.test.ts @@ -1,5 +1,5 @@ -import 'mocha' import { expect } from 'chai' +import 'mocha' import { validatedDate } from '../../src/utils/helpers' describe('validatedDate', () => { diff --git a/packages/api/test/utils/parser.test.ts b/packages/api/test/utils/parser.test.ts index 939a1d17c..b981b13bb 100644 --- a/packages/api/test/utils/parser.test.ts +++ b/packages/api/test/utils/parser.test.ts @@ -1,7 +1,11 @@ -import 'mocha' import * as chai from 'chai' import { expect } from 'chai' +import chaiAsPromised from 'chai-as-promised' import fs from 'fs' +import 'mocha' +import nock from 'nock' +import { User } from '../../src/entity/user' +import { deleteUser } from '../../src/services/user' import { getTitleFromEmailSubject, isProbablyArticle, @@ -9,11 +13,7 @@ import { parsePageMetadata, parsePreparedContent, } from '../../src/utils/parser' -import nock from 'nock' -import chaiAsPromised from 'chai-as-promised' -import { User } from '../../src/entity/user' import { createTestUser } from '../db' -import { deleteUser } from '../../src/services/user' chai.use(chaiAsPromised) diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index ffa966215..ee1fb782a 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -6,10 +6,6 @@ "compilerOptions": { "outDir": "dist" }, - "include": [ - "src", - "test", - "../integration-handler/test/integrations.test.ts" - ], - "exclude": ["./src/generated", "./test"] + "include": ["src", "test"], + "exclude": ["./src/generated"] }