Refactor and add delay in branch test

Author: harshitha-cstk

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 => {