mirror of
https://github.com/renovatebot/renovate.git
synced 2025-01-15 09:06:25 +00:00
d3b774e8ef
Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-authored-by: Rhys Arkins <rhys@arkins.net>
756 lines
23 KiB
TypeScript
756 lines
23 KiB
TypeScript
import fs from 'fs-extra';
|
|
import Git from 'simple-git';
|
|
import tmp from 'tmp-promise';
|
|
import { mocked } from '../../../test/util';
|
|
import { GlobalConfig } from '../../config/global';
|
|
import { CONFIG_VALIDATION } from '../../constants/error-messages';
|
|
import * as _conflictsCache from './conflicts-cache';
|
|
import type { FileChange } from './types';
|
|
import * as git from '.';
|
|
import { setNoVerify } from '.';
|
|
|
|
jest.mock('./conflicts-cache');
|
|
const conflictsCache = mocked(_conflictsCache);
|
|
|
|
// Class is no longer exported
|
|
const SimpleGit = Git().constructor as { prototype: ReturnType<typeof Git> };
|
|
|
|
describe('util/git/index', () => {
|
|
jest.setTimeout(15000);
|
|
|
|
const masterCommitDate = new Date();
|
|
masterCommitDate.setMilliseconds(0);
|
|
let base: tmp.DirectoryResult;
|
|
let origin: tmp.DirectoryResult;
|
|
let defaultBranch: string;
|
|
|
|
beforeAll(async () => {
|
|
base = await tmp.dir({ unsafeCleanup: true });
|
|
const repo = Git(base.path);
|
|
await repo.init();
|
|
defaultBranch = (await repo.raw('branch', '--show-current')).trim();
|
|
await repo.addConfig('user.email', 'Jest@example.com');
|
|
await repo.addConfig('user.name', 'Jest');
|
|
await fs.writeFile(base.path + '/past_file', 'past');
|
|
await repo.addConfig('commit.gpgsign', 'false');
|
|
await repo.add(['past_file']);
|
|
await repo.commit('past message');
|
|
|
|
await repo.checkout(['-b', 'renovate/past_branch', defaultBranch]);
|
|
await repo.checkout(['-b', 'develop', defaultBranch]);
|
|
|
|
await repo.checkout(defaultBranch);
|
|
await fs.writeFile(base.path + '/master_file', defaultBranch);
|
|
await fs.writeFile(base.path + '/file_to_delete', 'bye');
|
|
await repo.add(['master_file', 'file_to_delete']);
|
|
await repo.commit('master message', [
|
|
'--date=' + masterCommitDate.toISOString(),
|
|
]);
|
|
|
|
await repo.checkout(['-b', 'renovate/future_branch', defaultBranch]);
|
|
await fs.writeFile(base.path + '/future_file', 'future');
|
|
await repo.add(['future_file']);
|
|
await repo.commit('future message');
|
|
|
|
await repo.checkoutBranch('renovate/modified_branch', defaultBranch);
|
|
await fs.writeFile(base.path + '/base_file', 'base');
|
|
await repo.add(['base_file']);
|
|
await repo.commit('base message');
|
|
await fs.writeFile(base.path + '/modified_file', 'modified');
|
|
await repo.add(['modified_file']);
|
|
await repo.commit('modification');
|
|
|
|
await repo.checkoutBranch('renovate/custom_author', defaultBranch);
|
|
await fs.writeFile(base.path + '/custom_file', 'custom');
|
|
await repo.add(['custom_file']);
|
|
await repo.addConfig('user.email', 'custom@example.com');
|
|
await repo.commit('custom message');
|
|
|
|
await repo.checkoutBranch('renovate/equal_branch', defaultBranch);
|
|
|
|
await repo.checkout(defaultBranch);
|
|
});
|
|
|
|
let tmpDir: tmp.DirectoryResult;
|
|
|
|
beforeEach(async () => {
|
|
origin = await tmp.dir({ unsafeCleanup: true });
|
|
const repo = Git(origin.path);
|
|
await repo.clone(base.path, '.', ['--bare']);
|
|
await repo.addConfig('commit.gpgsign', 'false');
|
|
tmpDir = await tmp.dir({ unsafeCleanup: true });
|
|
GlobalConfig.set({ localDir: tmpDir.path });
|
|
await git.initRepo({
|
|
url: origin.path,
|
|
});
|
|
git.setUserRepoConfig({ branchPrefix: 'renovate/' });
|
|
git.setGitAuthor('Jest <Jest@example.com>');
|
|
setNoVerify([]);
|
|
await git.syncGit();
|
|
// override some local git settings for better testing
|
|
const local = Git(tmpDir.path);
|
|
await local.addConfig('commit.gpgsign', 'false');
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await tmpDir.cleanup();
|
|
await origin.cleanup();
|
|
jest.restoreAllMocks();
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await base.cleanup();
|
|
});
|
|
|
|
describe('validateGitVersion()', () => {
|
|
it('has a git version greater or equal to the minimum required', async () => {
|
|
const res = await git.validateGitVersion();
|
|
expect(res).toBeTrue();
|
|
});
|
|
});
|
|
|
|
describe('checkoutBranch(branchName)', () => {
|
|
it('sets the base branch as master', async () => {
|
|
await expect(git.checkoutBranch(defaultBranch)).resolves.not.toThrow();
|
|
});
|
|
it('sets non-master base branch', async () => {
|
|
await expect(git.checkoutBranch('develop')).resolves.not.toThrow();
|
|
});
|
|
});
|
|
describe('getFileList()', () => {
|
|
it('should return the correct files', async () => {
|
|
expect(await git.getFileList()).toEqual([
|
|
'file_to_delete',
|
|
'master_file',
|
|
'past_file',
|
|
]);
|
|
});
|
|
it('should exclude submodules', async () => {
|
|
const repo = Git(base.path);
|
|
await repo.submoduleAdd(base.path, 'submodule');
|
|
await repo.commit('Add submodule');
|
|
await git.initRepo({
|
|
cloneSubmodules: true,
|
|
url: base.path,
|
|
});
|
|
await git.syncGit();
|
|
expect(await fs.pathExists(tmpDir.path + '/.gitmodules')).toBeTruthy();
|
|
expect(await git.getFileList()).toEqual([
|
|
'.gitmodules',
|
|
'file_to_delete',
|
|
'master_file',
|
|
'past_file',
|
|
]);
|
|
await repo.reset(['--hard', 'HEAD^']);
|
|
});
|
|
});
|
|
describe('branchExists(branchName)', () => {
|
|
it('should return true if found', () => {
|
|
expect(git.branchExists('renovate/future_branch')).toBeTrue();
|
|
});
|
|
it('should return false if not found', () => {
|
|
expect(git.branchExists('not_found')).toBeFalse();
|
|
});
|
|
});
|
|
describe('getBranchList()', () => {
|
|
it('should return all branches', () => {
|
|
const res = git.getBranchList();
|
|
expect(res).toContain('renovate/past_branch');
|
|
expect(res).toContain('renovate/future_branch');
|
|
expect(res).toContain(defaultBranch);
|
|
});
|
|
});
|
|
describe('isBranchStale()', () => {
|
|
it('should return false if same SHA as master', async () => {
|
|
expect(await git.isBranchStale('renovate/future_branch')).toBeFalse();
|
|
});
|
|
it('should return true if SHA different from master', async () => {
|
|
expect(await git.isBranchStale('renovate/past_branch')).toBeTrue();
|
|
});
|
|
it('should return result even if non-default and not under branchPrefix', async () => {
|
|
expect(await git.isBranchStale('develop')).toBeTrue();
|
|
expect(await git.isBranchStale('develop')).toBeTrue(); // cache
|
|
});
|
|
});
|
|
describe('isBranchModified()', () => {
|
|
it('should return false when branch is not found', async () => {
|
|
expect(await git.isBranchModified('renovate/not_found')).toBeFalse();
|
|
});
|
|
it('should return false when author matches', async () => {
|
|
expect(await git.isBranchModified('renovate/future_branch')).toBeFalse();
|
|
expect(await git.isBranchModified('renovate/future_branch')).toBeFalse();
|
|
});
|
|
it('should return false when author is ignored', async () => {
|
|
git.setUserRepoConfig({
|
|
gitIgnoredAuthors: ['custom@example.com'],
|
|
});
|
|
expect(await git.isBranchModified('renovate/custom_author')).toBeFalse();
|
|
});
|
|
it('should return true when custom author is unknown', async () => {
|
|
expect(await git.isBranchModified('renovate/custom_author')).toBeTrue();
|
|
});
|
|
});
|
|
|
|
describe('getBranchCommit(branchName)', () => {
|
|
it('should return same value for equal refs', () => {
|
|
const hex = git.getBranchCommit('renovate/equal_branch');
|
|
expect(hex).toBe(git.getBranchCommit(defaultBranch));
|
|
expect(hex).toHaveLength(40);
|
|
});
|
|
it('should return null', () => {
|
|
expect(git.getBranchCommit('not_found')).toBeNull();
|
|
});
|
|
});
|
|
describe('getBranchParentSha(branchName)', () => {
|
|
it('should return sha if found', async () => {
|
|
const parentSha = await git.getBranchParentSha('renovate/future_branch');
|
|
expect(parentSha).toHaveLength(40);
|
|
expect(parentSha).toEqual(git.getBranchCommit(defaultBranch));
|
|
});
|
|
it('should return false if not found', async () => {
|
|
expect(await git.getBranchParentSha('not_found')).toBeNull();
|
|
});
|
|
});
|
|
describe('getBranchFiles(branchName)', () => {
|
|
it('detects changed files compared to current base branch', async () => {
|
|
const file: FileChange = {
|
|
type: 'addition',
|
|
path: 'some-new-file',
|
|
contents: 'some new-contents',
|
|
};
|
|
await git.commitFiles({
|
|
branchName: 'renovate/branch_with_changes',
|
|
files: [file],
|
|
message: 'Create something',
|
|
});
|
|
const branchFiles = await git.getBranchFiles(
|
|
'renovate/branch_with_changes'
|
|
);
|
|
expect(branchFiles).toEqual(['some-new-file']);
|
|
});
|
|
});
|
|
|
|
describe('mergeBranch(branchName)', () => {
|
|
it('should perform a branch merge', async () => {
|
|
await git.mergeBranch('renovate/future_branch');
|
|
const merged = await Git(origin.path).branch([
|
|
'--verbose',
|
|
'--merged',
|
|
defaultBranch,
|
|
]);
|
|
expect(merged.all).toContain('renovate/future_branch');
|
|
});
|
|
it('should throw if branch merge throws', async () => {
|
|
await expect(git.mergeBranch('not_found')).rejects.toThrow();
|
|
});
|
|
});
|
|
describe('deleteBranch(branchName)', () => {
|
|
it('should send delete', async () => {
|
|
await git.deleteBranch('renovate/past_branch');
|
|
const branches = await Git(origin.path).branch({});
|
|
expect(branches.all).not.toContain('renovate/past_branch');
|
|
});
|
|
});
|
|
describe('getBranchLastCommitTime', () => {
|
|
it('should return a Date', async () => {
|
|
const time = await git.getBranchLastCommitTime(defaultBranch);
|
|
expect(time).toEqual(masterCommitDate);
|
|
});
|
|
it('handles error', async () => {
|
|
const res = await git.getBranchLastCommitTime('some-branch');
|
|
expect(res).toBeDefined();
|
|
});
|
|
});
|
|
describe('getFile(filePath, branchName)', () => {
|
|
it('gets the file', async () => {
|
|
const res = await git.getFile('master_file');
|
|
expect(res).toBe(defaultBranch);
|
|
});
|
|
it('short cuts 404', async () => {
|
|
const res = await git.getFile('some-missing-path');
|
|
expect(res).toBeNull();
|
|
});
|
|
it('returns null for 404', async () => {
|
|
expect(await git.getFile('some-path', 'some-branch')).toBeNull();
|
|
});
|
|
});
|
|
describe('commitFiles({branchName, files, message})', () => {
|
|
it('creates file', async () => {
|
|
const file: FileChange = {
|
|
type: 'addition',
|
|
path: 'some-new-file',
|
|
contents: 'some new-contents',
|
|
};
|
|
const commit = await git.commitFiles({
|
|
branchName: 'renovate/past_branch',
|
|
files: [file],
|
|
message: 'Create something',
|
|
});
|
|
expect(commit).not.toBeNull();
|
|
});
|
|
it('deletes file', async () => {
|
|
const file: FileChange = {
|
|
type: 'deletion',
|
|
path: 'file_to_delete',
|
|
};
|
|
const commit = await git.commitFiles({
|
|
branchName: 'renovate/something',
|
|
files: [file],
|
|
message: 'Delete something',
|
|
});
|
|
expect(commit).not.toBeNull();
|
|
});
|
|
it('updates multiple files', async () => {
|
|
const files: FileChange[] = [
|
|
{
|
|
type: 'addition',
|
|
path: 'some-existing-file',
|
|
contents: 'updated content',
|
|
},
|
|
{
|
|
type: 'addition',
|
|
path: 'some-other-existing-file',
|
|
contents: 'other updated content',
|
|
},
|
|
];
|
|
const commit = await git.commitFiles({
|
|
branchName: 'renovate/something',
|
|
files,
|
|
message: 'Update something',
|
|
});
|
|
expect(commit).not.toBeNull();
|
|
});
|
|
it('updates git submodules', async () => {
|
|
const files: FileChange[] = [
|
|
{
|
|
type: 'addition',
|
|
path: '.',
|
|
contents: 'some content',
|
|
},
|
|
];
|
|
const commit = await git.commitFiles({
|
|
branchName: 'renovate/something',
|
|
files,
|
|
message: 'Update something',
|
|
});
|
|
expect(commit).toBeNull();
|
|
});
|
|
it('does not push when no diff', async () => {
|
|
const files: FileChange[] = [
|
|
{
|
|
type: 'addition',
|
|
path: 'future_file',
|
|
contents: 'future',
|
|
},
|
|
];
|
|
const commit = await git.commitFiles({
|
|
branchName: 'renovate/future_branch',
|
|
files,
|
|
message: 'No change update',
|
|
});
|
|
expect(commit).toBeNull();
|
|
});
|
|
|
|
it('does not pass --no-verify', async () => {
|
|
const commitSpy = jest.spyOn(SimpleGit.prototype, 'commit');
|
|
const pushSpy = jest.spyOn(SimpleGit.prototype, 'push');
|
|
|
|
const files: FileChange[] = [
|
|
{
|
|
type: 'addition',
|
|
path: 'some-new-file',
|
|
contents: 'some new-contents',
|
|
},
|
|
];
|
|
|
|
await git.commitFiles({
|
|
branchName: 'renovate/something',
|
|
files,
|
|
message: 'Pass no-verify',
|
|
});
|
|
|
|
expect(commitSpy).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.anything(),
|
|
expect.not.objectContaining({ '--no-verify': null })
|
|
);
|
|
expect(pushSpy).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.anything(),
|
|
expect.not.objectContaining({ '--no-verify': null })
|
|
);
|
|
});
|
|
|
|
it('passes --no-verify to commit', async () => {
|
|
const commitSpy = jest.spyOn(SimpleGit.prototype, 'commit');
|
|
const pushSpy = jest.spyOn(SimpleGit.prototype, 'push');
|
|
|
|
const files: FileChange[] = [
|
|
{
|
|
type: 'addition',
|
|
path: 'some-new-file',
|
|
contents: 'some new-contents',
|
|
},
|
|
];
|
|
setNoVerify(['commit']);
|
|
|
|
await git.commitFiles({
|
|
branchName: 'renovate/something',
|
|
files,
|
|
message: 'Pass no-verify',
|
|
});
|
|
|
|
expect(commitSpy).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.anything(),
|
|
expect.objectContaining({ '--no-verify': null })
|
|
);
|
|
expect(pushSpy).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.anything(),
|
|
expect.not.objectContaining({ '--no-verify': null })
|
|
);
|
|
});
|
|
|
|
it('passes --no-verify to push', async () => {
|
|
const commitSpy = jest.spyOn(SimpleGit.prototype, 'commit');
|
|
const pushSpy = jest.spyOn(SimpleGit.prototype, 'push');
|
|
|
|
const files: FileChange[] = [
|
|
{
|
|
type: 'addition',
|
|
path: 'some-new-file',
|
|
contents: 'some new-contents',
|
|
},
|
|
];
|
|
setNoVerify(['push']);
|
|
|
|
await git.commitFiles({
|
|
branchName: 'renovate/something',
|
|
files,
|
|
message: 'Pass no-verify',
|
|
});
|
|
|
|
expect(commitSpy).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.anything(),
|
|
expect.not.objectContaining({ '--no-verify': null })
|
|
);
|
|
expect(pushSpy).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.anything(),
|
|
expect.objectContaining({ '--no-verify': null })
|
|
);
|
|
});
|
|
|
|
it('creates file with the executable bit', async () => {
|
|
const file: FileChange = {
|
|
type: 'addition',
|
|
path: 'some-executable',
|
|
contents: 'some new-contents',
|
|
isExecutable: true,
|
|
};
|
|
const commit = await git.commitFiles({
|
|
branchName: 'renovate/past_branch',
|
|
files: [file],
|
|
message: 'Create something',
|
|
});
|
|
expect(commit).not.toBeNull();
|
|
|
|
const repo = Git(tmpDir.path);
|
|
const result = await repo.raw(['ls-tree', 'HEAD', 'some-executable']);
|
|
expect(result).toStartWith('100755');
|
|
});
|
|
});
|
|
|
|
describe('getCommitMessages()', () => {
|
|
it('returns commit messages', async () => {
|
|
expect(await git.getCommitMessages()).toEqual([
|
|
'master message',
|
|
'past message',
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe('Storage.getUrl()', () => {
|
|
const getUrl = git.getUrl;
|
|
it('returns https url', () => {
|
|
expect(
|
|
getUrl({
|
|
protocol: 'https',
|
|
auth: 'user:pass',
|
|
hostname: 'host',
|
|
repository: 'some/repo',
|
|
})
|
|
).toBe('https://user:pass@host/some/repo.git');
|
|
expect(
|
|
getUrl({
|
|
auth: 'user:pass',
|
|
hostname: 'host',
|
|
repository: 'some/repo',
|
|
})
|
|
).toBe('https://user:pass@host/some/repo.git');
|
|
});
|
|
|
|
it('returns ssh url', () => {
|
|
expect(
|
|
getUrl({
|
|
protocol: 'ssh',
|
|
auth: 'user:pass',
|
|
hostname: 'host',
|
|
repository: 'some/repo',
|
|
})
|
|
).toBe('git@host:some/repo.git');
|
|
});
|
|
});
|
|
|
|
describe('initRepo())', () => {
|
|
it('should fetch latest', async () => {
|
|
const repo = Git(base.path);
|
|
await repo.checkout(['-b', 'test', defaultBranch]);
|
|
await fs.writeFile(base.path + '/test', 'lorem ipsum');
|
|
await repo.add(['test']);
|
|
await repo.commit('past message2');
|
|
await repo.checkout(defaultBranch);
|
|
|
|
expect(git.branchExists('test')).toBeFalsy();
|
|
|
|
expect(await git.getCommitMessages()).toEqual([
|
|
'master message',
|
|
'past message',
|
|
]);
|
|
|
|
await git.checkoutBranch('develop');
|
|
|
|
await git.initRepo({
|
|
url: base.path,
|
|
});
|
|
|
|
expect(git.branchExists('test')).toBeTruthy();
|
|
|
|
await git.checkoutBranch('test');
|
|
|
|
const msg = await git.getCommitMessages();
|
|
expect(msg).toEqual(['past message2', 'master message', 'past message']);
|
|
expect(msg).toContain('past message2');
|
|
});
|
|
|
|
it('should set branch prefix', async () => {
|
|
const repo = Git(base.path);
|
|
await repo.checkout(['-b', 'renovate/test', defaultBranch]);
|
|
await fs.writeFile(base.path + '/test', 'lorem ipsum');
|
|
await repo.add(['test']);
|
|
await repo.commit('past message2');
|
|
await repo.checkout(defaultBranch);
|
|
|
|
await git.initRepo({
|
|
url: base.path,
|
|
});
|
|
|
|
git.setUserRepoConfig({ branchPrefix: 'renovate/' });
|
|
expect(git.branchExists('renovate/test')).toBeTrue();
|
|
|
|
await git.initRepo({
|
|
url: base.path,
|
|
});
|
|
|
|
await repo.checkout('renovate/test');
|
|
await repo.commit('past message3', ['--amend']);
|
|
|
|
git.setUserRepoConfig({ branchPrefix: 'renovate/' });
|
|
expect(git.branchExists('renovate/test')).toBeTrue();
|
|
});
|
|
|
|
it('should fail clone ssh submodule', async () => {
|
|
const repo = Git(base.path);
|
|
await fs.writeFile(
|
|
base.path + '/.gitmodules',
|
|
'[submodule "test"]\npath=test\nurl=ssh://0.0.0.0'
|
|
);
|
|
await repo.add('.gitmodules');
|
|
await repo.raw([
|
|
'update-index',
|
|
'--add',
|
|
'--cacheinfo',
|
|
'160000',
|
|
'4b825dc642cb6eb9a060e54bf8d69288fbee4904',
|
|
'test',
|
|
]);
|
|
await repo.commit('Add submodule');
|
|
await git.initRepo({
|
|
cloneSubmodules: true,
|
|
url: base.path,
|
|
});
|
|
await git.syncGit();
|
|
expect(await fs.pathExists(tmpDir.path + '/.gitmodules')).toBeTruthy();
|
|
await repo.reset(['--hard', 'HEAD^']);
|
|
});
|
|
|
|
it('should use extra clone configuration', async () => {
|
|
await fs.emptyDir(tmpDir.path);
|
|
await git.initRepo({
|
|
url: origin.path,
|
|
extraCloneOpts: {
|
|
'-c': 'extra.clone.config=test-extra-config-value',
|
|
},
|
|
fullClone: true,
|
|
});
|
|
git.getBranchCommit(defaultBranch);
|
|
await git.syncGit();
|
|
const repo = Git(tmpDir.path);
|
|
const res = (await repo.raw(['config', 'extra.clone.config'])).trim();
|
|
expect(res).toBe('test-extra-config-value');
|
|
});
|
|
});
|
|
describe('setGitAuthor()', () => {
|
|
it('throws for invalid', () => {
|
|
expect(() => git.setGitAuthor('invalid')).toThrow(CONFIG_VALIDATION);
|
|
});
|
|
});
|
|
|
|
describe('isBranchConflicted', () => {
|
|
beforeAll(async () => {
|
|
const repo = Git(base.path);
|
|
await repo.init();
|
|
|
|
await repo.checkout(['-b', 'renovate/conflicted_branch', defaultBranch]);
|
|
await repo.checkout([
|
|
'-b',
|
|
'renovate/non_conflicted_branch',
|
|
defaultBranch,
|
|
]);
|
|
|
|
await repo.checkout(defaultBranch);
|
|
await fs.writeFile(base.path + '/one_file', 'past (updated)');
|
|
await repo.add(['one_file']);
|
|
await repo.commit('past (updated) message');
|
|
|
|
await repo.checkout('renovate/conflicted_branch');
|
|
await fs.writeFile(base.path + '/one_file', 'past (updated branch)');
|
|
await repo.add(['one_file']);
|
|
await repo.commit('past (updated branch) message');
|
|
|
|
await repo.checkout('renovate/non_conflicted_branch');
|
|
await fs.writeFile(base.path + '/another_file', 'other');
|
|
await repo.add(['another_file']);
|
|
await repo.commit('other (updated branch) message');
|
|
|
|
await repo.checkout(defaultBranch);
|
|
|
|
conflictsCache.getCachedConflictResult.mockReturnValue(null);
|
|
});
|
|
|
|
it('returns true for non-existing source branch', async () => {
|
|
const res = await git.isBranchConflicted(
|
|
defaultBranch,
|
|
'renovate/non_existing_branch'
|
|
);
|
|
expect(res).toBeTrue();
|
|
});
|
|
|
|
it('returns true for non-existing target branch', async () => {
|
|
const res = await git.isBranchConflicted(
|
|
'renovate/non_existing_branch',
|
|
'renovate/non_conflicted_branch'
|
|
);
|
|
expect(res).toBeTrue();
|
|
});
|
|
|
|
it('detects conflicted branch', async () => {
|
|
const branchBefore = 'renovate/non_conflicted_branch';
|
|
await git.checkoutBranch(branchBefore);
|
|
|
|
const res = await git.isBranchConflicted(
|
|
defaultBranch,
|
|
'renovate/conflicted_branch'
|
|
);
|
|
|
|
expect(res).toBeTrue();
|
|
|
|
const status = await git.getRepoStatus();
|
|
expect(status.current).toEqual(branchBefore);
|
|
expect(status.isClean()).toBeTrue();
|
|
});
|
|
|
|
it('detects non-conflicted branch', async () => {
|
|
const branchBefore = 'renovate/conflicted_branch';
|
|
await git.checkoutBranch(branchBefore);
|
|
|
|
const res = await git.isBranchConflicted(
|
|
defaultBranch,
|
|
'renovate/non_conflicted_branch'
|
|
);
|
|
|
|
expect(res).toBeFalse();
|
|
|
|
const status = await git.getRepoStatus();
|
|
expect(status.current).toEqual(branchBefore);
|
|
expect(status.isClean()).toBeTrue();
|
|
});
|
|
|
|
describe('cache', () => {
|
|
beforeEach(() => {
|
|
jest.resetAllMocks();
|
|
});
|
|
it('returns cached values', async () => {
|
|
conflictsCache.getCachedConflictResult.mockReturnValue(true);
|
|
|
|
const res = await git.isBranchConflicted(
|
|
defaultBranch,
|
|
'renovate/conflicted_branch'
|
|
);
|
|
|
|
expect(res).toBeTrue();
|
|
expect(conflictsCache.getCachedConflictResult.mock.calls).toEqual([
|
|
[
|
|
defaultBranch,
|
|
expect.any(String),
|
|
'renovate/conflicted_branch',
|
|
expect.any(String),
|
|
],
|
|
]);
|
|
expect(conflictsCache.setCachedConflictResult).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('caches truthy return value', async () => {
|
|
conflictsCache.getCachedConflictResult.mockReturnValue(null);
|
|
|
|
const res = await git.isBranchConflicted(
|
|
defaultBranch,
|
|
'renovate/conflicted_branch'
|
|
);
|
|
|
|
expect(res).toBeTrue();
|
|
expect(conflictsCache.setCachedConflictResult.mock.calls).toEqual([
|
|
[
|
|
defaultBranch,
|
|
expect.any(String),
|
|
'renovate/conflicted_branch',
|
|
expect.any(String),
|
|
true,
|
|
],
|
|
]);
|
|
});
|
|
|
|
it('caches falsy return value', async () => {
|
|
conflictsCache.getCachedConflictResult.mockReturnValue(null);
|
|
|
|
const res = await git.isBranchConflicted(
|
|
defaultBranch,
|
|
'renovate/non_conflicted_branch'
|
|
);
|
|
|
|
expect(res).toBeFalse();
|
|
expect(conflictsCache.setCachedConflictResult.mock.calls).toEqual([
|
|
[
|
|
defaultBranch,
|
|
expect.any(String),
|
|
'renovate/non_conflicted_branch',
|
|
expect.any(String),
|
|
false,
|
|
],
|
|
]);
|
|
});
|
|
});
|
|
});
|
|
});
|