From 3fcc6eb9555e8e6375f523606771547a67c3d1da Mon Sep 17 00:00:00 2001 From: Maksim Sharipov Date: Wed, 8 Sep 2021 22:39:57 +0200 Subject: [PATCH] feat(config): rename getBranchStatus to resolveBranchStatus --- lib/workers/branch/automerge.ts | 4 ++-- lib/workers/branch/status-checks.spec.ts | 4 ++-- lib/workers/branch/status-checks.ts | 4 ++-- lib/workers/pr/automerge.ts | 4 ++-- lib/workers/pr/body/config-description.ts | 4 ++-- lib/workers/pr/index.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/workers/branch/automerge.ts b/lib/workers/branch/automerge.ts index 476c2e67e05d98..8ae312e8ffd7b4 100644 --- a/lib/workers/branch/automerge.ts +++ b/lib/workers/branch/automerge.ts @@ -4,7 +4,7 @@ import { logger } from '../../logger'; import { platform } from '../../platform'; import { BranchStatus } from '../../types'; import { mergeBranch } from '../../util/git'; -import { getBranchStatus } from './status-checks'; +import { resolveBranchStatus } from './status-checks'; export type AutomergeResult = | 'automerged' @@ -26,7 +26,7 @@ export async function tryBranchAutomerge( if (existingPr) { return 'automerge aborted - PR exists'; } - const branchStatus = await getBranchStatus( + const branchStatus = await resolveBranchStatus( config.branchName, config.ignoreTests ); diff --git a/lib/workers/branch/status-checks.spec.ts b/lib/workers/branch/status-checks.spec.ts index e85935de9e53a7..ad4d1c262702f6 100644 --- a/lib/workers/branch/status-checks.spec.ts +++ b/lib/workers/branch/status-checks.spec.ts @@ -3,7 +3,7 @@ import { BranchStatus } from '../../types'; import { ConfidenceConfig, StabilityConfig, - getBranchStatus, + resolveBranchStatus, setConfidence, setStability, } from './status-checks'; @@ -90,7 +90,7 @@ describe('workers/branch/status-checks', () => { describe('getBranchStatus', () => { it('should return green if ignoreTests=true', async () => { - expect(await getBranchStatus('somebranch', true)).toBe( + expect(await resolveBranchStatus('somebranch', true)).toBe( BranchStatus.green ); }); diff --git a/lib/workers/branch/status-checks.ts b/lib/workers/branch/status-checks.ts index e94d23930167be..58b7e79b223083 100644 --- a/lib/workers/branch/status-checks.ts +++ b/lib/workers/branch/status-checks.ts @@ -7,12 +7,12 @@ import { isActiveConfidenceLevel, } from '../../util/merge-confidence'; -export async function getBranchStatus( +export async function resolveBranchStatus( branchName: string, ignoreTests = false ): Promise { logger.debug( - `getBranchStatus(branchName=${branchName}, ignoreTests=${ignoreTests})` + `resolveBranchStatus(branchName=${branchName}, ignoreTests=${ignoreTests})` ); if (ignoreTests) { diff --git a/lib/workers/pr/automerge.ts b/lib/workers/pr/automerge.ts index c5570cf4f92ab2..f96dd04b3dd8ae 100644 --- a/lib/workers/pr/automerge.ts +++ b/lib/workers/pr/automerge.ts @@ -3,7 +3,7 @@ import { logger } from '../../logger'; import { Pr, platform } from '../../platform'; import { BranchStatus } from '../../types'; import { deleteBranch, isBranchModified } from '../../util/git'; -import { getBranchStatus } from '../branch/status-checks'; +import { resolveBranchStatus } from '../branch/status-checks'; import { BranchConfig } from '../types'; export enum PrAutomergeBlockReason { @@ -52,7 +52,7 @@ export async function checkAutoMerge( prAutomergeBlockReason: PrAutomergeBlockReason.PlatformNotReady, }; } - const branchStatus = await getBranchStatus( + const branchStatus = await resolveBranchStatus( config.branchName, config.ignoreTests ); diff --git a/lib/workers/pr/body/config-description.ts b/lib/workers/pr/body/config-description.ts index 32ac5575b128ba..17ac4d82d1202a 100644 --- a/lib/workers/pr/body/config-description.ts +++ b/lib/workers/pr/body/config-description.ts @@ -1,6 +1,6 @@ import { BranchStatus } from '../../../types'; import { emojify } from '../../../util/emoji'; -import { getBranchStatus } from '../../branch/status-checks'; +import { resolveBranchStatus } from '../../branch/status-checks'; import type { BranchConfig } from '../../types'; export async function getPrConfigDescription( @@ -26,7 +26,7 @@ export async function getPrConfigDescription( prBody += '\n\n'; prBody += emojify(':vertical_traffic_light: **Automerge**: '); if (config.automerge) { - const branchStatus = await getBranchStatus( + const branchStatus = await resolveBranchStatus( config.branchName, config.ignoreTests ); diff --git a/lib/workers/pr/index.ts b/lib/workers/pr/index.ts index 744e4b72ff43ea..eef8e1b684a18e 100644 --- a/lib/workers/pr/index.ts +++ b/lib/workers/pr/index.ts @@ -13,7 +13,7 @@ import { sampleSize } from '../../util'; import { stripEmojis } from '../../util/emoji'; import { deleteBranch, getBranchLastCommitTime } from '../../util/git'; import * as template from '../../util/template'; -import { getBranchStatus } from '../branch/status-checks'; +import { resolveBranchStatus } from '../branch/status-checks'; import { Limit, incLimitedValue, isLimitReached } from '../global/limits'; import type { BranchConfig, PrBlockedBy } from '../types'; import { getPrBody } from './body'; @@ -165,7 +165,7 @@ export async function ensurePr( config.forcePr = true; } - const branchStatus = await getBranchStatus( + const branchStatus = await resolveBranchStatus( config.branchName, config.ignoreTests );