diff --git a/lib/manager/docker/package.js b/lib/manager/docker/package.js
index 9509d37e5b11503d041234f47d703dfca39b5565..c0fb3ec35dbc21484de63fc65abbd4dc412d8b51 100644
--- a/lib/manager/docker/package.js
+++ b/lib/manager/docker/package.js
@@ -48,10 +48,8 @@ async function getPackageUpdates(config) {
if (currentDigest) {
upgrade.type = 'digest';
- upgrade.isDigest = true;
} else {
upgrade.type = 'pin';
- upgrade.isPin = true;
}
upgrades.push(upgrade);
}
@@ -153,10 +151,8 @@ async function getPackageUpdates(config) {
}
if (newVersionMajor > currentMajor) {
upgrade.type = 'major';
- upgrade.isMajor = true;
} else {
upgrade.type = 'minor';
- upgrade.isMinor = true;
}
upgrades.push(upgrade);
logger.info(
diff --git a/lib/manager/npm/versions.js b/lib/manager/npm/versions.js
index 4df3b6731f474a01ccf9f114730a16c234e24c2b..4b33eba8ae94c0039fbf9b87cc498feace1f925a 100644
--- a/lib/manager/npm/versions.js
+++ b/lib/manager/npm/versions.js
@@ -103,7 +103,6 @@ function determineUpgrades(npmDep, config) {
allUpgrades.pin = {
type: 'pin',
- isPin: true,
newVersion,
newVersionMajor: getMajor(newVersion),
};
@@ -117,7 +116,6 @@ function determineUpgrades(npmDep, config) {
);
allUpgrades.rollback = {
type: 'rollback',
- isRollback: true,
newVersion: rollbackVersion,
newVersionMajor: getMajor(rollbackVersion),
semanticCommitType: 'fix',
@@ -202,13 +200,6 @@ function determineUpgrades(npmDep, config) {
fromVersion,
toVersion,
};
- if (type === 'major') {
- allUpgrades[upgradeKey].isMajor = true;
- } else if (type === 'minor') {
- allUpgrades[upgradeKey].isMinor = true;
- } else if (type === 'patch') {
- allUpgrades[upgradeKey].isPatch = true;
- }
}
});
// Return only the values - we don't need the keys anymore
diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js
index 5c2ddea639c7f39e234d90e0a38815ea51947ec1..6d58e0f4a244969aad57ef218fc81e163520651a 100644
--- a/lib/workers/branch/index.js
+++ b/lib/workers/branch/index.js
@@ -50,13 +50,13 @@ async function processBranch(branchConfig, packageFiles) {
if (pr.state === 'closed') {
const subject = 'Renovate Ignore Notification';
let content;
- if (config.isMajor) {
+ if (config.type === 'major') {
content = `As this PR has been closed unmerged, Renovate will ignore this upgrade and you will not receive PRs for *any* future ${
config.newVersionMajor
}.x releases. However, if you upgrade to ${
config.newVersionMajor
}.x manually then Renovate will then reenable updates for minor and patch updates automatically.`;
- } else if (config.isDigest) {
+ } else if (config.type === 'digest') {
content = `As this PR has been closed unmerged, Renovate will ignore this upgrade type and you will not receive PRs for *any* future ${
config.depName
}:${
diff --git a/lib/workers/repository/onboarding/pr/pr-list.js b/lib/workers/repository/onboarding/pr/pr-list.js
index 9fd48e00e866409394f0097b0e7786592f3ddb49..af4d4bc9eb52f311d75a88a54851434715c8dcf9 100644
--- a/lib/workers/repository/onboarding/pr/pr-list.js
+++ b/lib/workers/repository/onboarding/pr/pr-list.js
@@ -27,7 +27,7 @@ function getPrList(config, branches) {
if (upgrade.type === 'lockFileMaintenance') {
prDesc += ' - Regenerates lock file to use latest dependency versions';
} else {
- if (upgrade.isPin) {
+ if (upgrade.type === 'pin') {
prDesc += ' - Pins ';
} else {
prDesc += ' - Upgrades ';
@@ -42,7 +42,7 @@ function getPrList(config, branches) {
} else {
prDesc += ' ';
}
- if (!upgrade.isPin) {
+ if (upgrade.type !== 'pin') {
prDesc += `from \`${upgrade.currentVersion}\` `;
}
prDesc += `to \`${upgrade.newVersion || upgrade.newDigest}\``;
diff --git a/lib/workers/repository/process/write.js b/lib/workers/repository/process/write.js
index 97a6ca97dd824815bc16161b41964785cb0f30da..77085ac77ad733e97d0a2f6ce8f33aa7e6eb967a 100644
--- a/lib/workers/repository/process/write.js
+++ b/lib/workers/repository/process/write.js
@@ -10,8 +10,8 @@ module.exports = {
async function writeUpdates(config, packageFiles, allBranches) {
let branches = allBranches;
logger.info(`Processing ${branches.length} branch(es)`);
- if (!config.mirrorMode && branches.some(upg => upg.isPin)) {
- branches = branches.filter(upg => upg.isPin);
+ if (!config.mirrorMode && branches.some(upg => upg.type === 'pin')) {
+ branches = branches.filter(upg => upg.type === 'pin');
logger.info(`Processing ${branches.length} "pin" PRs first`);
}
const tmpDir = await tmp.dir({ unsafeCleanup: true });
diff --git a/lib/workers/repository/updates/branchify.js b/lib/workers/repository/updates/branchify.js
index 5b376f2c5e7380e0e25530c41c26fbcefcbb5435..ac3bf281135e4a1d6d2229e78ca98c0030347532 100644
--- a/lib/workers/repository/updates/branchify.js
+++ b/lib/workers/repository/updates/branchify.js
@@ -37,6 +37,11 @@ function branchifyUpgrades(config, packageFiles) {
} else if (update.type === 'warning') {
warnings.push(update);
} else {
+ // massage for handlebars
+ const upper = str => str.charAt(0).toUpperCase() + str.substr(1);
+ if (update.type) {
+ update[`is${upper(update.type)}`] = true;
+ }
// Check whether to use a group name
if (update.groupName) {
logger.debug('Using group branchName template');
diff --git a/test/manager/docker/__snapshots__/package.spec.js.snap b/test/manager/docker/__snapshots__/package.spec.js.snap
index d72e9e9742c994934e88633be1effae91a8cff7b..32fc0bf4374a5021e55d1231f1ad8e89af2383e6 100644
--- a/test/manager/docker/__snapshots__/package.spec.js.snap
+++ b/test/manager/docker/__snapshots__/package.spec.js.snap
@@ -3,7 +3,6 @@
exports[`lib/manager/docker/package getPackageUpdates adds digest 1`] = `
Array [
Object {
- "isPin": true,
"newDigest": "sha256:one",
"newDigestShort": "one",
"newFrom": "some-dep:1.0.0-something@sha256:one",
@@ -12,7 +11,6 @@ Array [
"type": "pin",
},
Object {
- "isMinor": true,
"newDepTag": "some-dep:1.1.0-something",
"newDigest": "sha256:two",
"newFrom": "some-dep:1.1.0-something@sha256:two",
@@ -27,7 +25,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates ignores unstable upgrades 1`] = `
Array [
Object {
- "isMajor": true,
"newDepTag": "node:8",
"newFrom": "node:8",
"newTag": "8",
@@ -41,7 +38,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates returns a digest when registry is present 1`] = `
Array [
Object {
- "isDigest": true,
"newDigest": "sha256:1234567890",
"newDigestShort": "123456",
"newFrom": "docker.io/some-dep:1.0.0@sha256:1234567890",
@@ -55,7 +51,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates returns major and minor upgrades 1`] = `
Array [
Object {
- "isMinor": true,
"newDepTag": "some-dep:1.2.0",
"newDigest": "sha256:one",
"newFrom": "some-dep:1.2.0@sha256:one",
@@ -65,7 +60,6 @@ Array [
"type": "minor",
},
Object {
- "isMajor": true,
"newDepTag": "some-dep:2.0.0",
"newDigest": "sha256:two",
"newFrom": "some-dep:2.0.0@sha256:two",
@@ -75,7 +69,6 @@ Array [
"type": "major",
},
Object {
- "isMajor": true,
"newDepTag": "some-dep:3.0.0",
"newDigest": "sha256:three",
"newFrom": "some-dep:3.0.0@sha256:three",
@@ -90,7 +83,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates returns only one major 1`] = `
Array [
Object {
- "isMinor": true,
"newDepTag": "some-dep:1.2.0",
"newDigest": "sha256:one",
"newFrom": "some-dep:1.2.0@sha256:one",
@@ -100,7 +92,6 @@ Array [
"type": "minor",
},
Object {
- "isMajor": true,
"newDepTag": "some-dep:3.0.0",
"newDigest": "sha256:two",
"newFrom": "some-dep:3.0.0@sha256:two",
@@ -115,7 +106,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates returns only one upgrade 1`] = `
Array [
Object {
- "isMajor": true,
"newDepTag": "some-dep:3.0.0",
"newDigest": "sha256:one",
"newFrom": "some-dep:3.0.0@sha256:one",
@@ -130,7 +120,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates returns only one upgrade if automerging major 1`] = `
Array [
Object {
- "isMajor": true,
"newDepTag": "some-dep:3.0.0",
"newDigest": "sha256:one",
"newFrom": "docker.io/some-dep:3.0.0@sha256:one",
@@ -145,7 +134,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates upgrades from unstable to stable 1`] = `
Array [
Object {
- "isMajor": true,
"newDepTag": "node:8",
"newFrom": "node:8",
"newTag": "8",
@@ -159,7 +147,6 @@ Array [
exports[`lib/manager/docker/package getPackageUpdates upgrades from unstable to unstable if not ignoring 1`] = `
Array [
Object {
- "isMajor": true,
"newDepTag": "node:9",
"newFrom": "node:9",
"newTag": "9",
diff --git a/test/manager/npm/__snapshots__/versions.spec.js.snap b/test/manager/npm/__snapshots__/versions.spec.js.snap
index 46328ef37118a01c3aaf6c101338da122734df82..bcf9a956ecd575c1996133cded28826d59bdd065 100644
--- a/test/manager/npm/__snapshots__/versions.spec.js.snap
+++ b/test/manager/npm/__snapshots__/versions.spec.js.snap
@@ -3,7 +3,6 @@
exports[`manager/npm/versions .determineUpgrades(npmDep, config) disables major release separation (major) 1`] = `
Array [
Object {
- "isPin": true,
"newVersion": "0.4.4",
"newVersionMajor": 0,
"type": "pin",
@@ -11,7 +10,6 @@ Array [
},
Object {
"fromVersion": "0.4.4",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -26,7 +24,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) disables major
Array [
Object {
"fromVersion": "1.0.0",
- "isMinor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -41,7 +38,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) handles prerele
Array [
Object {
"fromVersion": "2.9.0-rc",
- "isMinor": true,
"isRange": true,
"newVersion": "^2.9.1-insiders.20180516",
"newVersionMajor": 2,
@@ -56,7 +52,6 @@ Array [
exports[`manager/npm/versions .determineUpgrades(npmDep, config) ignores pinning for ranges when other upgrade exists 1`] = `
Array [
Object {
- "isPin": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"type": "pin",
@@ -64,7 +59,6 @@ Array [
},
Object {
"fromVersion": "0.9.7",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -78,7 +72,6 @@ Array [
exports[`manager/npm/versions .determineUpgrades(npmDep, config) pins minor ranged versions 1`] = `
Array [
Object {
- "isPin": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"type": "pin",
@@ -97,7 +90,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) rejects non-ran
Array [
Object {
"fromVersion": "1.0.0",
- "isMinor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -121,7 +113,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) replaces major
Array [
Object {
"fromVersion": "2.7.0",
- "isMajor": true,
"isRange": true,
"newVersion": "^3.0.0",
"newVersionMajor": 3,
@@ -137,7 +128,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) replaces minor
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"isRange": true,
"newVersion": "~1.4.0",
"newVersionMajor": 1,
@@ -167,7 +157,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns both up
Array [
Object {
"fromVersion": "0.4.4",
- "isMinor": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -176,7 +165,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "0.4.4",
"newVersionMajor": 0,
"type": "pin",
@@ -184,7 +172,6 @@ Array [
},
Object {
"fromVersion": "0.4.4",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -199,7 +186,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns minor u
Array [
Object {
"fromVersion": "0.9.0",
- "isMinor": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -209,7 +195,6 @@ Array [
},
Object {
"fromVersion": "0.9.0",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -224,7 +209,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns minor u
Array [
Object {
"fromVersion": "0.9.0",
- "isMinor": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -234,7 +218,6 @@ Array [
},
Object {
"fromVersion": "0.9.0",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -248,7 +231,6 @@ Array [
exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns only one update if automerging major 1`] = `
Array [
Object {
- "isPin": true,
"newVersion": "0.4.4",
"newVersionMajor": 0,
"type": "pin",
@@ -256,7 +238,6 @@ Array [
},
Object {
"fromVersion": "0.4.4",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -270,7 +251,6 @@ Array [
exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns only one update if grouping 1`] = `
Array [
Object {
- "isPin": true,
"newVersion": "0.4.4",
"newVersionMajor": 0,
"type": "pin",
@@ -278,7 +258,6 @@ Array [
},
Object {
"fromVersion": "0.4.4",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -293,7 +272,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns patch m
Array [
Object {
"fromVersion": "0.8.0",
- "isMinor": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -303,7 +281,6 @@ Array [
},
Object {
"fromVersion": "0.8.0",
- "isPatch": true,
"newVersion": "0.8.12",
"newVersionMajor": 0,
"newVersionMinor": 8,
@@ -313,7 +290,6 @@ Array [
},
Object {
"fromVersion": "0.8.0",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -328,7 +304,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns patch u
Array [
Object {
"fromVersion": "0.9.0",
- "isPatch": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -338,7 +313,6 @@ Array [
},
Object {
"fromVersion": "0.9.0",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -353,7 +327,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) returns patch u
Array [
Object {
"fromVersion": "0.9.0",
- "isPatch": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -363,7 +336,6 @@ Array [
},
Object {
"fromVersion": "0.9.0",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -387,7 +359,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) should allow un
Array [
Object {
"fromVersion": "1.0.0-beta",
- "isMinor": true,
"newVersion": "1.1.0-beta",
"newVersionMajor": 1,
"newVersionMinor": 1,
@@ -402,7 +373,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) should downgrad
Object {
"branchName": "{{{branchPrefix}}}rollback-{{{depNameSanitized}}}-{{{newVersionMajor}}}.x",
"commitMessageAction": "Roll back",
- "isRollback": true,
"newVersion": "1.16.0",
"newVersionMajor": 1,
"semanticCommitType": "fix",
@@ -415,7 +385,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) should treat ze
Array [
Object {
"fromVersion": "0.0.34",
- "isMinor": true,
"isRange": true,
"newVersion": "^0.0.35",
"newVersionMajor": 0,
@@ -431,7 +400,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports > late
Array [
Object {
"fromVersion": "1.4.1",
- "isMajor": true,
"newVersion": "2.0.3",
"newVersionMajor": 2,
"newVersionMinor": 0,
@@ -446,7 +414,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports comple
Array [
Object {
"fromVersion": "2.7.0",
- "isMajor": true,
"isRange": true,
"newVersion": "1.x - 3.x",
"newVersionMajor": 3,
@@ -462,7 +429,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports comple
Array [
Object {
"fromVersion": "2.7.0",
- "isMajor": true,
"isRange": true,
"newVersion": "^1.0.0 || ^2.0.0 || ^3.0.0",
"newVersionMajor": 3,
@@ -477,7 +443,6 @@ Array [
exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports complex ranges 1`] = `
Object {
"fromVersion": "0.8.12",
- "isMinor": true,
"isRange": true,
"newVersion": "^0.7.0 || ^0.8.0 || ^0.9.0",
"newVersionMajor": 0,
@@ -492,7 +457,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports comple
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"isRange": true,
"newVersion": "~1.2.0 || ~1.3.0 || ~1.4.0",
"newVersionMajor": 1,
@@ -507,7 +471,6 @@ Array [
exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports future versions if already future 1`] = `
Array [
Object {
- "isPin": true,
"newVersion": "2.0.3",
"newVersionMajor": 2,
"type": "pin",
@@ -520,7 +483,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports in-ran
Array [
Object {
"fromVersion": "1.0.0",
- "isMinor": true,
"isRange": true,
"newVersion": "~1.4.1",
"newVersionMajor": 1,
@@ -536,7 +498,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports minor
Array [
Object {
"fromVersion": "0.4.4",
- "isMinor": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -545,7 +506,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "0.4.4",
"newVersionMajor": 0,
"type": "pin",
@@ -553,7 +513,6 @@ Array [
},
Object {
"fromVersion": "0.4.4",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -568,7 +527,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) supports minor
Array [
Object {
"fromVersion": "0.4.4",
- "isMinor": true,
"newVersion": "0.9.7",
"newVersionMajor": 0,
"newVersionMinor": 9,
@@ -577,7 +535,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "0.4.4",
"newVersionMajor": 0,
"type": "pin",
@@ -585,7 +542,6 @@ Array [
},
Object {
"fromVersion": "0.4.4",
- "isMajor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -600,7 +556,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades .x maj
Array [
Object {
"fromVersion": "0.9.7",
- "isMajor": true,
"isRange": true,
"newVersion": "1.x",
"newVersionMajor": 1,
@@ -616,7 +571,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades .x min
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -625,7 +579,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "1.3.0",
"newVersionMajor": 1,
"type": "pin",
@@ -638,7 +591,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades .x min
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"isRange": true,
"newVersion": "1.4.x",
"newVersionMajor": 1,
@@ -654,7 +606,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades less t
Array [
Object {
"fromVersion": "0.7.2",
- "isMinor": true,
"isRange": true,
"newVersion": "<= 0.9.7",
"newVersionMajor": 0,
@@ -665,7 +616,6 @@ Array [
},
Object {
"fromVersion": "0.7.2",
- "isMajor": true,
"isRange": true,
"newVersion": "<= 1.4.1",
"newVersionMajor": 1,
@@ -681,7 +631,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades less t
Array [
Object {
"fromVersion": "0.7.1",
- "isMinor": true,
"isRange": true,
"newVersion": "< 0.9.8",
"newVersionMajor": 0,
@@ -692,7 +641,6 @@ Array [
},
Object {
"fromVersion": "0.7.1",
- "isMajor": true,
"isRange": true,
"newVersion": "< 1.4.2",
"newVersionMajor": 1,
@@ -708,7 +656,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades major
Array [
Object {
"fromVersion": "0.9.7",
- "isMajor": true,
"isRange": true,
"newVersion": ">= 0.5.0 < 2.0.0",
"newVersionMajor": 1,
@@ -724,7 +671,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades major
Array [
Object {
"fromVersion": "1.0.0",
- "isMinor": true,
"isRange": true,
"newVersion": "<= 2.0.0",
"newVersionMajor": 1,
@@ -740,7 +686,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades major
Array [
Object {
"fromVersion": "0.9.7",
- "isMajor": true,
"isRange": true,
"newVersion": "< 2.0.0",
"newVersionMajor": 1,
@@ -756,7 +701,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades minor
Array [
Object {
"fromVersion": "0.8.0",
- "isMinor": true,
"isRange": true,
"newVersion": ">= 0.5.0 <= 0.10.0",
"newVersionMajor": 0,
@@ -767,7 +711,6 @@ Array [
},
Object {
"fromVersion": "0.8.0",
- "isMajor": true,
"isRange": true,
"newVersion": ">= 0.5.0 <= 1.5.0",
"newVersionMajor": 1,
@@ -783,7 +726,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades minor
Array [
Object {
"fromVersion": "0.7.2",
- "isMinor": true,
"isRange": true,
"newVersion": ">= 0.5.0 <0.10",
"newVersionMajor": 0,
@@ -794,7 +736,6 @@ Array [
},
Object {
"fromVersion": "0.7.2",
- "isMajor": true,
"isRange": true,
"newVersion": ">= 0.5.0 <1.5",
"newVersionMajor": 1,
@@ -810,7 +751,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades minor
Array [
Object {
"fromVersion": "1.0.1",
- "isMinor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -819,7 +759,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "1.0.1",
"newVersionMajor": 1,
"type": "pin",
@@ -832,7 +771,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades multip
Array [
Object {
"fromVersion": "0.7.2",
- "isMinor": true,
"isRange": true,
"newVersion": "^0.9.0",
"newVersionMajor": 0,
@@ -843,7 +781,6 @@ Array [
},
Object {
"fromVersion": "0.7.2",
- "isMajor": true,
"isRange": true,
"newVersion": "^1.0.0",
"newVersionMajor": 1,
@@ -859,7 +796,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades multip
Array [
Object {
"fromVersion": "0.7.2",
- "isMinor": true,
"isRange": true,
"newVersion": "~0.9.0",
"newVersionMajor": 0,
@@ -870,7 +806,6 @@ Array [
},
Object {
"fromVersion": "0.7.2",
- "isMajor": true,
"isRange": true,
"newVersion": "~1.4.0",
"newVersionMajor": 1,
@@ -886,7 +821,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades shorth
Array [
Object {
"fromVersion": "0.9.7",
- "isMajor": true,
"isRange": true,
"newVersion": "1",
"newVersionMajor": 1,
@@ -902,7 +836,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades shorth
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"isRange": true,
"newVersion": "1.4",
"newVersionMajor": 1,
@@ -918,7 +851,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades tilde
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -927,7 +859,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "1.3.0",
"newVersionMajor": 1,
"type": "pin",
@@ -940,7 +871,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) upgrades tilde
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"isRange": true,
"newVersion": "~1.4.0",
"newVersionMajor": 1,
@@ -956,7 +886,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) uses the locked
Array [
Object {
"fromVersion": "1.0.0",
- "isMinor": true,
"newVersion": "1.4.1",
"newVersionMajor": 1,
"newVersionMinor": 4,
@@ -965,7 +894,6 @@ Array [
"unpublishable": false,
},
Object {
- "isPin": true,
"newVersion": "1.0.0",
"newVersionMajor": 1,
"type": "pin",
@@ -978,7 +906,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens .x OR ra
Array [
Object {
"fromVersion": "2.7.0",
- "isMajor": true,
"isRange": true,
"newVersion": "1.x || 2.x || 3.x",
"newVersionMajor": 3,
@@ -994,7 +921,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens major ra
Array [
Object {
"fromVersion": "2.7.0",
- "isMajor": true,
"isRange": true,
"newVersion": "^2.0.0 || ^3.0.0",
"newVersionMajor": 3,
@@ -1010,7 +936,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens minor ra
Array [
Object {
"fromVersion": "1.3.0",
- "isMinor": true,
"isRange": true,
"newVersion": "~1.3.0 || ~1.4.0",
"newVersionMajor": 1,
@@ -1026,7 +951,6 @@ exports[`manager/npm/versions .determineUpgrades(npmDep, config) widens stanndal
Array [
Object {
"fromVersion": "2.7.0",
- "isMajor": true,
"isRange": true,
"newVersion": "1 || 2 || 3",
"newVersionMajor": 3,
diff --git a/test/workers/branch/index.spec.js b/test/workers/branch/index.spec.js
index 76ee38eed288a96fe93781e1a2c21126bf0c25a8..4faa49b1d71e0a8086b3037198cc33b1414e905f 100644
--- a/test/workers/branch/index.spec.js
+++ b/test/workers/branch/index.spec.js
@@ -70,7 +70,7 @@ describe('workers/branch', () => {
it('skips branch if closed major PR found', async () => {
schedule.isScheduledNow.mockReturnValueOnce(false);
platform.branchExists.mockReturnValueOnce(true);
- config.isMajor = true;
+ config.type = 'major';
checkExisting.prAlreadyExisted.mockReturnValueOnce({
number: 13,
state: 'closed',
@@ -81,7 +81,7 @@ describe('workers/branch', () => {
it('skips branch if closed digest PR found', async () => {
schedule.isScheduledNow.mockReturnValueOnce(false);
platform.branchExists.mockReturnValueOnce(true);
- config.isDigest = true;
+ config.type = 'digest';
checkExisting.prAlreadyExisted.mockReturnValueOnce({
number: 13,
state: 'closed',
diff --git a/test/workers/repository/onboarding/pr/pr-list.spec.js b/test/workers/repository/onboarding/pr/pr-list.spec.js
index c6350a1ff4a17e2efccb389c83cdcd313c7a5023..f55e4d93b08fef05e6a95ed3dbfd50eade64264d 100644
--- a/test/workers/repository/onboarding/pr/pr-list.spec.js
+++ b/test/workers/repository/onboarding/pr/pr-list.spec.js
@@ -41,14 +41,14 @@ describe('workers/repository/onboarding/pr/pr-list', () => {
branchName: 'renovate/pin-dependencies',
upgrades: [
{
- isPin: true,
+ type: 'pin',
repositoryUrl: 'https://a',
depName: 'a',
depType: 'devDependencies',
newVersion: '1.1.0',
},
{
- isPin: true,
+ type: 'pin',
depName: 'b',
newVersion: '1.5.3',
},
diff --git a/test/workers/repository/process/write.spec.js b/test/workers/repository/process/write.spec.js
index 55fdb818cd6710a0bf3208d6c5bf1efa914df746..d78222b92f97f2896baf7a240e5d9d2cfc4d4e85 100644
--- a/test/workers/repository/process/write.spec.js
+++ b/test/workers/repository/process/write.spec.js
@@ -17,7 +17,7 @@ describe('workers/repository/write', () => {
describe('writeUpdates()', () => {
const packageFiles = {};
it('runs pins first', async () => {
- const branches = [{ isPin: true }, {}, {}];
+ const branches = [{ type: 'pin' }, {}, {}];
const res = await writeUpdates(config, packageFiles, branches);
expect(res).toEqual('done');
expect(branchWorker.processBranch.mock.calls).toHaveLength(1);
diff --git a/test/workers/repository/updates/branchify.spec.js b/test/workers/repository/updates/branchify.spec.js
index 563d3ecc1c1edd85d9744a281775912dd7425893..1ee9ad34fc5afd778d560646cecb8c28ff6400db 100644
--- a/test/workers/repository/updates/branchify.spec.js
+++ b/test/workers/repository/updates/branchify.spec.js
@@ -29,11 +29,14 @@ describe('workers/repository/updates/branchify', () => {
branchName: 'foo-{{version}}',
version: '1.1.0',
prTitle: 'some-title',
+ type: 'minor',
},
]);
config.repoIsOnboarded = true;
const res = await branchifyUpgrades(config);
expect(Object.keys(res.branches).length).toBe(1);
+ expect(res.branches[0].isMinor).toBe(true);
+ expect(res.branches[0].upgrades[0].isMinor).toBe(true);
});
it('does not group if different compiled branch names', async () => {
flattenUpdates.mockReturnValueOnce([