From 368880962fe91de980e79cd322d090b699b9cedf Mon Sep 17 00:00:00 2001
From: Joel Einbinder <joel.einbinder@gmail.com>
Date: Tue, 29 Jun 2021 11:49:50 -0700
Subject: [PATCH] fix(test-runner): better test match glob (#7382)

---
 src/test/loader.ts                   |  2 +-
 tests/playwright-test/loader.spec.ts | 44 ++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/test/loader.ts b/src/test/loader.ts
index 9b99e29975..e4c27ced1d 100644
--- a/src/test/loader.ts
+++ b/src/test/loader.ts
@@ -191,7 +191,7 @@ export class Loader {
       name: takeFirst(this._configOverrides.name, projectConfig.name, this._config.name, ''),
       testDir,
       testIgnore: takeFirst(this._configOverrides.testIgnore, projectConfig.testIgnore, this._config.testIgnore, []),
-      testMatch: takeFirst(this._configOverrides.testMatch, projectConfig.testMatch, this._config.testMatch, '**/?(*.)+(spec|test).[jt]s'),
+      testMatch: takeFirst(this._configOverrides.testMatch, projectConfig.testMatch, this._config.testMatch, '**/?(*.)@(spec|test).[jt]s'),
       timeout: takeFirst(this._configOverrides.timeout, projectConfig.timeout, this._config.timeout, 10000),
       use: mergeObjects(mergeObjects(this._config.use, projectConfig.use), this._configOverrides.use),
     };
diff --git a/tests/playwright-test/loader.spec.ts b/tests/playwright-test/loader.spec.ts
index 97c27f692e..02d278d29e 100644
--- a/tests/playwright-test/loader.spec.ts
+++ b/tests/playwright-test/loader.spec.ts
@@ -104,3 +104,47 @@ test('should validate configuration object', async ({ runInlineTest }) => {
   expect(result.failed).toBe(0);
   expect(result.output).toContain('playwright.config.ts: config.timeout must be a non-negative number');
 });
+
+test('should match tests well', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      const { test } = pwt;
+      test('works', () => {});
+    `,
+    'hello.spec.ts': `
+      const { test } = pwt;
+      test('works', () => {});
+    `,
+    'test.ts': `
+      const { test } = pwt;
+      test('works', () => {});
+    `,
+    'spec.ts': `
+      const { test } = pwt;
+      test('works', () => {});
+    `,
+    'strange.....spec.ts': `
+      const { test } = pwt;
+      test('works', () => {});
+    `,
+    'badspec.ts': `
+      const { test } = pwt;
+      test('bad', () => { throw new Error('badspec.ts')});
+    `,
+    'specspec.ts': `
+      const { test } = pwt;
+      test('bad', () => { throw new Error('specspec.ts')});
+    `,
+    'a.testtest.ts': `
+      const { test } = pwt;
+      test('bad', () => { throw new Error('a.testtest.ts')});
+    `,
+    'b.testspec.ts': `
+      const { test } = pwt;
+      test('bad', () => { throw new Error('b.testspec.ts')});
+    `
+  });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(5);
+});