From 3befff61af0aa375193dfdcddc5e7732ed4f16ee Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 14 Apr 2022 13:22:21 +0800 Subject: [PATCH] fix tests --- packages/api/test/db.ts | 30 +++++++++---------- packages/api/test/resolvers/reminders.test.ts | 18 +++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/api/test/db.ts b/packages/api/test/db.ts index 182248196..d7b75c4c4 100644 --- a/packages/api/test/db.ts +++ b/packages/api/test/db.ts @@ -1,16 +1,16 @@ -import Postgrator from 'postgrator' -import { User } from '../src/entity/user' -import { Profile } from '../src/entity/profile' -import { Page } from '../src/entity/page' -import { Link } from '../src/entity/link' -import { Reminder } from '../src/entity/reminder' -import { NewsletterEmail } from '../src/entity/newsletter_email' -import { UserDeviceToken } from '../src/entity/user_device_tokens' -import { Label } from '../src/entity/label' -import { AppDataSource } from '../src/server' -import { getRepository } from '../src/entity/utils' -import { createUser } from '../src/services/create_user' -import { SnakeNamingStrategy } from 'typeorm-naming-strategies' +import Postgrator from "postgrator"; +import { User } from "../src/entity/user"; +import { Profile } from "../src/entity/profile"; +import { Page } from "../src/entity/page"; +import { Link } from "../src/entity/link"; +import { Reminder } from "../src/entity/reminder"; +import { NewsletterEmail } from "../src/entity/newsletter_email"; +import { UserDeviceToken } from "../src/entity/user_device_tokens"; +import { Label } from "../src/entity/label"; +import { AppDataSource } from "../src/server"; +import { getRepository } from "../src/entity/utils"; +import { createUser } from "../src/services/create_user"; +import { SnakeNamingStrategy } from "typeorm-naming-strategies"; const runMigrations = async () => { const migrationDirectory = __dirname + '/../../db/migrations' @@ -122,11 +122,11 @@ export const createTestLink = async (user: User, page: Page): Promise => { export const createTestReminder = async ( user: User, - link?: string + pageId?: string ): Promise => { return getRepository(Reminder).save({ user: user, - link: link, + elasticPageId: pageId, remindAt: new Date(), }) } diff --git a/packages/api/test/resolvers/reminders.test.ts b/packages/api/test/resolvers/reminders.test.ts index afc681338..907c5269a 100644 --- a/packages/api/test/resolvers/reminders.test.ts +++ b/packages/api/test/resolvers/reminders.test.ts @@ -1,7 +1,10 @@ -import { generateFakeUuid, graphqlRequest, request } from '../util' import { - createTestLink, - createTestPage, + createTestElasticPage, + generateFakeUuid, + graphqlRequest, + request, +} from '../util' +import { createTestReminder, createTestUser, deleteTestUser, @@ -14,17 +17,15 @@ import { ReminderErrorCode, UpdateReminderErrorCode, } from '../../src/generated/graphql' -import { Page } from '../../src/entity/page' -import { Link } from '../../src/entity/link' import { DateTime } from 'luxon' import 'mocha' +import { Page } from '../../src/elastic/types' describe('Reminders API', () => { const username = 'fakeUser' let authToken: string let page: Page - let link: Link let reminder: Reminder before(async () => { @@ -37,9 +38,8 @@ describe('Reminders API', () => { authToken = res.body.authToken // create page, link and reminders test data - page = await createTestPage() - link = await createTestLink(user, page) - reminder = await createTestReminder(user, link.id) + page = await createTestElasticPage(user) + reminder = await createTestReminder(user, page.id) }) after(async () => {