mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 01:56:46 +00:00
refactor: Upgrade typeorm to 0.3.x (#5151)
This commit is contained in:
committed by
GitHub
parent
6608e69457
commit
0a5ab560b1
@@ -18,15 +18,13 @@ import type { AuthAgent } from './shared/types';
|
||||
import * as utils from './shared/utils';
|
||||
|
||||
let app: express.Application;
|
||||
let testDbName = '';
|
||||
let globalOwnerRole: Role;
|
||||
let globalMemberRole: Role;
|
||||
let authAgent: AuthAgent;
|
||||
|
||||
beforeAll(async () => {
|
||||
app = await utils.initTestServer({ endpointGroups: ['me'], applyAuth: true });
|
||||
const initResult = await testDb.init();
|
||||
testDbName = initResult.testDbName;
|
||||
await testDb.init();
|
||||
|
||||
globalOwnerRole = await testDb.getGlobalOwnerRole();
|
||||
globalMemberRole = await testDb.getGlobalMemberRole();
|
||||
@@ -38,12 +36,12 @@ beforeAll(async () => {
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await testDb.terminate(testDbName);
|
||||
await testDb.terminate();
|
||||
});
|
||||
|
||||
describe('Owner shell', () => {
|
||||
beforeEach(async () => {
|
||||
await testDb.truncate(['User'], testDbName);
|
||||
await testDb.truncate(['User']);
|
||||
});
|
||||
|
||||
test('GET /me should return sanitized owner shell', async () => {
|
||||
@@ -113,7 +111,7 @@ describe('Owner shell', () => {
|
||||
expect(globalRole.scope).toBe('global');
|
||||
expect(apiKey).toBeUndefined();
|
||||
|
||||
const storedOwnerShell = await Db.collections.User.findOneOrFail(id);
|
||||
const storedOwnerShell = await Db.collections.User.findOneByOrFail({ id });
|
||||
|
||||
expect(storedOwnerShell.email).toBe(validPayload.email.toLowerCase());
|
||||
expect(storedOwnerShell.firstName).toBe(validPayload.firstName);
|
||||
@@ -129,7 +127,7 @@ describe('Owner shell', () => {
|
||||
const response = await authOwnerShellAgent.patch('/me').send(invalidPayload);
|
||||
expect(response.statusCode).toBe(400);
|
||||
|
||||
const storedOwnerShell = await Db.collections.User.findOneOrFail();
|
||||
const storedOwnerShell = await Db.collections.User.findOneByOrFail({});
|
||||
expect(storedOwnerShell.email).toBeNull();
|
||||
expect(storedOwnerShell.firstName).toBeNull();
|
||||
expect(storedOwnerShell.lastName).toBeNull();
|
||||
@@ -152,7 +150,7 @@ describe('Owner shell', () => {
|
||||
const response = await authOwnerShellAgent.patch('/me/password').send(payload);
|
||||
expect([400, 500].includes(response.statusCode)).toBe(true);
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail();
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({});
|
||||
|
||||
if (payload.newPassword) {
|
||||
expect(storedMember.password).not.toBe(payload.newPassword);
|
||||
@@ -164,7 +162,7 @@ describe('Owner shell', () => {
|
||||
}),
|
||||
);
|
||||
|
||||
const storedOwnerShell = await Db.collections.User.findOneOrFail();
|
||||
const storedOwnerShell = await Db.collections.User.findOneByOrFail({});
|
||||
expect(storedOwnerShell.password).toBeNull();
|
||||
});
|
||||
|
||||
@@ -241,7 +239,7 @@ describe('Member', () => {
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await testDb.truncate(['User'], testDbName);
|
||||
await testDb.truncate(['User']);
|
||||
});
|
||||
|
||||
test('GET /me should return sanitized member', async () => {
|
||||
@@ -311,7 +309,7 @@ describe('Member', () => {
|
||||
expect(globalRole.scope).toBe('global');
|
||||
expect(apiKey).toBeUndefined();
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail(id);
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({ id });
|
||||
|
||||
expect(storedMember.email).toBe(validPayload.email.toLowerCase());
|
||||
expect(storedMember.firstName).toBe(validPayload.firstName);
|
||||
@@ -327,7 +325,7 @@ describe('Member', () => {
|
||||
const response = await authMemberAgent.patch('/me').send(invalidPayload);
|
||||
expect(response.statusCode).toBe(400);
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail();
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({});
|
||||
expect(storedMember.email).toBe(member.email);
|
||||
expect(storedMember.firstName).toBe(member.firstName);
|
||||
expect(storedMember.lastName).toBe(member.lastName);
|
||||
@@ -350,7 +348,7 @@ describe('Member', () => {
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail();
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({});
|
||||
expect(storedMember.password).not.toBe(member.password);
|
||||
expect(storedMember.password).not.toBe(validPayload.newPassword);
|
||||
});
|
||||
@@ -363,7 +361,7 @@ describe('Member', () => {
|
||||
const response = await authMemberAgent.patch('/me/password').send(payload);
|
||||
expect([400, 500].includes(response.statusCode)).toBe(true);
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail();
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({});
|
||||
|
||||
if (payload.newPassword) {
|
||||
expect(storedMember.password).not.toBe(payload.newPassword);
|
||||
@@ -385,7 +383,9 @@ describe('Member', () => {
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
|
||||
|
||||
const { personalizationAnswers: storedAnswers } = await Db.collections.User.findOneOrFail();
|
||||
const { personalizationAnswers: storedAnswers } = await Db.collections.User.findOneByOrFail(
|
||||
{},
|
||||
);
|
||||
|
||||
expect(storedAnswers).toEqual(validPayload);
|
||||
}
|
||||
@@ -403,7 +403,7 @@ describe('Member', () => {
|
||||
expect(response.body.data.apiKey).toBeDefined();
|
||||
expect(response.body.data.apiKey).not.toBeNull();
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail(member.id);
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({ id: member.id });
|
||||
|
||||
expect(storedMember.apiKey).toEqual(response.body.data.apiKey);
|
||||
});
|
||||
@@ -430,7 +430,7 @@ describe('Member', () => {
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
|
||||
const storedMember = await Db.collections.User.findOneOrFail(member.id);
|
||||
const storedMember = await Db.collections.User.findOneByOrFail({ id: member.id });
|
||||
|
||||
expect(storedMember.apiKey).toBeNull();
|
||||
});
|
||||
@@ -442,7 +442,7 @@ describe('Owner', () => {
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await testDb.truncate(['User'], testDbName);
|
||||
await testDb.truncate(['User']);
|
||||
});
|
||||
|
||||
test('GET /me should return sanitized owner', async () => {
|
||||
@@ -512,7 +512,7 @@ describe('Owner', () => {
|
||||
expect(globalRole.scope).toBe('global');
|
||||
expect(apiKey).toBeUndefined();
|
||||
|
||||
const storedOwner = await Db.collections.User.findOneOrFail(id);
|
||||
const storedOwner = await Db.collections.User.findOneByOrFail({ id });
|
||||
|
||||
expect(storedOwner.email).toBe(validPayload.email.toLowerCase());
|
||||
expect(storedOwner.firstName).toBe(validPayload.firstName);
|
||||
|
||||
Reference in New Issue
Block a user