From 4fe3c1b4c430064fef281990ea74b67dfe92040e Mon Sep 17 00:00:00 2001
From: Bassel Kanso <basselkanso82@gmail.com>
Date: Mon, 27 May 2024 16:40:15 +0300
Subject: [PATCH] fix: populate syntax in media test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
---
 .../core/utils/src/traverse/query-populate.ts   |  2 ++
 .../strapi/api/populate/sanitize.test.api.js    | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/core/utils/src/traverse/query-populate.ts b/packages/core/utils/src/traverse/query-populate.ts
index 49c1daf76f..9f632b4fdb 100644
--- a/packages/core/utils/src/traverse/query-populate.ts
+++ b/packages/core/utils/src/traverse/query-populate.ts
@@ -176,6 +176,8 @@ const populate = traverseFactory()
         const newValue = await recurse(visitor, { schema, path, getModel }, { on: value?.on });
 
         set(key, { on: newValue });
+
+        return;
       }
 
       const targetSchemaUID = attribute.target;
diff --git a/tests/api/core/strapi/api/populate/sanitize.test.api.js b/tests/api/core/strapi/api/populate/sanitize.test.api.js
index 4d644fd3ce..b1f4526c18 100644
--- a/tests/api/core/strapi/api/populate/sanitize.test.api.js
+++ b/tests/api/core/strapi/api/populate/sanitize.test.api.js
@@ -21,7 +21,9 @@ const schemas = {
       singularName: 'a',
       pluralName: 'as',
       attributes: {
-        cover: { type: 'media' },
+        cover: {
+          type: 'media',
+        },
       },
     },
     b: {
@@ -143,9 +145,13 @@ describe('Sanitize populated entries', () => {
 
     test("Media's relations (from related) can be populated without restricted attributes", async () => {
       const { status, body } = await contentAPIRequest.get(`/upload/files/${file.id}`, {
-        qs: { populate: { related: { populate: '*' } } },
+        qs: {
+          populate: {
+            related: true,
+          },
+        },
       });
-
+      console.log(body);
       expect(status).toBe(200);
       expect(body.related).toBeDefined();
       expect(Array.isArray(body.related)).toBeTruthy();
@@ -170,7 +176,10 @@ describe('Sanitize populated entries', () => {
       });
 
       const { status } = await contentAPIRequest.get(`/${schemas.contentTypes.b.pluralName}`, {
-        qs: { fields: ['id'], populate: '*' },
+        qs: {
+          fields: ['id'],
+          populate: '*',
+        },
       });
 
       expect(status).toBe(200);