diff --git a/packages/backend/test/factories/config.ts b/packages/backend/test/factories/config.js similarity index 61% rename from packages/backend/test/factories/config.ts rename to packages/backend/test/factories/config.js index 0f709492..fe21d765 100644 --- a/packages/backend/test/factories/config.ts +++ b/packages/backend/test/factories/config.js @@ -1,12 +1,6 @@ -import { IJSONObject } from '@automatisch/types'; import { faker } from '@faker-js/faker'; -type ConfigParams = { - key?: string; - value?: IJSONObject; -}; - -export const createConfig = async (params: ConfigParams = {}) => { +export const createConfig = async (params = {}) => { const configData = { key: params?.key || faker.lorem.word(), value: params?.value || { data: 'sampleConfig' }, diff --git a/packages/backend/test/factories/connection.ts b/packages/backend/test/factories/connection.js similarity index 80% rename from packages/backend/test/factories/connection.ts rename to packages/backend/test/factories/connection.js index 13f081f3..aff7abff 100644 --- a/packages/backend/test/factories/connection.ts +++ b/packages/backend/test/factories/connection.js @@ -1,8 +1,7 @@ -import Connection from '../../src/models/connection'; import appConfig from '../../src/config/app'; import { AES } from 'crypto-js'; -export const createConnection = async (params: Partial = {}) => { +export const createConnection = async (params = {}) => { params.key = params?.key || 'deepl'; const formattedData = params.formattedData || { diff --git a/packages/backend/test/factories/execution-step.ts b/packages/backend/test/factories/execution-step.js similarity index 78% rename from packages/backend/test/factories/execution-step.ts rename to packages/backend/test/factories/execution-step.js index b1d2cb9a..01b9daa5 100644 --- a/packages/backend/test/factories/execution-step.ts +++ b/packages/backend/test/factories/execution-step.js @@ -1,10 +1,7 @@ -import ExecutionStep from '../../src/models/execution-step'; import { createExecution } from './execution'; import { createStep } from './step'; -export const createExecutionStep = async ( - params: Partial = {} -) => { +export const createExecutionStep = async (params = {}) => { params.executionId = params?.executionId || (await createExecution()).id; params.stepId = params?.stepId || (await createStep()).id; params.status = params?.status || 'success'; diff --git a/packages/backend/test/factories/execution.ts b/packages/backend/test/factories/execution.js similarity index 76% rename from packages/backend/test/factories/execution.ts rename to packages/backend/test/factories/execution.js index 34b45fa0..67ea6340 100644 --- a/packages/backend/test/factories/execution.ts +++ b/packages/backend/test/factories/execution.js @@ -1,7 +1,6 @@ -import Execution from '../../src/models/execution'; import { createFlow } from './flow'; -export const createExecution = async (params: Partial = {}) => { +export const createExecution = async (params = {}) => { params.flowId = params?.flowId || (await createFlow()).id; params.testRun = params?.testRun || false; params.createdAt = params?.createdAt || new Date().toISOString(); diff --git a/packages/backend/test/factories/flow.ts b/packages/backend/test/factories/flow.js similarity index 78% rename from packages/backend/test/factories/flow.ts rename to packages/backend/test/factories/flow.js index b43a2b62..09cebbbd 100644 --- a/packages/backend/test/factories/flow.ts +++ b/packages/backend/test/factories/flow.js @@ -1,7 +1,6 @@ -import Flow from '../../src/models/flow'; import { createUser } from './user'; -export const createFlow = async (params: Partial = {}) => { +export const createFlow = async (params = {}) => { params.userId = params?.userId || (await createUser()).id; params.name = params?.name || 'Name your flow!'; params.createdAt = params?.createdAt || new Date().toISOString(); diff --git a/packages/backend/test/factories/permission.ts b/packages/backend/test/factories/permission.js similarity index 74% rename from packages/backend/test/factories/permission.ts rename to packages/backend/test/factories/permission.js index aae670ea..bc604adf 100644 --- a/packages/backend/test/factories/permission.ts +++ b/packages/backend/test/factories/permission.js @@ -1,7 +1,6 @@ -import Permission from '../../src/models/permission'; import { createRole } from './role'; -export const createPermission = async (params: Partial = {}) => { +export const createPermission = async (params = {}) => { params.roleId = params?.roleId || (await createRole()).id; params.action = params?.action || 'read'; params.subject = params?.subject || 'User'; diff --git a/packages/backend/test/factories/role.js b/packages/backend/test/factories/role.js new file mode 100644 index 00000000..f2ed88bc --- /dev/null +++ b/packages/backend/test/factories/role.js @@ -0,0 +1,8 @@ +export const createRole = async (params = {}) => { + params.name = params?.name || 'Viewer'; + params.key = params?.key || 'viewer'; + + const [role] = await global.knex.table('roles').insert(params).returning('*'); + + return role; +}; diff --git a/packages/backend/test/factories/role.ts b/packages/backend/test/factories/role.ts deleted file mode 100644 index ef45291a..00000000 --- a/packages/backend/test/factories/role.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { IRole } from '@automatisch/types'; - -type RoleParams = { - name?: string; - key?: string; -}; - -export const createRole = async (params: RoleParams = {}): Promise => { - params.name = params?.name || 'Viewer'; - params.key = params?.key || 'viewer'; - - const [role] = await knex.table('roles').insert(params).returning('*'); - - return role; -}; diff --git a/packages/backend/test/factories/step.ts b/packages/backend/test/factories/step.js similarity index 85% rename from packages/backend/test/factories/step.ts rename to packages/backend/test/factories/step.js index f26d8f7c..9fb0ec84 100644 --- a/packages/backend/test/factories/step.ts +++ b/packages/backend/test/factories/step.js @@ -1,7 +1,6 @@ -import Step from '../../src/models/step'; import { createFlow } from './flow'; -export const createStep = async (params: Partial = {}) => { +export const createStep = async (params = {}) => { params.flowId = params?.flowId || (await createFlow()).id; params.type = params?.type || 'action'; diff --git a/packages/backend/test/factories/user.ts b/packages/backend/test/factories/user.js similarity index 79% rename from packages/backend/test/factories/user.ts rename to packages/backend/test/factories/user.js index 4a057fa8..6ae60d36 100644 --- a/packages/backend/test/factories/user.ts +++ b/packages/backend/test/factories/user.js @@ -1,8 +1,7 @@ import { createRole } from './role'; import { faker } from '@faker-js/faker'; -import User from '../../src/models/user'; -export const createUser = async (params: Partial = {}) => { +export const createUser = async (params = {}) => { params.roleId = params?.roleId || (await createRole()).id; params.fullName = params?.fullName || faker.person.fullName(); params.email = params?.email || faker.internet.email();