Fix conflicts after rebasing

This commit is contained in:
Hongbo Wu
2022-08-04 21:56:38 +08:00
parent 73ce9072f3
commit f2319bd70d

View File

@ -12,14 +12,12 @@ import { User } from '../../src/entity/user'
import { Highlight, Page, PageContext } from '../../src/elastic/types'
import { getRepository } from '../../src/entity/utils'
import { deletePage, getPageById } from '../../src/elastic/pages'
import { addLabelInPage } from '../../src/elastic/labels'
import { createPubSubClient } from '../../src/datalayer/pubsub'
import {
addHighlightToPage,
getHighlightById,
} from '../../src/elastic/highlights'
import { refreshIndex } from '../../src/elastic'
import { after } from 'mocha'
describe('Labels API', () => {
const username = 'fakeUser'
@ -44,7 +42,6 @@ describe('Labels API', () => {
after(async () => {
// clean up
await deletePage(page.id, ctx)
await deleteTestUser(username)
})