From ddb1629d9a601f6ed671711f07404f3871fef185 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Tue, 15 Aug 2017 13:26:05 +0200
Subject: [PATCH] fix: return massaged config from migrateAndValidate (#681)
* add massage test
* fix: return massaged config from migrateAndValidate
---
lib/workers/repository/apis.js | 7 ++++---
test/config/__snapshots__/massage.spec.js.snap | 3 +++
test/config/massage.spec.js | 18 ++++++++++++++++++
.../repository/__snapshots__/apis.spec.js.snap | 7 +++++++
test/workers/repository/apis.spec.js | 16 ++++++++++++++++
5 files changed, 48 insertions(+), 3 deletions(-)
create mode 100644 test/config/__snapshots__/massage.spec.js.snap
create mode 100644 test/config/massage.spec.js
diff --git a/lib/workers/repository/apis.js b/lib/workers/repository/apis.js
index 3976b7c63f..26895b37a2 100644
--- a/lib/workers/repository/apis.js
+++ b/lib/workers/repository/apis.js
@@ -19,6 +19,7 @@ module.exports = {
checkForLerna,
detectPackageFiles,
resolvePackageFiles,
+ migrateAndValidate,
};
async function detectSemanticCommits(config) {
@@ -125,10 +126,10 @@ function migrateAndValidate(config, input) {
}); */
}
if (!config.repoIsOnboarded) {
- migratedConfig.warnings = (migratedConfig.warnings || []).concat(warnings);
- migratedConfig.errors = (migratedConfig.errors || []).concat(errors);
+ massagedConfig.warnings = (massagedConfig.warnings || []).concat(warnings);
+ massagedConfig.errors = (massagedConfig.errors || []).concat(errors);
}
- return migratedConfig;
+ return massagedConfig;
}
// Check for config in `renovate.json`
diff --git a/test/config/__snapshots__/massage.spec.js.snap b/test/config/__snapshots__/massage.spec.js.snap
new file mode 100644
index 0000000000..1d7df63798
--- /dev/null
+++ b/test/config/__snapshots__/massage.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`config/massage massageConfig returns empty 1`] = `Object {}`;
diff --git a/test/config/massage.spec.js b/test/config/massage.spec.js
new file mode 100644
index 0000000000..8bcf47466d
--- /dev/null
+++ b/test/config/massage.spec.js
@@ -0,0 +1,18 @@
+const massage = require('../../lib/config/massage.js');
+
+describe('config/massage', () => {
+ describe('massageConfig', () => {
+ it('returns empty', () => {
+ const config = {};
+ const res = massage.massageConfig(config);
+ expect(res).toMatchSnapshot();
+ });
+ it('massages strings to array', () => {
+ const config = {
+ schedule: 'before 5am',
+ };
+ const res = massage.massageConfig(config);
+ expect(Array.isArray(res.schedule)).toBe(true);
+ });
+ });
+});
diff --git a/test/workers/repository/__snapshots__/apis.spec.js.snap b/test/workers/repository/__snapshots__/apis.spec.js.snap
index 7f17464e1f..0dd55b8fa2 100644
--- a/test/workers/repository/__snapshots__/apis.spec.js.snap
+++ b/test/workers/repository/__snapshots__/apis.spec.js.snap
@@ -1,5 +1,12 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`migrateAndValidate returns empty config 1`] = `
+Object {
+ "errors": Array [],
+ "warnings": Array [],
+}
+`;
+
exports[`workers/repository/apis checkForLerna(config) ignores zero length lerna 1`] = `Object {}`;
exports[`workers/repository/apis checkForLerna(config) returns lerna package names 1`] = `
diff --git a/test/workers/repository/apis.spec.js b/test/workers/repository/apis.spec.js
index adcbdae562..2c898889be 100644
--- a/test/workers/repository/apis.spec.js
+++ b/test/workers/repository/apis.spec.js
@@ -7,6 +7,8 @@ const githubApi = require('../../../lib/api/github');
const gitlabApi = require('../../../lib/api/gitlab');
const npmApi = require('../../../lib/api/npm');
+const defaultConfig = require('../../../lib/config/defaults').getConfig();
+
jest.mock('../../../lib/api/github');
jest.mock('../../../lib/api/gitlab');
jest.mock('../../../lib/api/npm');
@@ -282,3 +284,17 @@ describe('workers/repository/apis', () => {
});
});
});
+describe('migrateAndValidate', () => {
+ it('returns empty config', () => {
+ const renovateJson = {};
+ const res = apis.migrateAndValidate(defaultConfig, renovateJson);
+ expect(res).toMatchSnapshot();
+ });
+ it('massages string to array', () => {
+ const renovateJson = {
+ schedule: 'before 5am',
+ };
+ const res = apis.migrateAndValidate(defaultConfig, renovateJson);
+ expect(Array.isArray(res.schedule)).toBe(true);
+ });
+});
--
GitLab