diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 6bcbbfc74..d22ef5f99 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -1,13 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { - testEnvironment, - createConfirmedUser, - headerPushMock, - cleanDB, - resetToken, -} from '@test/helpers' +import { testEnvironment, headerPushMock, cleanDB, resetToken } from '@test/helpers' +import { createConfirmedUser } from '@/seeds/factory/user' import { createUser, setPassword } from '@/seeds/graphql/mutations' import { login, logout } from '@/seeds/graphql/queries' import { GraphQLError } from 'graphql' diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts new file mode 100644 index 000000000..e38cb9a2d --- /dev/null +++ b/backend/src/seeds/factory/user.ts @@ -0,0 +1,19 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ + +import { createUser, setPassword } from '@/seeds/graphql/mutations' +import { User } from '@entity/User' +import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' + +export const createConfirmedUser = async (mutate: any, user: any) => { + // resetToken() + await mutate({ mutation: createUser, variables: user }) + const dbUser = await User.findOne({ where: { email: user.email } }) + if (!dbUser) throw new Error('Ups, no user found') + const optin = await LoginEmailOptIn.findOne({ where: { userId: dbUser.id } }) + if (!optin) throw new Error('Ups, no optin found') + await mutate({ + mutation: setPassword, + variables: { password: 'Aa12345_', code: optin.verificationCode }, + }) +} diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts index 95d1b3e59..51610b07e 100644 --- a/backend/test/helpers.ts +++ b/backend/test/helpers.ts @@ -4,9 +4,6 @@ import { createTestClient } from 'apollo-server-testing' import createServer from '../src/server/createServer' import { initialize } from '@dbTools/helpers' -import { createUser, setPassword } from '@/seeds/graphql/mutations' -import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' -import { User } from '@entity/User' import { entities } from '@entity/index' export const headerPushMock = jest.fn((t) => { @@ -46,19 +43,6 @@ export const resetEntity = async (entity: any) => { } } -export const createConfirmedUser = async (mutate: any, user: any) => { - // resetToken() - await mutate({ mutation: createUser, variables: user }) - const dbUser = await User.findOne({ where: { email: user.email } }) - if (!dbUser) throw new Error('Ups, no user found') - const optin = await LoginEmailOptIn.findOne({ where: { userId: dbUser.id } }) - if (!optin) throw new Error('Ups, no optin found') - await mutate({ - mutation: setPassword, - variables: { password: 'Aa12345_', code: optin.verificationCode }, - }) -} - export const resetToken = () => { context.token = '' }