From 977a027125d98a9d43e3e4c48ab1c23ea7c260df Mon Sep 17 00:00:00 2001
From: Max Rose <max.rose366@gmail.com>
Date: Fri, 18 Feb 2022 02:54:40 +0000
Subject: [PATCH] fix(presets): log depreciation only if fallback found
(#14281)
---
lib/config/presets/util.spec.ts | 10 +++++++++-
lib/config/presets/util.ts | 6 +++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/config/presets/util.spec.ts b/lib/config/presets/util.spec.ts
index 79c8232a35..0610c1105c 100644
--- a/lib/config/presets/util.spec.ts
+++ b/lib/config/presets/util.spec.ts
@@ -15,15 +15,23 @@ describe('config/presets/util', () => {
fetch.mockReset();
});
it('works', async () => {
- fetch.mockResolvedValue({ sub: { preset: { foo: true } } });
+ fetch.mockResolvedValueOnce({ sub: { preset: { foo: true } } });
expect(await fetchPreset({ ...config, fetch })).toEqual({
sub: { preset: { foo: true } },
});
+ fetch.mockRejectedValueOnce(new Error(PRESET_DEP_NOT_FOUND));
+ fetch.mockResolvedValueOnce({ sub: { preset: { foo: true } } });
+ expect(await fetchPreset({ ...config, fetch })).toEqual({
+ sub: { preset: { foo: true } },
+ });
+
+ fetch.mockResolvedValueOnce({ sub: { preset: { foo: true } } });
expect(
await fetchPreset({ ...config, filePreset: 'some/sub', fetch })
).toEqual({ preset: { foo: true } });
+ fetch.mockResolvedValueOnce({ sub: { preset: { foo: true } } });
expect(
await fetchPreset({ ...config, filePreset: 'some/sub/preset', fetch })
).toEqual({ foo: true });
diff --git a/lib/config/presets/util.ts b/lib/config/presets/util.ts
index f0a0144096..199818a1a3 100644
--- a/lib/config/presets/util.ts
+++ b/lib/config/presets/util.ts
@@ -35,15 +35,15 @@ export async function fetchPreset({
if (err.message !== PRESET_DEP_NOT_FOUND) {
throw err;
}
- logger.info(
- 'Fallback to renovate.json file as a preset is deprecated, please use a default.json file instead.'
- );
jsonContent = await fetch(
pkgName,
buildFilePath('renovate.json'),
endpoint,
packageTag
);
+ logger.info(
+ 'Fallback to renovate.json file as a preset is deprecated, please use a default.json file instead.'
+ );
}
} else {
jsonContent = await fetch(
--
GitLab