From 903616bef649c8d3c0ae43c19b7580d0175a8d55 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Mon, 30 Oct 2023 14:24:35 +0100 Subject: [PATCH 1/2] test: Disable ts check for test files --- .../queries/get-automatisch-info.test.ts | 13 ++-- .../graphql/queries/get-current-user.test.ts | 10 +-- .../graphql/queries/get-executions.test.ts | 61 +++++++++---------- .../src/graphql/queries/get-role.ee.test.ts | 24 ++++---- .../src/graphql/queries/get-roles.ee.test.ts | 20 +++--- .../queries/get-trial-status.ee.test.ts | 8 +-- .../src/graphql/queries/get-user.test.ts | 14 ++--- .../src/graphql/queries/get-users.test.ts | 10 +-- .../src/graphql/queries/healthcheck.test.ts | 1 + 9 files changed, 75 insertions(+), 86 deletions(-) diff --git a/packages/backend/src/graphql/queries/get-automatisch-info.test.ts b/packages/backend/src/graphql/queries/get-automatisch-info.test.ts index bd06a2a7..275a32fa 100644 --- a/packages/backend/src/graphql/queries/get-automatisch-info.test.ts +++ b/packages/backend/src/graphql/queries/get-automatisch-info.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import request from 'supertest'; import app from '../../app'; import * as license from '../../helpers/license.ee'; @@ -22,7 +23,7 @@ describe('graphQL getAutomatischInfo query', () => { beforeEach(async () => { jest.spyOn(license, 'getLicense').mockResolvedValue(false); - jest.replaceProperty(appConfig, 'isCloud', false) + jest.replaceProperty(appConfig, 'isCloud', false); }); it('should return empty license data', async () => { @@ -36,9 +37,9 @@ describe('graphQL getAutomatischInfo query', () => { getAutomatischInfo: { isCloud: false, license: { - id: null as string, - name: null as string, - expireAt: null as string, + id: null, + name: null, + expireAt: null, verified: false, }, }, @@ -63,7 +64,7 @@ describe('graphQL getAutomatischInfo query', () => { describe('and with cloud flag enabled', () => { beforeEach(async () => { - jest.replaceProperty(appConfig, 'isCloud', true) + jest.replaceProperty(appConfig, 'isCloud', true); }); it('should return all license data', async () => { @@ -92,7 +93,7 @@ describe('graphQL getAutomatischInfo query', () => { describe('and with cloud flag disabled', () => { beforeEach(async () => { - jest.replaceProperty(appConfig, 'isCloud', false) + jest.replaceProperty(appConfig, 'isCloud', false); }); it('should return all license data', async () => { diff --git a/packages/backend/src/graphql/queries/get-current-user.test.ts b/packages/backend/src/graphql/queries/get-current-user.test.ts index 486a6f6d..b47e5587 100644 --- a/packages/backend/src/graphql/queries/get-current-user.test.ts +++ b/packages/backend/src/graphql/queries/get-current-user.test.ts @@ -1,9 +1,9 @@ -import request, { Test } from 'supertest'; +// @ts-nocheck +import request from 'supertest'; import app from '../../app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; import { createRole } from '../../../test/factories/role'; import { createUser } from '../../../test/factories/user'; -import { IRole, IUser } from '@automatisch/types'; describe('graphQL getCurrentUser query', () => { describe('with unauthenticated user', () => { @@ -31,7 +31,7 @@ describe('graphQL getCurrentUser query', () => { }); describe('with authenticated user', () => { - let role: IRole, currentUser: IUser, token: string, requestObject: Test; + let role, currentUser, token, requestObject; beforeEach(async () => { role = await createRole({ @@ -70,12 +70,12 @@ describe('graphQL getCurrentUser query', () => { const expectedResponsePayload = { data: { getCurrentUser: { - createdAt: (currentUser.createdAt as Date).getTime().toString(), + createdAt: currentUser.createdAt.getTime().toString(), email: currentUser.email, fullName: currentUser.fullName, id: currentUser.id, role: { id: role.id, name: role.name }, - updatedAt: (currentUser.updatedAt as Date).getTime().toString(), + updatedAt: currentUser.updatedAt.getTime().toString(), }, }, }; diff --git a/packages/backend/src/graphql/queries/get-executions.test.ts b/packages/backend/src/graphql/queries/get-executions.test.ts index 32758cbd..01f0b95f 100644 --- a/packages/backend/src/graphql/queries/get-executions.test.ts +++ b/packages/backend/src/graphql/queries/get-executions.test.ts @@ -1,8 +1,8 @@ +// @ts-nocheck import request from 'supertest'; import app from '../../app'; import appConfig from '../../config/app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; -import { IJSONObject } from '@automatisch/types'; import { createRole } from '../../../test/factories/role'; import { createPermission } from '../../../test/factories/permission'; import { createUser } from '../../../test/factories/user'; @@ -10,7 +10,6 @@ import { createFlow } from '../../../test/factories/flow'; import { createStep } from '../../../test/factories/step'; import { createExecution } from '../../../test/factories/execution'; import { createExecutionStep } from '../../../test/factories/execution-step'; -import { IRole, IUser, IExecution, IFlow, IStep } from '@automatisch/types'; describe('graphQL getExecutions query', () => { const query = ` @@ -74,25 +73,25 @@ describe('graphQL getExecutions query', () => { }); describe('and with correct permission', () => { - let role: IRole, - currentUser: IUser, - anotherUser: IUser, - token: string, - flowOne: IFlow, - stepOneForFlowOne: IStep, - stepTwoForFlowOne: IStep, - executionOne: IExecution, - flowTwo: IFlow, - stepOneForFlowTwo: IStep, - stepTwoForFlowTwo: IStep, - executionTwo: IExecution, - flowThree: IFlow, - stepOneForFlowThree: IStep, - stepTwoForFlowThree: IStep, - executionThree: IExecution, - expectedResponseForExecutionOne: IJSONObject, - expectedResponseForExecutionTwo: IJSONObject, - expectedResponseForExecutionThree: IJSONObject; + let role, + currentUser, + anotherUser, + token, + flowOne, + stepOneForFlowOne, + stepTwoForFlowOne, + executionOne, + flowTwo, + stepOneForFlowTwo, + stepTwoForFlowTwo, + executionTwo, + flowThree, + stepOneForFlowThree, + stepTwoForFlowThree, + executionThree, + expectedResponseForExecutionOne, + expectedResponseForExecutionTwo, + expectedResponseForExecutionThree; beforeEach(async () => { role = await createRole({ @@ -195,7 +194,7 @@ describe('graphQL getExecutions query', () => { expectedResponseForExecutionOne = { node: { - createdAt: (executionOne.createdAt as Date).getTime().toString(), + createdAt: executionOne.createdAt.getTime().toString(), flow: { active: flowOne.active, id: flowOne.id, @@ -212,13 +211,13 @@ describe('graphQL getExecutions query', () => { id: executionOne.id, status: 'success', testRun: executionOne.testRun, - updatedAt: (executionOne.updatedAt as Date).getTime().toString(), + updatedAt: executionOne.updatedAt.getTime().toString(), }, }; expectedResponseForExecutionTwo = { node: { - createdAt: (executionTwo.createdAt as Date).getTime().toString(), + createdAt: executionTwo.createdAt.getTime().toString(), flow: { active: flowTwo.active, id: flowTwo.id, @@ -235,13 +234,13 @@ describe('graphQL getExecutions query', () => { id: executionTwo.id, status: 'failure', testRun: executionTwo.testRun, - updatedAt: (executionTwo.updatedAt as Date).getTime().toString(), + updatedAt: executionTwo.updatedAt.getTime().toString(), }, }; expectedResponseForExecutionThree = { node: { - createdAt: (executionThree.createdAt as Date).getTime().toString(), + createdAt: executionThree.createdAt.getTime().toString(), flow: { active: flowThree.active, id: flowThree.id, @@ -258,7 +257,7 @@ describe('graphQL getExecutions query', () => { id: executionThree.id, status: 'failure', testRun: executionThree.testRun, - updatedAt: (executionThree.updatedAt as Date).getTime().toString(), + updatedAt: executionThree.updatedAt.getTime().toString(), }, }; }); @@ -435,13 +434,9 @@ describe('graphQL getExecutions query', () => { }); it('should return only executions data within date range', async () => { - const createdAtFrom = (executionOne.createdAt as Date) - .getTime() - .toString(); + const createdAtFrom = executionOne.createdAt.getTime().toString(); - const createdAtTo = (executionOne.createdAt as Date) - .getTime() - .toString(); + const createdAtTo = executionOne.createdAt.getTime().toString(); const query = ` query { diff --git a/packages/backend/src/graphql/queries/get-role.ee.test.ts b/packages/backend/src/graphql/queries/get-role.ee.test.ts index c5b93c30..00d09d56 100644 --- a/packages/backend/src/graphql/queries/get-role.ee.test.ts +++ b/packages/backend/src/graphql/queries/get-role.ee.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import request from 'supertest'; import app from '../../app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; @@ -5,21 +6,20 @@ import Crypto from 'crypto'; import { createRole } from '../../../test/factories/role'; import { createPermission } from '../../../test/factories/permission'; import { createUser } from '../../../test/factories/user'; -import { IRole, IUser, IPermission } from '@automatisch/types'; import * as license from '../../helpers/license.ee'; describe('graphQL getRole query', () => { - let validRole: IRole, - invalidRoleId: string, - queryWithValidRole: string, - queryWithInvalidRole: string, - userWithPermissions: IUser, - userWithoutPermissions: IUser, - tokenWithPermissions: string, - tokenWithoutPermissions: string, - invalidToken: string, - permissionOne: IPermission, - permissionTwo: IPermission; + let validRole, + invalidRoleId, + queryWithValidRole, + queryWithInvalidRole, + userWithPermissions, + userWithoutPermissions, + tokenWithPermissions, + tokenWithoutPermissions, + invalidToken, + permissionOne, + permissionTwo; beforeEach(async () => { validRole = await createRole(); diff --git a/packages/backend/src/graphql/queries/get-roles.ee.test.ts b/packages/backend/src/graphql/queries/get-roles.ee.test.ts index 941eeb5c..c809c938 100644 --- a/packages/backend/src/graphql/queries/get-roles.ee.test.ts +++ b/packages/backend/src/graphql/queries/get-roles.ee.test.ts @@ -1,22 +1,22 @@ +// @ts-nocheck import request from 'supertest'; import app from '../../app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; import { createRole } from '../../../test/factories/role'; import { createPermission } from '../../../test/factories/permission'; import { createUser } from '../../../test/factories/user'; -import { IRole, IUser } from '@automatisch/types'; import * as license from '../../helpers/license.ee'; describe('graphQL getRoles query', () => { - let currentUserRole: IRole, - roleOne: IRole, - roleSecond: IRole, - query: string, - userWithPermissions: IUser, - userWithoutPermissions: IUser, - tokenWithPermissions: string, - tokenWithoutPermissions: string, - invalidToken: string; + let currentUserRole, + roleOne, + roleSecond, + query, + userWithPermissions, + userWithoutPermissions, + tokenWithPermissions, + tokenWithoutPermissions, + invalidToken; beforeEach(async () => { currentUserRole = await createRole({ name: 'Current user role' }); diff --git a/packages/backend/src/graphql/queries/get-trial-status.ee.test.ts b/packages/backend/src/graphql/queries/get-trial-status.ee.test.ts index a88104f8..2683ee53 100644 --- a/packages/backend/src/graphql/queries/get-trial-status.ee.test.ts +++ b/packages/backend/src/graphql/queries/get-trial-status.ee.test.ts @@ -1,6 +1,6 @@ +// @ts-nocheck import request from 'supertest'; import app from '../../app'; -import { IUser } from '@automatisch/types'; import User from '../../models/user'; import { createUser } from '../../../test/factories/user'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; @@ -32,7 +32,7 @@ describe('graphQL getTrialStatus query', () => { }); describe('with authenticated user', () => { - let user: IUser, userToken: string; + let user, userToken; beforeEach(async () => { const trialExpiryDate = DateTime.now().plus({ days: 30 }).toISODate(); @@ -54,7 +54,7 @@ describe('graphQL getTrialStatus query', () => { .expect(200); const expectedResponsePayload = { - data: { getTrialStatus: null as string }, + data: { getTrialStatus: null }, }; expect(response.body).toEqual(expectedResponsePayload); @@ -82,7 +82,7 @@ describe('graphQL getTrialStatus query', () => { .expect(200); const expectedResponsePayload = { - data: { getTrialStatus: null as string }, + data: { getTrialStatus: null }, }; expect(response.body).toEqual(expectedResponsePayload); diff --git a/packages/backend/src/graphql/queries/get-user.test.ts b/packages/backend/src/graphql/queries/get-user.test.ts index 8b3a7038..917866fb 100644 --- a/packages/backend/src/graphql/queries/get-user.test.ts +++ b/packages/backend/src/graphql/queries/get-user.test.ts @@ -1,11 +1,11 @@ -import request, { Test } from 'supertest'; +// @ts-nocheck +import request from 'supertest'; import app from '../../app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; import Crypto from 'crypto'; import { createRole } from '../../../test/factories/role'; import { createPermission } from '../../../test/factories/permission'; import { createUser } from '../../../test/factories/user'; -import { IRole, IUser } from '@automatisch/types'; describe('graphQL getUser query', () => { describe('with unauthenticated user', () => { @@ -61,11 +61,7 @@ describe('graphQL getUser query', () => { }); describe('and correct permissions', () => { - let role: IRole, - currentUser: IUser, - anotherUser: IUser, - token: string, - requestObject: Test; + let role, currentUser, anotherUser, token, requestObject; beforeEach(async () => { role = await createRole({ @@ -116,12 +112,12 @@ describe('graphQL getUser query', () => { const expectedResponsePayload = { data: { getUser: { - createdAt: (anotherUser.createdAt as Date).getTime().toString(), + createdAt: anotherUser.createdAt.getTime().toString(), email: anotherUser.email, fullName: anotherUser.fullName, id: anotherUser.id, role: { id: role.id, name: role.name }, - updatedAt: (anotherUser.updatedAt as Date).getTime().toString(), + updatedAt: anotherUser.updatedAt.getTime().toString(), }, }, }; diff --git a/packages/backend/src/graphql/queries/get-users.test.ts b/packages/backend/src/graphql/queries/get-users.test.ts index 561e9fd6..7c5445de 100644 --- a/packages/backend/src/graphql/queries/get-users.test.ts +++ b/packages/backend/src/graphql/queries/get-users.test.ts @@ -1,10 +1,10 @@ -import request, { Test } from 'supertest'; +// @ts-nocheck +import request from 'supertest'; import app from '../../app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; import { createRole } from '../../../test/factories/role'; import { createPermission } from '../../../test/factories/permission'; import { createUser } from '../../../test/factories/user'; -import { IRole, IUser } from '@automatisch/types'; describe('graphQL getUsers query', () => { const query = ` @@ -61,11 +61,7 @@ describe('graphQL getUsers query', () => { }); describe('and with correct permissions', () => { - let role: IRole, - currentUser: IUser, - anotherUser: IUser, - token: string, - requestObject: Test; + let role, currentUser, anotherUser, token, requestObject; beforeEach(async () => { role = await createRole({ diff --git a/packages/backend/src/graphql/queries/healthcheck.test.ts b/packages/backend/src/graphql/queries/healthcheck.test.ts index fbb0971a..2124634f 100644 --- a/packages/backend/src/graphql/queries/healthcheck.test.ts +++ b/packages/backend/src/graphql/queries/healthcheck.test.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import request from 'supertest'; import app from '../../app'; import appConfig from '../../config/app'; From 3b7f6740bbab648a6b14f373e0ff09c95944bade Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Tue, 31 Oct 2023 11:35:53 +0100 Subject: [PATCH 2/2] chore: exclude test files from eslint --- .eslintrc.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index 0b69e42c..8d788f7e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,4 +7,12 @@ module.exports = { 'plugin:@typescript-eslint/recommended', 'prettier', ], + overrides: [ + { + files: ['**/*.test.ts', '**/test/**/*.ts'], + rules: { + '@typescript-eslint/ban-ts-comment': ['off'], + }, + }, + ], };