From 732fcfd4849379479a2594e836bf83d6bf03a5bd Mon Sep 17 00:00:00 2001
From: mofleury <mofleury@gmail.com>
Date: Thu, 26 Nov 2020 16:15:31 +0100
Subject: [PATCH] fix: upgrade sorting by file replacement position (#7827)
---
.../__snapshots__/generate.spec.ts.snap | 2 +-
.../repository/updates/generate.spec.ts | 36 +++++++++++++++++++
lib/workers/repository/updates/generate.ts | 10 ++++++
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap b/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
index ca3db6457d..67a2d9c2b9 100644
--- a/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
+++ b/lib/workers/repository/updates/__snapshots__/generate.spec.ts.snap
@@ -136,6 +136,6 @@ Object {
}
`;
-exports[`workers/repository/updates/generate generateBranchConfig() handles upgrades 1`] = `"some-title ()"`;
+exports[`workers/repository/updates/generate generateBranchConfig() handles upgrades 1`] = `"some-title (patch)"`;
exports[`workers/repository/updates/generate generateBranchConfig() supports manual prTitle 1`] = `"upgrade some-dep"`;
diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts
index d6b94b835c..c1d68a1700 100644
--- a/lib/workers/repository/updates/generate.spec.ts
+++ b/lib/workers/repository/updates/generate.spec.ts
@@ -482,5 +482,41 @@ describe('workers/repository/updates/generate', () => {
const res = generateBranchConfig(branch);
expect(res.prTitle).toMatchSnapshot();
});
+ it('sorts upgrades, without position first', () => {
+ const branch: BranchUpgradeConfig[] = [
+ {
+ depName: 'some-dep1',
+ branchName: 'some-branch',
+ prTitle: 'some-title',
+ newValue: '0.6.0',
+ fileReplacePosition: 1,
+ },
+ {
+ depName: 'some-dep2',
+ branchName: 'some-branch',
+ prTitle: 'some-title',
+ newValue: '0.6.0',
+ fileReplacePosition: undefined,
+ },
+ {
+ depName: 'some-dep3',
+ branchName: 'some-branch',
+ prTitle: 'some-title',
+ newValue: '0.6.0',
+ fileReplacePosition: 4,
+ },
+ {
+ depName: 'some-dep4',
+ branchName: 'some-branch',
+ prTitle: 'some-title',
+ newValue: '0.6.0',
+ fileReplacePosition: undefined,
+ },
+ ];
+ const res = generateBranchConfig(branch);
+ expect(
+ res.upgrades.map((upgrade) => upgrade.fileReplacePosition)
+ ).toStrictEqual([undefined, undefined, 4, 1]);
+ });
});
});
diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts
index b49297d277..a65315ebf2 100644
--- a/lib/workers/repository/updates/generate.ts
+++ b/lib/workers/repository/updates/generate.ts
@@ -277,6 +277,16 @@ export function generateBranchConfig(
// This is because we need to replace from the bottom of the file up
return a.fileReplacePosition > b.fileReplacePosition ? -1 : 1;
}
+
+ // make sure that ordering is consistent :
+ // items without position will be first in the list.
+ if (a.fileReplacePosition) {
+ return 1;
+ }
+ if (b.fileReplacePosition) {
+ return -1;
+ }
+
if (a.depName < b.depName) {
return -1;
}
--
GitLab