Merge conflict resolution

eric-pSAP · eric-pSAP · commit 417ce6d39c30 · 2025-11-27T16:18:47.000+01:00
diff --git a/tests/integration/attachments.test.js b/tests/integration/attachments.test.js
@@ -496,8 +496,7 @@ describe("Tests for uploading/deleting attachments through API calls", () => {
       }
     )
     expect(attachRes.data.ID).not.toBeNull()
-    const abc = await utils.draftModeSave("processor", "Test", testID, "ProcessorService")
-    console.log(abc)
+    await utils.draftModeSave("processor", "Test", testID, "ProcessorService")
     // Delete the parent Test entity
     const delRes = await DELETE(
       `odata/v4/processor/Test(ID=${testID},IsActiveEntity=true)`

Original file line number	Diff line number	Diff line change
`@@ -496,8 +496,7 @@ describe("Tests for uploading/deleting attachments through API calls", () => {`
`496`	`496`	`}`
`497`	`497`	`)`
`498`	`498`	`expect(attachRes.data.ID).not.toBeNull()`
`499`		`- const abc = await utils.draftModeSave("processor", "Test", testID, "ProcessorService")`
`500`		`- console.log(abc)`
	`499`	`+ await utils.draftModeSave("processor", "Test", testID, "ProcessorService")`
`501`	`500`	`// Delete the parent Test entity`
`502`	`501`	`const delRes = await DELETE(`
`503`	`502`	`odata/v4/processor/Test(ID=${testID},IsActiveEntity=true)`