test(backend): update tenant service tests

Author: mkurapov

packages/backend/src/tenants/service.test.ts

@@ -44,7 +44,10 @@ describe('Tenant Service', (): void => {
   let knex: Knex
 
   beforeAll(async (): Promise<void> => {
-    deps = initIocContainer(Config)
+    deps = initIocContainer({
+      ...Config,
+      dbSchema: 'tenant_service_test_schema'
+    })
     appContainer = await createTestApp(deps)
     tenantService = await deps.use('tenantService')
     config = await deps.use('config')
@@ -53,15 +56,15 @@ describe('Tenant Service', (): void => {
   })
 
   afterEach(async (): Promise<void> => {
-    await truncateTables(knex, false)
+    await truncateTables(knex, true)
   })
 
   afterAll(async (): Promise<void> => {
     nock.cleanAll()
     await appContainer.shutdown()
   })
 
-  describe.skip('Tenant pagination', (): void => {
+  describe('Tenant pagination', (): void => {
     describe('getPage', (): void => {
       getPageTests({
         createModel: () => createTenant(deps),

packages/backend/src/tests/tableManager.ts

@@ -1,5 +1,4 @@
 import { Knex } from 'knex'
-import { Config } from '../config/app'
 
 export async function truncateTable(
   knex: Knex,
@@ -11,21 +10,18 @@ export async function truncateTable(
 
 export async function truncateTables(
   knex: Knex,
-  doSeedOperatorTenant = true
+  truncateTenants = false
 ): Promise<void> {
   const ignoreTables = [
     'knex_migrations',
     'knex_migrations_lock',
     'knex_migrations_backend',
-    'knex_migrations_backend_lock'
+    'knex_migrations_backend_lock',
+    ...(truncateTenants ? [] : ['tenants']) // So we don't delete operator tenant
   ]
   const tables = await getTables(knex, ignoreTables)
   const RAW = `TRUNCATE TABLE "${tables}" RESTART IDENTITY`
   await knex.raw(RAW)
-
-  if (doSeedOperatorTenant) {
-    await seedOperatorTenant(knex)
-  }
 }
 
 async function getTables(knex: Knex, ignoredTables: string[]): Promise<string> {
@@ -39,9 +35,3 @@ async function getTables(knex: Knex, ignoredTables: string[]): Promise<string> {
     .filter(Boolean)
     .join('","')
 }
-
-export async function seedOperatorTenant(knex: Knex): Promise<void> {
-  await knex
-    .table('tenants')
-    .insert({ id: Config.operatorTenantId, apiSecret: Config.adminApiSecret })
-}