From c120b7389dd4dabf05ef0b846ef01bf6b15a72c0 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Tue, 15 Aug 2017 09:30:40 +0200
Subject: [PATCH] fix: migrate automerge=false to automerge=none (#678)
---
lib/config/migration.js | 3 +++
test/config/__snapshots__/migration.spec.js.snap | 1 +
test/config/migration.spec.js | 2 ++
3 files changed, 6 insertions(+)
diff --git a/lib/config/migration.js b/lib/config/migration.js
index cafe3b23b1..894f5dff2c 100644
--- a/lib/config/migration.js
+++ b/lib/config/migration.js
@@ -37,6 +37,9 @@ function migrateConfig(config, parentConfig) {
isMigrated = true;
delete migratedConfig[key];
}
+ } else if (key === 'automerge' && val === false) {
+ isMigrated = true;
+ migratedConfig.automerge = 'none';
} else if (key === 'packages') {
isMigrated = true;
migratedConfig.packageRules = migratedConfig.packages.map(
diff --git a/test/config/__snapshots__/migration.spec.js.snap b/test/config/__snapshots__/migration.spec.js.snap
index 0e91f01710..a705f286c3 100644
--- a/test/config/__snapshots__/migration.spec.js.snap
+++ b/test/config/__snapshots__/migration.spec.js.snap
@@ -3,6 +3,7 @@
exports[`config/migration migrateConfig(config, parentConfig) it migrates config 1`] = `
Object {
"autodiscover": true,
+ "automerge": "none",
"commitMessage": "some commit message",
"enabled": true,
"onboarding": false,
diff --git a/test/config/migration.spec.js b/test/config/migration.spec.js
index 9a7387c55e..ec0fb6cf9e 100644
--- a/test/config/migration.spec.js
+++ b/test/config/migration.spec.js
@@ -8,6 +8,7 @@ describe('config/migration', () => {
enabled: true,
maintainYarnLock: true,
onboarding: 'false',
+ automerge: false,
autodiscover: 'true',
schedule: 'after 5pm',
commitMessage: '{{semanticPrefix}}some commit message',
@@ -37,6 +38,7 @@ describe('config/migration', () => {
expect(isMigrated).toBe(true);
expect(migratedConfig.depTypes).not.toBeDefined();
expect(migratedConfig.optionalDependencies.respectLatest).toBe(false);
+ expect(migratedConfig.automerge).toEqual('none');
expect(migratedConfig).toMatchSnapshot();
});
it('it does not migrate config', () => {
--
GitLab