diff --git a/lib/workers/common.ts b/lib/workers/common.ts index 6a9ca078368ac8bdb72622ea9885736e7c83997c..6bdd60731dc8c7b40f800cba59f82edc3b6bedf3 100644 --- a/lib/workers/common.ts +++ b/lib/workers/common.ts @@ -46,10 +46,10 @@ export interface BranchUpgradeConfig } export enum PrResult { - AwaitingBranchAutomerge = 'AwaitingBranchAutomerge', AwaitingApproval = 'AwaitingApproval', AwaitingGreenBranch = 'AwaitingGreenBranch', AwaitingNotPending = 'AwaitingNotPending', + BlockeddByBranchAutomerge = 'BlockeddByBranchAutomerge', Created = 'Created', Error = 'Error', ErrorAlreadyExists = 'ErrorAlreadyExists', diff --git a/lib/workers/pr/index.spec.ts b/lib/workers/pr/index.spec.ts index e7c980cba68de3c83fec2948d3987e4cadae8502..bad71f576779cce3efc77eb0418c2454e966db04 100644 --- a/lib/workers/pr/index.spec.ts +++ b/lib/workers/pr/index.spec.ts @@ -433,7 +433,7 @@ describe('workers/pr', () => { platform.getBranchStatus.mockResolvedValueOnce(BranchStatus.yellow); platform.getBranchLastCommitTime.mockResolvedValueOnce(new Date()); const { prResult, pr } = await prWorker.ensurePr(config); - expect(prResult).toEqual(PrResult.AwaitingBranchAutomerge); + expect(prResult).toEqual(PrResult.BlockeddByBranchAutomerge); expect(pr).toBeUndefined(); }); it('should not return no PR if branch automerging taking too long', async () => { diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts index d0c3f49c60e060e84d48f556cf74d80d6bba620a..cf9c9b60730468e0a825580ad9cc9beaa39d0211 100644 --- a/lib/workers/pr/index.ts +++ b/lib/workers/pr/index.ts @@ -133,7 +133,7 @@ export async function ensurePr( logger.debug(`Branch tests failed, so will create PR`); } else { // Branch should be automerged, so we don't want to create a PR - return { prResult: PrResult.AwaitingBranchAutomerge }; + return { prResult: PrResult.BlockeddByBranchAutomerge }; } } if (config.prCreation === 'status-success') {