From 6b05fe2a63702684c54f80e6c65eddc1728715bf Mon Sep 17 00:00:00 2001
From: Anthony Rimet <anthony.rimet03@gmail.com>
Date: Thu, 21 Sep 2023 16:17:57 +0200
Subject: [PATCH] Feat(tenant): Update tests for admin url instance

---
 cypress/support/menu.js                 | 2 +-
 globalConfig.json                       | 2 +-
 src/api/controller/api/publish.spec.js  | 8 +++++++-
 src/api/e2e/publishedDataset.spec.js    | 2 ++
 src/api/e2e/ssr.spec.js                 | 2 ++
 src/api/workers/index.js                | 4 ++--
 src/app/js/public/menu/MenuItem.spec.js | 2 +-
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/cypress/support/menu.js b/cypress/support/menu.js
index f43a3ccfc..7013bc2b9 100644
--- a/cypress/support/menu.js
+++ b/cypress/support/menu.js
@@ -13,7 +13,7 @@ export const goToAdminDashboard = () => {
     cy.get('.advanced-page a')
         .contains('Admin')
         .click();
-    cy.location('pathname').should('equal', '/admin');
+    cy.location('pathname').should('equal', '/instance/default/admin');
 };
 
 export const goToHomePage = () => {
diff --git a/globalConfig.json b/globalConfig.json
index f8cce01cd..f53601ce2 100644
--- a/globalConfig.json
+++ b/globalConfig.json
@@ -1 +1 @@
-{"mongoUri":"mongodb://127.0.0.1:43907/jest?","mongoDBName":"jest"}
\ No newline at end of file
+{"mongoUri":"mongodb://127.0.0.1:36595/jest?","mongoDBName":"jest"}
\ No newline at end of file
diff --git a/src/api/controller/api/publish.spec.js b/src/api/controller/api/publish.spec.js
index a563ea096..df459a350 100644
--- a/src/api/controller/api/publish.spec.js
+++ b/src/api/controller/api/publish.spec.js
@@ -1,7 +1,13 @@
 import { doPublish } from './publish';
 import { PUBLISHER } from '../../workers/publisher';
 import { workerQueues } from '../../workers';
-jest.mock('../../workers');
+jest.mock('../../workers', () => ({
+    workerQueues: {
+        lodex_test: {
+            add: jest.fn(),
+        },
+    },
+}));
 
 describe.skip('publish', () => {
     describe('doPublish', () => {
diff --git a/src/api/e2e/publishedDataset.spec.js b/src/api/e2e/publishedDataset.spec.js
index 96cb54105..f9e2e2cee 100644
--- a/src/api/e2e/publishedDataset.spec.js
+++ b/src/api/e2e/publishedDataset.spec.js
@@ -9,6 +9,7 @@ import {
     loadFixtures,
     close,
 } from '../../common/tests/fixtures';
+import { closeAllWorkerQueues } from '../workers';
 
 const adminHeader = {
     cookie: `lodex_token=${jwt.sign(
@@ -390,6 +391,7 @@ describe('e2e publishedDataset Authentication', () => {
     });
 
     afterAll(async () => {
+        await closeAllWorkerQueues();
         server.close();
         await clear();
         await close();
diff --git a/src/api/e2e/ssr.spec.js b/src/api/e2e/ssr.spec.js
index ce52b3428..af27f49d2 100644
--- a/src/api/e2e/ssr.spec.js
+++ b/src/api/e2e/ssr.spec.js
@@ -10,6 +10,7 @@ import {
     loadFixtures,
     close,
 } from '../../common/tests/fixtures';
+import { closeAllWorkerQueues } from '../workers';
 
 const authentifiedHeader = {
     cookie: `lodex_token=${jwt.sign(
@@ -253,6 +254,7 @@ describe('ssr', () => {
     });
 
     afterAll(async () => {
+        await closeAllWorkerQueues();
         server.close();
         await clear();
         await close();
diff --git a/src/api/workers/index.js b/src/api/workers/index.js
index cb03d70c2..339ab6ddd 100644
--- a/src/api/workers/index.js
+++ b/src/api/workers/index.js
@@ -60,8 +60,8 @@ export const cleanWaitingJobsOfType = (queueName, jobType) => {
 
 export const closeAllWorkerQueues = async () => {
     await Promise.all(
-        workerQueues.map(async workerQueue => {
-            await workerQueue.close();
+        Object.keys(workerQueues).map(queueName => {
+            workerQueues[queueName].close();
         }),
     );
 };
diff --git a/src/app/js/public/menu/MenuItem.spec.js b/src/app/js/public/menu/MenuItem.spec.js
index e394f803e..e57a0be27 100644
--- a/src/app/js/public/menu/MenuItem.spec.js
+++ b/src/app/js/public/menu/MenuItem.spec.js
@@ -199,7 +199,7 @@ describe('MenuItem', () => {
 
             const link = wrapper.find('a');
 
-            expect(link.prop('href')).toBe('/admin');
+            expect(link.prop('href')).toBe('/instance/default/admin');
         });
 
         it('should not render MenuItem when role is not admin', () => {