Skip to content
Snippets Groups Projects
Select Git revision
  • 1789d349bb32a46b034dbf7705e147680e07fce6
  • main default protected
  • renovate/main-ghcr.io-renovatebot-base-image-10.x
  • renovate/main-ghcr.io-containerbase-devcontainer-13.x
  • next
  • revert-31645-feat/rename-gradle-wrapper-validation-action
  • renovate/main-redis-5.x
  • fix/36615b-branch-reuse-no-cache
  • chore/punycode
  • fix/36615-branch-reuse-bug
  • refactor/pin-new-value
  • feat/36219--git-x509-signing
  • feat/structured-logger
  • hotfix/39.264.1
  • feat/skip-dangling
  • gh-readonly-queue/next/pr-36034-7a061c4ca1024a19e2c295d773d9642625d1c2be
  • hotfix/39.238.3
  • refactor/gitlab-auto-approve
  • feat/template-strings
  • gh-readonly-queue/next/pr-35654-137d934242c784e0c45d4b957362214f0eade1d7
  • fix/32307-global-extends-merging
  • 41.30.4
  • 41.30.3
  • 41.30.2
  • 41.30.1
  • 41.30.0
  • 41.29.1
  • 41.29.0
  • 41.28.2
  • 41.28.1
  • 41.28.0
  • 41.27.1
  • 41.27.0
  • 41.26.2
  • 41.26.1
  • 41.26.0
  • 41.25.1
  • 41.25.0
  • 41.24.0
  • 41.23.5
  • 41.23.4
41 results

index.spec.ts

Blame
  • reuse.spec.ts 6.62 KiB
    import { getName, git, platform } from '../../../test/util';
    import { RenovateConfig } from '../../config';
    import { Pr } from '../../platform';
    import { PrState } from '../../types';
    import { shouldReuseExistingBranch } from './reuse';
    
    jest.mock('../../util/git');
    
    describe(getName(__filename), () => {
      describe('shouldReuseExistingBranch(config)', () => {
        const pr: Pr = {
          sourceBranch: 'master',
          state: PrState.Open,
          title: 'any',
        };
        let config: RenovateConfig;
        beforeEach(() => {
          config = {
            branchName: 'renovate/some-branch',
            rebaseLabel: 'rebase',
            rebaseWhen: 'behind-base-branch',
          };
          jest.resetAllMocks();
        });
        it('returns false if branch does not exist', async () => {
          git.branchExists.mockReturnValueOnce(false);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
        it('returns true if no PR', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockReturnValue(null);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
        });
        it('returns true if does not need rebasing', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            isConflicted: false,
          });
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
        });
        it('returns true if unmergeable and cannot rebase', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            isConflicted: true,
          });
          git.isBranchModified.mockResolvedValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
        });
        it('returns true if unmergeable and can rebase, but rebaseWhen is never', async () => {
          config.rebaseWhen = 'never';
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            isConflicted: true,
          });
          git.isBranchModified.mockResolvedValueOnce(false);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
        });
        it('returns false if PR title rebase!', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            title: 'rebase!Update foo to v4',
          });
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
        it('returns false if PR body check rebase', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            title: 'Update foo to v4',
            body: 'blah\nblah\n- [x] <!-- rebase-check -->foo\n',
          });
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
        it('returns false if manual rebase by label', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            labels: ['rebase'],
          });
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
        it('returns false if unmergeable and can rebase', async () => {
          git.branchExists.mockReturnValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            isConflicted: true,
          });
          git.isBranchModified.mockResolvedValueOnce(false);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
        it('returns true if automerge branch and not stale', async () => {
          config.automerge = true;
          config.automergeType = 'branch';
          git.branchExists.mockReturnValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
        });
        it('returns false if automerge branch and stale', async () => {
          config.rebaseWhen = 'auto';
          config.automerge = true;
          config.automergeType = 'branch';
          git.branchExists.mockReturnValueOnce(true);
          git.isBranchStale.mockResolvedValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
        it('returns true if rebaseWhen=behind-base-branch but cannot rebase', async () => {
          config.rebaseWhen = 'behind-base-branch';
          git.branchExists.mockReturnValueOnce(true);
          git.isBranchStale.mockResolvedValueOnce(true);
          platform.getBranchPr.mockResolvedValueOnce({
            ...pr,
            isConflicted: true,
          });
          git.isBranchModified.mockResolvedValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
        });
    
        it('returns false if automerge pr and stale', async () => {
          config.rebaseWhen = 'auto';
          config.automerge = true;
          config.automergeType = 'pr';
          git.branchExists.mockReturnValueOnce(true);
          git.isBranchStale.mockResolvedValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
    
        it('returns false if getRepoForceRebase and stale', async () => {
          config.rebaseWhen = 'auto';
          platform.getRepoForceRebase.mockResolvedValueOnce(true);
          git.branchExists.mockReturnValueOnce(true);
          git.isBranchStale.mockResolvedValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
        });
    
        it('returns true if automerge, rebaseWhen=never and stale', async () => {
          config.rebaseWhen = 'never';
          config.automerge = true;
          git.branchExists.mockReturnValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(true);
          expect(git.isBranchStale).not.toHaveBeenCalled();
          expect(git.isBranchModified).not.toHaveBeenCalled();
        });
    
        it('returns false if automerge, rebaseWhen=conflicted and stale', async () => {
          config.rebaseWhen = 'conflicted';
          config.automerge = true;
          git.branchExists.mockReturnValueOnce(true);
          git.isBranchStale.mockResolvedValueOnce(true);
          const res = await shouldReuseExistingBranch(config);
          expect(res.reuseExistingBranch).toBe(false);
          expect(git.isBranchStale).toHaveBeenCalled();
          expect(git.isBranchModified).toHaveBeenCalled();
        });
      });
    });