From 5b7644fc203654f24e06477e4e4cec908e777c27 Mon Sep 17 00:00:00 2001 From: "harshitha.d" Date: Mon, 10 Mar 2025 16:29:08 +0530 Subject: [PATCH] Refactor and add delay in branch test --- test/sanity-check/api/branch-test.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/test/sanity-check/api/branch-test.js b/test/sanity-check/api/branch-test.js index 147fcd0d..b1557ed1 100644 --- a/test/sanity-check/api/branch-test.js +++ b/test/sanity-check/api/branch-test.js @@ -132,7 +132,7 @@ describe('Branch api Test', () => { .catch(done) }) - it('should merge given two branches', done => { + it('should merge given two branches', async () => { const params = { base_branch: branch.uid, compare_branch: stageBranch.uid, @@ -158,15 +158,11 @@ describe('Branch api Test', () => { } ] } - makeBranch() - .merge(mergeObj, params) - .then((response) => { - 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) - done() - }) - .catch(done) + const response = 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) + await new Promise(resolve => setTimeout(resolve, 15000)); }) it('should list all recent merge jobs', done => {