From 7855b7acbb91e69ebe2a521eec6595ccec67eebb Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Wed, 22 Sep 2021 17:20:31 +0200
Subject: [PATCH] Fix merge error

---
 .../content-manager/services/__tests__/entity-manager.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/content-manager/services/__tests__/entity-manager.test.js b/packages/core/content-manager/services/__tests__/entity-manager.test.js
index cb49b67562..daa5db075a 100644
--- a/packages/core/content-manager/services/__tests__/entity-manager.test.js
+++ b/packages/core/content-manager/services/__tests__/entity-manager.test.js
@@ -35,7 +35,7 @@ describe('Content-Manager', () => {
       await entityManager.publish(entity, uid);
 
       expect(strapi.entityService.update).toBeCalledWith(uid, entity.id, {
-        data: { published_At: expect.any(Date) },
+        data: { publishedAt: expect.any(Date) },
         populate: {},
       });
     });
@@ -63,7 +63,7 @@ describe('Content-Manager', () => {
       await entityManager.unpublish(entity, uid);
 
       expect(strapi.entityService.update).toHaveBeenCalledWith(uid, entity.id, {
-        data: { published_At: null },
+        data: { publishedAt: null },
         populate: {},
       });
     });