Merge branch 'development' into 7638-px-creation-ui-updates

huridocs · Feb 10, 2025 · 014efa8 · 014efa8
2 parents 17a7844 + 55495ea
commit 014efa8
Show file tree

Hide file tree

Showing 100 changed files with 1,903 additions and 523 deletions.
diff --git a/app/api/activitylog/specs/activitylogParser.spec.js b/app/api/activitylog/specs/activitylogParser.spec.js
@@ -1,4 +1,5 @@
 /* eslint-disable max-lines */
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 /* eslint-disable max-statements */
 
 import db from 'api/utils/testing_db';
@@ -27,11 +28,11 @@ describe('Activitylog Parser', () => {
       action: 'MIGRATE',
       description: 'Dummy log',
     });
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
   });
 
   afterAll(async () => {
-    await db.disconnect();
+    await testingEnvironment.tearDown();
   });
 
   async function testBeautified(log, expected) {

diff --git a/app/api/auth/specs/captchaMiddleware.spec.ts b/app/api/auth/specs/captchaMiddleware.spec.ts
@@ -1,4 +1,5 @@
 import db from 'api/utils/testing_db';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import { NextFunction } from 'express';
 import captchaMiddleware from '../captchaMiddleware';
 import { CaptchaModel } from '../CaptchaModel';
@@ -26,10 +27,10 @@ describe('captchaMiddleware', () => {
       captchas: [{ _id: captchaId, text: 'k0n2170' }],
     };
 
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
   });
 
-  afterAll(async () => db.disconnect());
+  afterAll(async () => testingEnvironment.tearDown());
 
   it('should return an error when there is no captcha in the request', async () => {
     const middleWare = captchaMiddleware();

diff --git a/app/api/auth/specs/publicAPIMiddleware.spec.ts b/app/api/auth/specs/publicAPIMiddleware.spec.ts
@@ -1,6 +1,6 @@
-import { testingDB } from 'api/utils/testing_db';
-import { publicAPIMiddleware } from '../publicAPIMiddleware';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import * as auth from '../index';
+import { publicAPIMiddleware } from '../publicAPIMiddleware';
 
 jest.mock('../index', () => ({
   captchaAuthorization: jest.fn(),
@@ -10,7 +10,7 @@ describe('publicAPIMiddleware', () => {
   let captchaMock: jest.Mock<any, any>;
 
   const setUpSettings = async (open: boolean) =>
-    testingDB.clearAllAndLoad({
+    testingEnvironment.setUp({
       settings: [
         {
           openPublicEndpoint: open,
@@ -24,7 +24,7 @@ describe('publicAPIMiddleware', () => {
     captchaMock.mockReset();
   });
 
-  afterAll(async () => testingDB.disconnect());
+  afterAll(async () => testingEnvironment.tearDown());
 
   it('should bypass captcha if enabled on settings and request has corresponding header', async () => {
     await setUpSettings(true);

diff --git a/app/api/auth/specs/routes.spec.js b/app/api/auth/specs/routes.spec.js
@@ -1,29 +1,28 @@
-import express from 'express';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import bodyParser from 'body-parser';
+import express from 'express';
 import request from 'supertest';
 
-import db from 'api/utils/testing_db';
-
 import users from 'api/users/users';
-import svgCaptcha from 'svg-captcha';
 import backend from 'fetch-mock';
+import svgCaptcha from 'svg-captcha';
+import instrumentRoutes from '../../utils/instrumentRoutes';
 import { CaptchaModel } from '../CaptchaModel';
+import { comparePasswords } from '../encryptPassword';
 import authRoutes from '../routes';
 import fixtures from './fixtures.js';
-import instrumentRoutes from '../../utils/instrumentRoutes';
-import { comparePasswords } from '../encryptPassword';
 
 describe('Auth Routes', () => {
   let routes;
   let app;
 
   beforeEach(async () => {
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
     routes = instrumentRoutes(authRoutes);
   });
 
   afterAll(async () => {
-    await db.disconnect();
+    await testingEnvironment.tearDown();
   });
 
   describe('/login', () => {

diff --git a/app/api/auth2fa/specs/usersUtils.spec.ts b/app/api/auth2fa/specs/usersUtils.spec.ts
@@ -1,4 +1,5 @@
 /** @format */
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 
 import * as otplib from 'otplib';
 
@@ -18,11 +19,11 @@ type Error = { code: number; message: string };
 
 describe('auth2fa userUtils', () => {
   beforeEach(async () => {
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
   });
 
   afterAll(async () => {
-    await db.disconnect();
+    await testingEnvironment.tearDown();
   });
 
   const expectError = async (method: string, _id: any, token: string, err: Error) => {

diff --git a/app/api/contact/specs/contact.spec.js b/app/api/contact/specs/contact.spec.js
@@ -1,18 +1,18 @@
 /* eslint-disable max-nested-callbacks */
-import mailer from 'api/utils/mailer';
-import db from 'api/utils/testing_db';
 import settings from 'api/settings';
-import fixtures from './fixtures.js';
+import mailer from 'api/utils/mailer';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import contact from '../contact';
+import fixtures from './fixtures.js';
 
 describe('contact', () => {
   beforeEach(async () => {
     jest.spyOn(mailer, 'send').mockImplementation(async () => Promise.resolve());
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
   });
 
   afterAll(done => {
-    db.disconnect().then(done);
+    testingEnvironment.tearDown().then(done);
   });
 
   describe('sendMessage', () => {

diff --git a/app/api/csv/specs/csvLoader.spec.js b/app/api/csv/specs/csvLoader.spec.js
@@ -8,18 +8,19 @@ import entities from 'api/entities';
 import translations from 'api/i18n';
 import { search } from 'api/search';
 import settings from 'api/settings';
-import db from 'api/utils/testing_db';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import moment from 'moment';
 import typeParsers from '../typeParsers';
 import fixtures, { template1Id } from './csvLoaderFixtures';
 import { mockCsvFileReadStream } from './helpers';
+import testingDB from 'api/utils/testing_db';
 
 describe('csvLoader', () => {
   const csvFile = path.join(__dirname, '/test.csv');
   const loader = new CSVLoader();
 
   beforeAll(async () => {
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
   });
 
   beforeEach(() => {
@@ -28,7 +29,7 @@ describe('csvLoader', () => {
     jest.spyOn(entities, 'save').mockImplementation(async e => e);
   });
 
-  afterAll(async () => db.disconnect());
+  afterAll(async () => testingEnvironment.tearDown());
 
   describe('user', () => {
     it('should use the passed user', async () => {
@@ -41,7 +42,7 @@ describe('csvLoader', () => {
     let csv;
     let readStreamMock;
     beforeEach(async () => {
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
 
       const nonExistent = 'Russian';
 
@@ -128,7 +129,7 @@ describe('csvLoader', () => {
 
     beforeAll(async () => {
       jest.restoreAllMocks();
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
       loader.on('entityLoaded', entity => {
         events.push(entity.title);
       });
@@ -219,7 +220,7 @@ describe('csvLoader', () => {
     it('should stop processing on the first error', async () => {
       const testingLoader = new CSVLoader();
 
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
       jest.spyOn(entities, 'save').mockImplementation(entity => {
         throw new Error(`error-${entity.title}`);
       });
@@ -234,7 +235,7 @@ describe('csvLoader', () => {
     it('should throw the error that occurred even if it was not the first row', async () => {
       const testingLoader = new CSVLoader();
 
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
       jest
         .spyOn(entities, 'save')
         .mockImplementationOnce(({ title }) => Promise.resolve({ title }))
@@ -257,7 +258,7 @@ describe('csvLoader', () => {
         }
         return entity;
       });
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
     });
 
     it('should emit an error', async () => {
@@ -317,7 +318,7 @@ describe('csvLoader', () => {
   describe('when sharedId is provided', () => {
     beforeEach(async () => {
       jest.restoreAllMocks();
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
     });
 
     it('should update the entity', async () => {
@@ -344,7 +345,7 @@ describe('csvLoader', () => {
   describe('when the title is not provided', () => {
     beforeEach(async () => {
       jest.restoreAllMocks();
-      await db.setupFixturesAndContext(fixtures);
+      await testingEnvironment.setUp(fixtures);
     });
 
     describe('title not marked with generated Id option', () => {
@@ -418,7 +419,9 @@ describe('csvLoader', () => {
           dateFormat,
         },
       ];
-      await db.setupFixturesAndContext(_fixtures);
+
+      await testingDB.setupFixturesAndContext(_fixtures);
+      testingEnvironment.setFakeContext();
     };
 
     it('should correctly parse MM/dd/yyyy', async () => {

diff --git a/app/api/csv/specs/csvLoaderLanguages.spec.ts b/app/api/csv/specs/csvLoaderLanguages.spec.ts
@@ -4,7 +4,7 @@ import * as filesystem from 'api/files/filesystem';
 import { uploadsPath } from 'api/files/filesystem';
 import { search } from 'api/search';
 import settings from 'api/settings';
-import db from 'api/utils/testing_db';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import path from 'path';
 import { EntitySchema } from 'shared/types/entityType';
 
@@ -21,7 +21,7 @@ describe('csvLoader languages', () => {
   const loader = new CSVLoader();
 
   beforeAll(async () => {
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
     await filesystem.setupTestUploadedPaths('csvLoader');
     jest.spyOn(translations, 'updateContext').mockImplementation(async () => 'ok');
     jest.spyOn(search, 'indexEntities').mockImplementation(async () => Promise.resolve());
@@ -62,7 +62,7 @@ describe('csvLoader languages', () => {
     ]);
 
     await removeTestingZip();
-    await db.disconnect();
+    await testingEnvironment.tearDown();
   });
 
   it('should import entities in the diferent languages', async () => {

diff --git a/app/api/csv/specs/csvLoaderThesauri.spec.ts b/app/api/csv/specs/csvLoaderThesauri.spec.ts
@@ -1,12 +1,12 @@
-import db from 'api/utils/testing_db';
-import thesauri from 'api/thesauri';
 import translations from 'api/i18n';
 import settings from 'api/settings';
+import thesauri from 'api/thesauri';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 
+import { IndexedContextValues } from 'api/i18n/translations';
+import { WithId } from 'api/odm';
 import { ObjectId } from 'mongodb';
 import { ThesaurusSchema } from 'shared/types/thesaurusType';
-import { WithId } from 'api/odm';
-import { IndexedContextValues } from 'api/i18n/translations';
 import { CSVLoader } from '../csvLoader';
 import { fixtures, thesauri1Id } from './fixtures';
 import { mockCsvFileReadStream } from './helpers';
@@ -19,13 +19,13 @@ const getTranslation = async (lang: string, id: ObjectId) =>
 describe('csvLoader thesauri', () => {
   const loader = new CSVLoader();
 
-  afterAll(async () => db.disconnect());
+  afterAll(async () => testingEnvironment.tearDown());
 
   let thesauriId: ObjectId;
   let result: WithId<ThesaurusSchema>;
   describe('load thesauri', () => {
     beforeAll(async () => {
-      await db.clearAllAndLoad(fixtures);
+      await testingEnvironment.setUp(fixtures);
 
       await settings.addLanguage({ key: 'es', label: 'spanish' });
       await translations.addLanguage('es');

diff --git a/app/api/csv/specs/csvLoaderZip.spec.ts b/app/api/csv/specs/csvLoaderZip.spec.ts
@@ -1,4 +1,4 @@
-import db from 'api/utils/testing_db';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 import { files } from 'api/files/files';
 import { search } from 'api/search';
 import path from 'path';
@@ -20,7 +20,7 @@ describe('csvLoader zip file', () => {
   beforeAll(async () => {
     const zip = path.join(__dirname, '/zipData/test.zip');
     const loader = new CSVLoader();
-    await db.setupFixturesAndContext(fixtures);
+    await testingEnvironment.setUp(fixtures);
     await filesystem.setupTestUploadedPaths('csvLoaderZip');
     await createTestingZip(
       [
@@ -54,7 +54,7 @@ describe('csvLoader zip file', () => {
       filesystem.attachmentsPath('generatedatt2.doc'),
     ]);
     await removeTestingZip();
-    await db.disconnect();
+    await testingEnvironment.tearDown();
   });
 
   it('should save files into uploaded_documents', async () => {

diff --git a/app/api/csv/typeParsers/specs/multiselect.spec.js b/app/api/csv/typeParsers/specs/multiselect.spec.js
@@ -1,7 +1,7 @@
 /** @format */
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 
 import thesauri from 'api/thesauri';
-import db from 'api/utils/testing_db';
 
 import { fixtures, thesauri1Id } from '../../specs/fixtures';
 import typeParsers from '../../typeParsers';
@@ -17,9 +17,9 @@ describe('multiselect', () => {
 
   const templateProp = { name: 'multiselect_prop', content: thesauri1Id };
 
-  afterAll(async () => db.disconnect());
+  afterAll(async () => testingEnvironment.tearDown());
   beforeAll(async () => {
-    await db.clearAllAndLoad(fixtures);
+    await testingEnvironment.setUp(fixtures);
 
     thesauri1 = await thesauri.getById(thesauri1Id);
   });

diff --git a/app/api/csv/typeParsers/specs/relationship.spec.js b/app/api/csv/typeParsers/specs/relationship.spec.js
@@ -1,6 +1,7 @@
 import entities, { model } from 'api/entities';
 import { search } from 'api/search';
 import db from 'api/utils/testing_db';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
 
 import { fixtures, templateToRelateId } from '../../specs/fixtures';
 import typeParsers from '../../typeParsers';
@@ -72,7 +73,7 @@ describe('relationship', () => {
   };
 
   beforeAll(async () => {
-    await db.clearAllAndLoad(fixtures);
+    await testingEnvironment.setUp(fixtures);
 
     jest.spyOn(search, 'indexEntities').mockImplementation(async () => Promise.resolve());
     await prepareExtraFixtures();
@@ -81,7 +82,7 @@ describe('relationship', () => {
     entitiesRelated = await entities.get({ template: templateToRelateId, language: 'en' });
   });
 
-  afterAll(async () => db.disconnect());
+  afterAll(async () => testingEnvironment.tearDown());
 
   it('should create entities and return the ids', async () => {
     expect(entitiesRelated[0].title).toBe('value1');