Merge pull request #289 from contentstack/fix/sanity-delay

harshithad0703 · web-flow · commit 205970c1c618 · 2025-03-10T16:48:51.000+05:30
Fix: Await response in branch merge for proper async handling
diff --git a/test/sanity-check/api/branch-test.js b/test/sanity-check/api/branch-test.js
@@ -158,7 +158,7 @@ describe('Branch api Test', () => {
         }
       ]
     }
-    const response = makeBranch().merge(mergeObj, params)
+    const response = await makeBranch().merge(mergeObj, params)
     mergeJobUid = response.uid
     expect(response.merge_details.base_branch).to.be.equal(branch.uid)
     expect(response.merge_details.compare_branch).to.be.equal(stageBranch.uid)

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ describe('Branch api Test', () => {`
`158`	`158`	`}`
`159`	`159`	`]`
`160`	`160`	`}`
`161`		`- const response = makeBranch().merge(mergeObj, params)`
	`161`	`+ const response = await makeBranch().merge(mergeObj, params)`
`162`	`162`	`mergeJobUid = response.uid`
`163`	`163`	`expect(response.merge_details.base_branch).to.be.equal(branch.uid)`
`164`	`164`	`expect(response.merge_details.compare_branch).to.be.equal(stageBranch.uid)`