From a787e6bad2ea09d7ffddeadf67b3452847c10d4d Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@keylocation.sg> Date: Sun, 25 Jun 2017 09:06:51 +0200 Subject: [PATCH] Automerge pinned updates (#349) * Automerge pinned upgrades Closes #348 * Update test snapshots --- lib/helpers/versions.js | 1 + test/helpers/__snapshots__/versions.spec.js.snap | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/helpers/versions.js b/lib/helpers/versions.js index 8c684fe17f..76c2da4836 100644 --- a/lib/helpers/versions.js +++ b/lib/helpers/versions.js @@ -32,6 +32,7 @@ function determineUpgrades(dep, currentVersion, config) { allUpgrades.pin = { upgradeType: 'pin', isPin: true, + automergeEnabled: true, newVersion: maxSatisfying, newVersionMajor: semver.major(maxSatisfying), }; diff --git a/test/helpers/__snapshots__/versions.spec.js.snap b/test/helpers/__snapshots__/versions.spec.js.snap index 82ec942873..e5ea3885f7 100644 --- a/test/helpers/__snapshots__/versions.spec.js.snap +++ b/test/helpers/__snapshots__/versions.spec.js.snap @@ -45,6 +45,7 @@ Array [ exports[`helpers/versions .determineUpgrades(dep, currentVersion, defaultConfig) pins minor ranged versions 1`] = ` Array [ Object { + "automergeEnabled": true, "isPin": true, "newVersion": "1.4.1", "newVersionMajor": 1, @@ -150,6 +151,7 @@ Array [ exports[`helpers/versions .determineUpgrades(dep, currentVersion, defaultConfig) supports future versions if already future 1`] = ` Array [ Object { + "automergeEnabled": true, "isPin": true, "newVersion": "2.0.3", "newVersionMajor": 2, -- GitLab