From 886050c44f98395735275ac6f4360809acb09797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Tue, 18 Feb 2025 11:37:02 +0100 Subject: [PATCH 1/2] test(plugin-jsdocs-e2e): fix flaky test by ignoring version changes in stdout --- e2e/plugin-jsdocs-e2e/tests/__snapshots__/report.txt | 2 +- e2e/plugin-jsdocs-e2e/tests/collect.e2e.test.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/plugin-jsdocs-e2e/tests/__snapshots__/report.txt b/e2e/plugin-jsdocs-e2e/tests/__snapshots__/report.txt index a44e639b3..b5606d69b 100644 --- a/e2e/plugin-jsdocs-e2e/tests/__snapshots__/report.txt +++ b/e2e/plugin-jsdocs-e2e/tests/__snapshots__/report.txt @@ -1,6 +1,6 @@ Code PushUp CLI [ info ] Run collect... -Code PushUp Report - @code-pushup/core@0.57.0 +Code PushUp Report - @code-pushup/core@ JSDoc coverage audits diff --git a/e2e/plugin-jsdocs-e2e/tests/collect.e2e.test.ts b/e2e/plugin-jsdocs-e2e/tests/collect.e2e.test.ts index 499c02c20..d7ed8594a 100644 --- a/e2e/plugin-jsdocs-e2e/tests/collect.e2e.test.ts +++ b/e2e/plugin-jsdocs-e2e/tests/collect.e2e.test.ts @@ -56,9 +56,9 @@ describe('PLUGIN collect report with jsdocs-plugin NPM package', () => { expect(code).toBe(0); - expect(removeColorCodes(stdout)).toMatchFileSnapshot( - '__snapshots__/report.txt', - ); + expect( + removeColorCodes(stdout).replace(/@\d+\.\d+\.\d+/, '@'), + ).toMatchFileSnapshot('__snapshots__/report.txt'); const report = await readJsonFile( path.join(angularOutputDir, 'report.json'), From b86c043a656de9c1154af70571abe24462ceb2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Tue, 18 Feb 2025 11:40:14 +0100 Subject: [PATCH 2/2] fix(ci): prevent ambigious ref when checking head --- packages/ci/src/lib/run-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ci/src/lib/run-utils.ts b/packages/ci/src/lib/run-utils.ts index a6540bc2e..c4c5bf42a 100644 --- a/packages/ci/src/lib/run-utils.ts +++ b/packages/ci/src/lib/run-utils.ts @@ -225,7 +225,7 @@ export async function loadCachedBaseReport( export async function ensureHeadBranch({ refs, git }: RunEnv): Promise { const { head } = refs; - if ((await git.revparse('HEAD')) !== (await git.revparse(head.ref))) { + if (head.sha !== (await git.revparse('HEAD'))) { await git.checkout(['-f', head.ref]); } }