Skip to content
Snippets Groups Projects
Unverified Commit de7ca877 authored by ylemkimon's avatar ylemkimon Committed by GitHub
Browse files

fix(npm): merge compatibility in generateBranchConfig (#7290)


Co-authored-by: default avatarRhys Arkins <rhys@arkins.net>
parent 62bc6497
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,7 @@ Object { ...@@ -13,6 +13,7 @@ Object {
"branchName": "some-branch", "branchName": "some-branch",
"canBeUnpublished": false, "canBeUnpublished": false,
"commitMessage": "", "commitMessage": "",
"compatibility": Object {},
"depName": "some-dep", "depName": "some-dep",
"dependencyDashboardApproval": false, "dependencyDashboardApproval": false,
"dependencyDashboardPrApproval": false, "dependencyDashboardPrApproval": false,
...@@ -73,6 +74,7 @@ Object { ...@@ -73,6 +74,7 @@ Object {
| ---------- | --------------- | ----- | ----- | | ---------- | --------------- | ----- | ----- |
| npm | @types/some-dep | 0.5.7 | 0.5.8 | | npm | @types/some-dep | 0.5.7 | 0.5.8 |
", ",
"compatibility": Object {},
"datasource": "npm", "datasource": "npm",
"depName": "some-dep", "depName": "some-dep",
"dependencyDashboardApproval": false, "dependencyDashboardApproval": false,
......
...@@ -74,6 +74,9 @@ describe('workers/repository/updates/generate', () => { ...@@ -74,6 +74,9 @@ describe('workers/repository/updates/generate', () => {
releaseTimestamp: '2017-02-07T20:01:41+00:00', releaseTimestamp: '2017-02-07T20:01:41+00:00',
canBeUnpublished: false, canBeUnpublished: false,
automerge: true, automerge: true,
compatibility: {
foo: '1.0.0',
},
}, },
{ {
depName: 'some-other-dep', depName: 'some-other-dep',
...@@ -91,6 +94,27 @@ describe('workers/repository/updates/generate', () => { ...@@ -91,6 +94,27 @@ describe('workers/repository/updates/generate', () => {
releaseTimestamp: '2017-02-06T20:01:41+00:00', releaseTimestamp: '2017-02-06T20:01:41+00:00',
canBeUnpublished: true, canBeUnpublished: true,
automerge: false, automerge: false,
compatibility: {
foo: '1.0.0',
bar: '2.0.0',
},
},
{
depName: 'another-dep',
groupName: 'some-group',
branchName: 'some-branch',
prTitle: 'some-title',
commitMessageExtra:
'to {{#if isMajor}}v{{newMajor}}{{else}}{{#unless isRange}}v{{/unless}}{{newValue}}{{/if}}',
foo: 1,
newValue: '5.1.2',
toVersion: '5.1.2',
group: {
foo: 2,
},
releaseTimestamp: '2017-02-06T20:01:41+00:00',
canBeUnpublished: true,
automerge: false,
}, },
]; ];
const res = generateBranchConfig(branch); const res = generateBranchConfig(branch);
...@@ -99,6 +123,10 @@ describe('workers/repository/updates/generate', () => { ...@@ -99,6 +123,10 @@ describe('workers/repository/updates/generate', () => {
expect(res.releaseTimestamp).toEqual('2017-02-07T20:01:41+00:00'); expect(res.releaseTimestamp).toEqual('2017-02-07T20:01:41+00:00');
expect(res.canBeUnpublished).toBe(true); expect(res.canBeUnpublished).toBe(true);
expect(res.automerge).toBe(false); expect(res.automerge).toBe(false);
expect(res.compatibility).toEqual({
foo: '1.0.0',
bar: '2.0.0',
});
}); });
it('groups multiple upgrades different version', () => { it('groups multiple upgrades different version', () => {
const branch = [ const branch = [
......
...@@ -304,6 +304,10 @@ export function generateBranchConfig( ...@@ -304,6 +304,10 @@ export function generateBranchConfig(
config.blockedByPin = config.upgrades.every( config.blockedByPin = config.upgrades.every(
(upgrade) => upgrade.blockedByPin (upgrade) => upgrade.blockedByPin
); );
config.compatibility = Object.assign(
{},
...config.upgrades.map((upgrade) => upgrade.compatibility)
);
const tableRows = config.upgrades const tableRows = config.upgrades
.map((upgrade) => getTableValues(upgrade)) .map((upgrade) => getTableValues(upgrade))
.filter(Boolean); .filter(Boolean);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment