Feat(tenant): Update enrichment test for update

Inist-CNRS · Oct 23, 2023 · d748421 · d748421
1 parent 8e7caa5
commit d748421
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 8 deletions.
diff --git a/cypress/e2e/phase_2/enrichment.cy.js b/cypress/e2e/phase_2/enrichment.cy.js
@@ -17,6 +17,7 @@ describe('Enrichment', () => {
             enrichmentFormPage.openEnrichment();
             cy.wait(300);
             enrichmentFormPage.fillAdvancedEnrichment();
+            enrichmentFormPage.updateNameEnrichment();
             enrichmentFormPage.runEnrichment();
             adminNavigation.goToData();
             cy.wait(300);

diff --git a/cypress/support/enrichmentFormPage.js b/cypress/support/enrichmentFormPage.js
@@ -39,6 +39,19 @@ bySecond = 1
     cy.wait(6000);
 };
 
+export const updateNameEnrichment = () => {
+    cy.get('input[name="name"]', { timeout: 500 }).clear();
+    cy.get('input[name="name"]', { timeout: 500 }).type('Enrichment');
+    cy.contains('Save', { timeout: 500 }).click({
+        force: true,
+    });
+    cy.reload();
+    cy.get('input[name="name"]', { timeout: 3500 }).should(
+        'have.value',
+        'Enrichment',
+    );
+};
+
 export const runEnrichment = () => {
     cy.contains('Run', { timeout: 6000 }).click({
         force: true,

diff --git a/src/api/controller/api/login.spec.js b/src/api/controller/api/login.spec.js
@@ -2,6 +2,7 @@ import { auth } from 'config';
 import jwt from 'jsonwebtoken';
 
 import { postLogin as login } from './login';
+import { ADMIN_ROLE } from '../../../common/tools/tenantTools';
 
 const expDate = Date.now();
 
@@ -66,19 +67,19 @@ describe('login', () => {
             token: jwt.sign(
                 {
                     username: 'user',
-                    role: 'admin',
+                    role: ADMIN_ROLE,
                     exp: Math.ceil(expDate / 1000) + auth.expiresIn,
                 },
                 auth.headerSecret,
             ),
-            role: 'admin',
+            role: ADMIN_ROLE,
         });
         expect(setCall).toEqual([
             'lodex_token_test',
             jwt.sign(
                 {
                     username: 'user',
-                    role: 'admin',
+                    role: ADMIN_ROLE,
                     exp: Math.ceil(expDate / 1000) + auth.expiresIn,
                 },
                 auth.cookieSecret,

diff --git a/src/api/models/enrichment.js b/src/api/models/enrichment.js
@@ -26,7 +26,9 @@ export default async db => {
                 {
                     $or: [{ _id: objectId }, { _id: id }],
                 },
-                omit(data, ['_id']),
+                {
+                    $set: omit(data, ['_id']),
+                },
                 {
                     returnOriginal: false,
                 },

diff --git a/src/api/models/field.js b/src/api/models/field.js
@@ -367,7 +367,7 @@ export default async db => {
                     {
                         _id: new ObjectId(uf._id),
                     },
-                    uf,
+                    { $set: uf },
                 ),
             ),
         );

diff --git a/src/api/models/precomputed.js b/src/api/models/precomputed.js
@@ -38,7 +38,9 @@ export default async db => {
                 {
                     $or: [{ _id: objectId }, { _id: id }],
                 },
-                omit(data, ['_id']),
+                {
+                    $set: omit(data, ['_id']),
+                },
                 {
                     returnOriginal: false,
                 },

diff --git a/src/api/models/subresource.js b/src/api/models/subresource.js
@@ -26,7 +26,9 @@ export default async db => {
                 {
                     _id: objectId,
                 },
-                omit(data, ['_id']),
+                {
+                    $set: omit(data, ['_id']),
+                },
                 {
                     returnOriginal: false,
                 },

diff --git a/src/api/models/tenant.js b/src/api/models/tenant.js
@@ -28,7 +28,9 @@ export default async db => {
                 {
                     $or: [{ _id: objectId }, { _id: id }],
                 },
-                omit(data, ['_id']),
+                {
+                    $set: omit(data, ['_id']),
+                },
                 {
                     returnOriginal: false,
                 },
-Original file line number
+Diff line change
@@ Expand Up / @@ -367,7 +367,7 @@ export default async db => { @@
                         {
                             _id: new ObjectId(uf._id),
                         },
-                        uf,
+                        { $set: uf },
                     ),
                 ),
             );
@@ Expand Down @@