diff --git a/lib/config/migration.js b/lib/config/migration.js index cafe3b23b110ae414ca5cf0546ca860c3334685b..894f5dff2c5bdd20b37a903306e50abb4e554719 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 0e91f01710bf3f8e56ebb0fa25ffbafe05bbdc43..a705f286c3b2f7c43787936a2f15f7afe6d6b8de 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 9a7387c55eca53e2494dbd840053b3d4ee676bd1..ec0fb6cf9e1a90e7776032f863ad7b85219a856e 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', () => {