fix tests

This commit is contained in:
Hongbo Wu
2024-03-23 16:40:01 +08:00
parent 44c67e2ebf
commit 88a7e8d85b
31 changed files with 50 additions and 85 deletions

View File

@ -6,4 +6,3 @@ Dockerfile
.dockerignore
*.yaml
.secrets*.yaml
test

View File

@ -5,5 +5,13 @@
},
"rules": {
"@typescript-eslint/no-unsafe-argument": 0
},
"overrides": [
{
"files": ["test/**/*.ts"],
"rules": {
"@typescript-eslint/no-unsafe-member-access": 0
}
}
]
}

View File

@ -64,7 +64,9 @@ export const findUsersById = async (ids: string[]): Promise<User[]> => {
return userRepository.findBy({ id: In(ids) })
}
export const deleteUsers = async (criteria: FindOptionsWhere<User>) => {
export const deleteUsers = async (
criteria: FindOptionsWhere<User> | string[]
) => {
return authTrx(
async (t) => t.getRepository(User).delete(criteria),
undefined,

View File

@ -5,8 +5,12 @@ import sinon, { SinonFakeTimers } from 'sinon'
import { User } from '../../src/entity/user'
import { env } from '../../src/env'
import { userRepository } from '../../src/repository/user'
import { createFeature, createFeatures, deleteFeature } from '../../src/services/features'
import { deleteUser } from '../../src/services/user'
import {
createFeature,
createFeatures,
deleteFeature,
} from '../../src/services/features'
import { deleteUser, deleteUsers } from '../../src/services/user'
import { createTestUser } from '../db'
import { graphqlRequest, request } from '../util'
@ -21,7 +25,7 @@ describe('features resolvers', () => {
.post('/local/debug/fake-user-login')
.send({ fakeEmail: loginUser.email })
authToken = res.body.authToken
authToken = res.body.authToken as string
})
after(async () => {
@ -124,7 +128,7 @@ describe('features resolvers', () => {
after(async () => {
// reset opt-in users
Promise.all(users.map((user) => deleteUser(user.id)))
await deleteUsers(users.map((user) => user.id))
// reset feature
await deleteFeature({ name: featureName })
})

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default;
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] });

View File

@ -12,8 +12,8 @@ chai.use(chaiString)
describe('Test csv importer', () => {
let stub: ImportContext
beforeEach(async () => {
stub = await stubImportCtx()
beforeEach(() => {
stub = stubImportCtx()
})
afterEach(async () => {

View File

@ -17,7 +17,7 @@ describe('Load a simple _matter_history file', () => {
it('should find the URL of each row', async () => {
const urls: URL[] = []
const stream = fs.createReadStream('./test/matter/data/_matter_history.csv')
const stub = await stubImportCtx()
const stub = stubImportCtx()
stub.urlHandler = (ctx: ImportContext, url): Promise<void> => {
urls.push(url)
return Promise.resolve()
@ -38,7 +38,7 @@ describe('Load archive file', () => {
it('should find the URL of each row', async () => {
const urls: URL[] = []
const stream = fs.createReadStream('./test/matter/data/Archive.zip')
const stub = await stubImportCtx()
const stub = stubImportCtx()
stub.contentHandler = (
ctx: ImportContext,
url: URL,

View File

@ -2,8 +2,8 @@ import { Readability } from '@omnivore/readability'
import { ArticleSavingRequestStatus, ImportContext } from '../src'
import { createRedisClient } from '../src/redis'
export const stubImportCtx = async (): Promise<ImportContext> => {
const redisClient = await createRedisClient(process.env.REDIS_URL)
export const stubImportCtx = (): ImportContext => {
const redisClient = createRedisClient(process.env.REDIS_URL)
return {
userId: '',

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default;
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] });

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default;
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] });

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })

View File

@ -1,5 +1,4 @@
{
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "test/babel-register.js"
"spec": "test/**/*.test.ts"
}

View File

@ -1,3 +0,0 @@
const register = require('@babel/register').default
register({ extensions: ['.ts', '.tsx', '.js', '.jsx'] })