From 7f652315a3cd44211d56f9aa33216450e1ae0681 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 14 Apr 2020 19:04:46 +0200
Subject: [PATCH] test: fix coveralls coverage
---
.../presets/__snapshots__/local.spec.ts.snap | 2 +-
lib/config/presets/local.spec.ts | 2 +-
lib/manager/npm/post-update/yarn.ts | 30 +++++++------------
3 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/lib/config/presets/__snapshots__/local.spec.ts.snap b/lib/config/presets/__snapshots__/local.spec.ts.snap
index 8cbbc16a24..f2713740ee 100644
--- a/lib/config/presets/__snapshots__/local.spec.ts.snap
+++ b/lib/config/presets/__snapshots__/local.spec.ts.snap
@@ -42,7 +42,7 @@ exports[`config/presets/local getPreset() forwards to github 1`] = `
Array [
Array [
"some/repo",
- "",
+ "default",
Object {
"platform": "github",
},
diff --git a/lib/config/presets/local.spec.ts b/lib/config/presets/local.spec.ts
index 0c7a22f59f..affa203bf2 100644
--- a/lib/config/presets/local.spec.ts
+++ b/lib/config/presets/local.spec.ts
@@ -42,7 +42,7 @@ describe('config/presets/local', () => {
});
it('forwards to github', async () => {
- const content = await local.getPreset('some/repo', '', {
+ const content = await local.getPreset('some/repo', undefined, {
platform: 'github',
});
expect(githubGetPreset.mock.calls).toMatchSnapshot();
diff --git a/lib/manager/npm/post-update/yarn.ts b/lib/manager/npm/post-update/yarn.ts
index a54b80b7e9..f2dfc7b5ac 100644
--- a/lib/manager/npm/post-update/yarn.ts
+++ b/lib/manager/npm/post-update/yarn.ts
@@ -126,12 +126,9 @@ export async function generateLockFile(
cwd,
env,
});
- stdout += updateRes.stdout
- ? /* istanbul ignore next */ updateRes.stdout
- : '';
- stderr += updateRes.stderr
- ? /* istanbul ignore next */ updateRes.stderr
- : '';
+ // istanbul ignore next
+ stdout += updateRes.stdout || '';
+ stderr += updateRes.stderr || '';
}
if (yarnMajorVersion < 2) {
@@ -146,12 +143,9 @@ export async function generateLockFile(
cwd,
env,
});
- stdout += dedupeRes.stdout
- ? /* istanbul ignore next */ dedupeRes.stdout
- : '';
- stderr += dedupeRes.stderr
- ? /* istanbul ignore next */ dedupeRes.stderr
- : '';
+ // istanbul ignore next
+ stdout += dedupeRes.stdout || '';
+ stderr += dedupeRes.stderr || '';
}
if (
config.postUpdateOptions &&
@@ -164,17 +158,13 @@ export async function generateLockFile(
cwd,
env,
});
- stdout += dedupeRes.stdout
- ? /* istanbul ignore next */ dedupeRes.stdout
- : '';
- stderr += dedupeRes.stderr
- ? /* istanbul ignore next */ dedupeRes.stderr
- : '';
+ // istanbul ignore next
+ stdout += dedupeRes.stdout || '';
+ stderr += dedupeRes.stderr || '';
}
} else if (
config.postUpdateOptions &&
- (config.postUpdateOptions.includes('yarnDedupeFewer') ||
- config.postUpdateOptions.includes('yarnDedupeHighest'))
+ config.postUpdateOptions.some((option) => option.startsWith('yarnDedupe'))
) {
logger.warn('yarn-deduplicate is not supported since yarn 2');
}
--
GitLab