From 2233b352b66c82b01f2a85ade2dd67aafbde3f15 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Wed, 3 May 2023 09:08:09 -0700
Subject: [PATCH] fix(merger): pass onError to the reporter (#22775)

---
 .../playwright-test/src/reporters/merge.ts    |  3 -
 tests/playwright-test/reporter-blob.spec.ts   | 61 +++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/packages/playwright-test/src/reporters/merge.ts b/packages/playwright-test/src/reporters/merge.ts
index 0dd8907af1..a6da6a7c98 100644
--- a/packages/playwright-test/src/reporters/merge.ts
+++ b/packages/playwright-test/src/reporters/merge.ts
@@ -86,9 +86,6 @@ function mergeEvents(shardReports: string[]) {
   for (const reportJsonl of shardReports) {
     const parsedEvents = parseEvents(reportJsonl);
     for (const event of parsedEvents) {
-      // TODO: show remaining events?
-      if (event.method === 'onError')
-        throw new Error('Error in shard');
       if (event.method === 'onBegin')
         beginEvents.push(event);
       else if (event.method === 'onEnd')
diff --git a/tests/playwright-test/reporter-blob.spec.ts b/tests/playwright-test/reporter-blob.spec.ts
index 171434900c..750614f133 100644
--- a/tests/playwright-test/reporter-blob.spec.ts
+++ b/tests/playwright-test/reporter-blob.spec.ts
@@ -533,3 +533,64 @@ test('multiple output reports based on config', async ({ runInlineTest, mergeRep
   expect((await fs.promises.stat(test.info().outputPath('merged/merged-blob/report.zip'))).isFile).toBeTruthy();
 
 });
+
+test('onError in the report', async ({ runInlineTest, mergeReports, showReport, page }) => {
+  test.slow();
+  const reportDir = test.info().outputPath('blob-report');
+  const files = {
+    'playwright.config.ts': `
+      module.exports = {
+        retries: 1,
+        reporter: [['blob', { outputDir: '${reportDir.replace(/\\/g, '/')}' }]]
+      };
+    `,
+    'a.test.ts': `
+      import { test as base, expect } from '@playwright/test';
+
+      const test = base.extend<{}, { errorInTearDown: string }>({
+        errorInTearDown: [async ({ }, use) => {
+          await use('');
+          throw new Error('Error in teardown');
+        }, { scope: 'worker' }],
+      });
+
+      test('test', async ({ page, errorInTearDown }) => {
+      });
+      test('pass', async ({ page, errorInTearDown }) => {
+      });
+      test.skip('skipped 1', async ({}) => {});
+    `,
+    'b.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('math 2', async ({}) => { });
+      test('failing 2', async ({}) => {
+        expect(1).toBe(2);
+      });
+      test.skip('skipped 2', async ({}) => {});
+    `,
+    'c.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('math 3', async ({}) => {
+        expect(1 + 1).toBe(2);
+      });
+      test('flaky 2', async ({}) => {
+        expect(test.info().retry).toBe(1);
+      });
+      test.skip('skipped 3', async ({}) => {});
+    `
+  };
+  const result = await runInlineTest(files, { shard: `1/3` });
+  expect(result.exitCode).toBe(1);
+
+  const { exitCode } = await mergeReports(reportDir, {}, { additionalArgs: ['--reporter', 'html'] });
+  expect(exitCode).toBe(0);
+
+  await showReport();
+
+  await expect(page.locator('.subnav-item:has-text("All") .counter')).toHaveText('3');
+  await expect(page.locator('.subnav-item:has-text("Passed") .counter')).toHaveText('2');
+  await expect(page.locator('.subnav-item:has-text("Failed") .counter')).toHaveText('0');
+  await expect(page.locator('.subnav-item:has-text("Flaky") .counter')).toHaveText('0');
+  await expect(page.locator('.subnav-item:has-text("Skipped") .counter')).toHaveText('1');
+});