chore(tests): supprime la libraire obsolète knex-db-manager

package.json

@@ -86,6 +86,7 @@
     "@types/node": "^17.0.21",
     "@types/node-fetch": "^2.5.12",
     "@types/node-mailjet": "^3.3.8",
+    "@types/pg": "^8.6.5",
     "@types/proj4": "^2.5.2",
     "@types/shpjs": "^3.4.1",
     "@types/sql-formatter": "^2.3.0",

src/business/utils/titre-slug-and-relations-update.test.ts

@@ -5,14 +5,14 @@ import { dbManager } from '../../../tests/db-manager'
 import { ITitre } from '../../types'
 import Titres from '../../database/models/titres'
 import { objectClone } from '../../tools'
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 const titreAdd = async (titre: ITitre) =>

src/database/queries/permissions/administrations.test.ts

@@ -15,14 +15,17 @@ import options from '../_options'
 
 console.info = jest.fn()
 console.error = jest.fn()
+const knex = dbManager.getKnex()
 
 beforeAll(async () => {
-  await dbManager.populateDb()
+  console.log('BEFORE ALL')
+  await dbManager.populateDb(knex)
+  console.log('AFTER BEFORE ALL')
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 describe('administrationsTitresQuery', () => {
@@ -35,6 +38,7 @@ describe('administrationsTitresQuery', () => {
   `(
     "Vérifie l'écriture de la requête sur les titres dont une administration a des droits sur le type",
     async ({ gestionnaire, associee, visible }) => {
+      console.log('PLOOOOOOP')
       await Titres.query().delete()
       await AdministrationsTitresTypes.query().delete()
 

src/database/queries/permissions/documents.test.ts

@@ -1,4 +1,3 @@
-import { knex } from '../../../knex'
 import { dbManager } from '../../../../tests/db-manager'
 
 import { userSuper } from '../../user-super'
@@ -14,14 +13,14 @@ import { etapeTypeDocumentTypeUsedCheck } from './documents'
 
 console.info = jest.fn()
 console.error = jest.fn()
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 describe('documentSupprimer', () => {

src/database/queries/permissions/entreprises.test.ts

@@ -8,14 +8,14 @@ import { entreprisesQueryModify } from './entreprises'
 
 console.info = jest.fn()
 console.error = jest.fn()
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 describe('entreprisesQueryModify', () => {

src/database/queries/permissions/metas.test.ts

@@ -10,14 +10,14 @@ import Administrations from '../../models/administrations'
 
 console.info = jest.fn()
 console.error = jest.fn()
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 describe('metas permissions queries', () => {

src/database/queries/permissions/titres.test.ts

@@ -26,14 +26,14 @@ import { userSuper } from '../../user-super'
 
 console.info = jest.fn()
 console.error = jest.fn()
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 describe('titresQueryModify', () => {

src/database/queries/permissions/utilisateurs.test.ts

@@ -7,14 +7,14 @@ import { utilisateursGet } from '../utilisateurs'
 
 console.info = jest.fn()
 console.error = jest.fn()
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 
 const mockAdministration = {

src/database/queries/titres-activites.test.ts

@@ -7,14 +7,14 @@ import Titres from '../models/titres'
 import AdministrationsTitresTypes from '../models/administrations-titres-types'
 console.info = jest.fn()
 console.error = jest.fn()
-
+const knex = dbManager.getKnex()
 beforeAll(async () => {
-  await dbManager.populateDb()
+  await dbManager.populateDb(knex)
 })
 
 afterAll(async () => {
-  await dbManager.truncateDb()
-  await dbManager.closeKnex()
+  await dbManager.truncateDb(knex)
+  await dbManager.closeKnex(knex)
 })
 describe('teste les requêtes sur les activités', () => {
   test('vérifie que le filtrage fonctionne pour les administrations', async () => {

src/knex/config.ts

@@ -24,9 +24,6 @@ const knexConfig = {
     // https://github.com/knex/knex/issues/4688
     extension: 'js'
   },
-  seeds: {
-    directory: join(__dirname, './seeds')
-  },
   ...knexSnakeCaseMappers()
 }