Skip to content

Commit

Permalink
feat(config): rename getBranchStatus to resolveBranchStatus
Browse files Browse the repository at this point in the history
  • Loading branch information
pret-a-porter committed Sep 8, 2021
1 parent 68ca821 commit 3fcc6eb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions lib/workers/branch/automerge.ts
Expand Up @@ -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'
Expand All @@ -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
);
Expand Down
4 changes: 2 additions & 2 deletions lib/workers/branch/status-checks.spec.ts
Expand Up @@ -3,7 +3,7 @@ import { BranchStatus } from '../../types';
import {
ConfidenceConfig,
StabilityConfig,
getBranchStatus,
resolveBranchStatus,
setConfidence,
setStability,
} from './status-checks';
Expand Down Expand Up @@ -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
);
});
Expand Down
4 changes: 2 additions & 2 deletions lib/workers/branch/status-checks.ts
Expand Up @@ -7,12 +7,12 @@ import {
isActiveConfidenceLevel,
} from '../../util/merge-confidence';

export async function getBranchStatus(
export async function resolveBranchStatus(
branchName: string,
ignoreTests = false
): Promise<BranchStatus> {
logger.debug(
`getBranchStatus(branchName=${branchName}, ignoreTests=${ignoreTests})`
`resolveBranchStatus(branchName=${branchName}, ignoreTests=${ignoreTests})`
);

if (ignoreTests) {
Expand Down
4 changes: 2 additions & 2 deletions lib/workers/pr/automerge.ts
Expand Up @@ -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 {
Expand Down Expand Up @@ -52,7 +52,7 @@ export async function checkAutoMerge(
prAutomergeBlockReason: PrAutomergeBlockReason.PlatformNotReady,
};
}
const branchStatus = await getBranchStatus(
const branchStatus = await resolveBranchStatus(
config.branchName,
config.ignoreTests
);
Expand Down
4 changes: 2 additions & 2 deletions 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(
Expand All @@ -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
);
Expand Down
4 changes: 2 additions & 2 deletions lib/workers/pr/index.ts
Expand Up @@ -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';
Expand Down Expand Up @@ -165,7 +165,7 @@ export async function ensurePr(
config.forcePr = true;
}

const branchStatus = await getBranchStatus(
const branchStatus = await resolveBranchStatus(
config.branchName,
config.ignoreTests
);
Expand Down

0 comments on commit 3fcc6eb

Please sign in to comment.