diff --git a/lib/platform/bitbucket-server/index.js b/lib/platform/bitbucket-server/index.js index 5e96c53d2f1d7e757ee7fd10af6e4d631a6469a1..77ca73f54fe8eef40fdb925975f539b665418446 100644 --- a/lib/platform/bitbucket-server/index.js +++ b/lib/platform/bitbucket-server/index.js @@ -1,4 +1,5 @@ const url = require('url'); +const delay = require('delay'); const api = require('./bb-got-wrapper'); const utils = require('./utils'); @@ -240,6 +241,8 @@ async function commitFilesToBranch( parentBranch ); + // wait for pr change propagation + await delay(1000); // refresh cache await getBranchPr(branchName, true); } @@ -696,6 +699,7 @@ async function getPr(prNo, refreshCache) { if (!prNo) { return null; } + const res = await api.get( `./rest/api/1.0/projects/${config.projectKey}/repos/${ config.repositorySlug diff --git a/test/platform/bitbucket-server/index.spec.js b/test/platform/bitbucket-server/index.spec.js index 6ceaa386e32fe9fd7a56e0ad11210963dc97f3bf..eb92d65528d830a7b9a583638d41fecac18830ec 100644 --- a/test/platform/bitbucket-server/index.spec.js +++ b/test/platform/bitbucket-server/index.spec.js @@ -13,6 +13,7 @@ describe('platform/bitbucket-server', () => { beforeEach(() => { // reset module jest.resetModules(); + jest.mock('delay'); jest.mock('got', () => (url, options) => { const { method } = options; const body = mockResponses[url] && mockResponses[url][method];