mirror of
				https://github.com/strapi/strapi.git
				synced 2025-10-31 01:47:13 +00:00 
			
		
		
		
	Fix merge error
This commit is contained in:
		
							parent
							
								
									c5f9d16105
								
							
						
					
					
						commit
						7855b7acbb
					
				| @ -35,7 +35,7 @@ describe('Content-Manager', () => { | |||||||
|       await entityManager.publish(entity, uid); |       await entityManager.publish(entity, uid); | ||||||
| 
 | 
 | ||||||
|       expect(strapi.entityService.update).toBeCalledWith(uid, entity.id, { |       expect(strapi.entityService.update).toBeCalledWith(uid, entity.id, { | ||||||
|         data: { published_At: expect.any(Date) }, |         data: { publishedAt: expect.any(Date) }, | ||||||
|         populate: {}, |         populate: {}, | ||||||
|       }); |       }); | ||||||
|     }); |     }); | ||||||
| @ -63,7 +63,7 @@ describe('Content-Manager', () => { | |||||||
|       await entityManager.unpublish(entity, uid); |       await entityManager.unpublish(entity, uid); | ||||||
| 
 | 
 | ||||||
|       expect(strapi.entityService.update).toHaveBeenCalledWith(uid, entity.id, { |       expect(strapi.entityService.update).toHaveBeenCalledWith(uid, entity.id, { | ||||||
|         data: { published_At: null }, |         data: { publishedAt: null }, | ||||||
|         populate: {}, |         populate: {}, | ||||||
|       }); |       }); | ||||||
|     }); |     }); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Alexandre Bodin
						Alexandre Bodin