renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 15:06:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: reset file list when setting base branch (gitlab)

Browse source
This commit is contained in:
Rhys Arkins 2018-02-03 10:39:04 +01:00
parent 03bdfe191f
commit 6101f25dc7
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/platform/gitlab/index.js
View file

@ -108,9 +108,12 @@ function getRepoForceRebase() {
return false; return false;
} }
function setBaseBranch(branchName) { async function setBaseBranch(branchName) {
if (branchName) { if (branchName) {
logger.debug(`Setting baseBranch to ${branchName}`);
config.baseBranch = branchName; config.baseBranch = branchName;
delete config.fileList;
await getFileList(branchName);
} }
} }

11
test/platform/gitlab/__snapshots__/index.spec.js.snap
View file

@ -290,4 +290,13 @@ Array [
exports[`platform/gitlab initRepo should initialise the config for the repo - 2 2`] = `Object {}`; exports[`platform/gitlab initRepo should initialise the config for the repo - 2 2`] = `Object {}`;
exports[`platform/gitlab setBaseBranch(branchName) sets the base branch 1`] = `Array []`; exports[`platform/gitlab setBaseBranch(branchName) sets the base branch 1`] = `
Array [
Array [
"projects/undefined/repository/tree?ref=some-branch&recursive=true&per_page=100",
Object {
"paginate": true,
},
],
]
`;

8
test/platform/gitlab/index.spec.js
View file

@ -136,14 +136,6 @@ describe('platform/gitlab', () => {
}); });
describe('setBaseBranch(branchName)', () => { describe('setBaseBranch(branchName)', () => {
it('sets the base branch', async () => { it('sets the base branch', async () => {
// getBranchCommit
get.mockImplementationOnce(() => ({
body: {
object: {
sha: '1238',
},
},
}));
await gitlab.setBaseBranch('some-branch'); await gitlab.setBaseBranch('some-branch');
expect(get.mock.calls).toMatchSnapshot(); expect(get.mock.calls).toMatchSnapshot();
}); });