Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(testMatch): do not count test.ts and spec.ts as test files by default (#22440)

Browse source
This commit is contained in:
Dmitry Gozman 2023-04-17 12:57:33 -07:00 committed by GitHub
parent 1fecc20238
commit bf661535a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/src/test-api/class-testconfig.md
View file

@ -517,7 +517,7 @@ export default defineConfig({
Only the files matching one of these patterns are executed as test files. Matching is performed against the absolute file path. Strings are treated as glob patterns.
By default, Playwright looks for files matching the following glob pattern: `**/?(*.)@(spec|test).?(m)[jt]s?(x)`. This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.spec.ts`.
By default, Playwright looks for files matching the following glob pattern: `**/*.@(spec|test).?(m)[jt]s?(x)`. This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.wrong-credentials.spec.ts`.
**Usage**

2
docs/src/test-api/class-testproject.md
View file

@ -263,7 +263,7 @@ Use [`property: TestConfig.testIgnore`] to change this option for all projects.
Only the files matching one of these patterns are executed as test files. Matching is performed against the absolute file path. Strings are treated as glob patterns.
By default, Playwright looks for files matching the following glob pattern: `**/?(*.)@(spec|test).?(m)[jt]s?(x)`. This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.spec.ts`.
By default, Playwright looks for files matching the following glob pattern: `**/*.@(spec|test).?(m)[jt]s?(x)`. This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.wrong-credentials.spec.ts`.
Use [`property: TestConfig.testMatch`] to change this option for all projects.

2
packages/playwright-test/src/common/config.ts
View file

@ -170,7 +170,7 @@ export class FullProjectInternal {
testDir,
snapshotDir: takeFirst(pathResolve(configDir, projectConfig.snapshotDir), pathResolve(configDir, config.snapshotDir), testDir),
testIgnore: takeFirst(projectConfig.testIgnore, config.testIgnore, []),
testMatch: takeFirst(projectConfig.testMatch, config.testMatch, '**/?(*.)@(spec|test).?(m)[jt]s?(x)'),
testMatch: takeFirst(projectConfig.testMatch, config.testMatch, '**/*.@(spec|test).?(m)[jt]s?(x)'),
timeout: takeFirst(configCLIOverrides.timeout, projectConfig.timeout, config.timeout, defaultTimeout),
use: mergeObjects(config.use, projectConfig.use, configCLIOverrides.use),
dependencies: projectConfig.dependencies || [],

15
packages/playwright-test/types/test.d.ts vendored
View file

@ -347,8 +347,9 @@ export interface FullProject<TestArgs = {}, WorkerArgs = {}> {
* Only the files matching one of these patterns are executed as test files. Matching is performed against the
* absolute file path. Strings are treated as glob patterns.
*
* By default, Playwright looks for files matching the following glob pattern: `**\/?(*.)@(spec|test).?(m)[jt]s?(x)`.
* This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.spec.ts`.
* By default, Playwright looks for files matching the following glob pattern: `**\/*.@(spec|test).?(m)[jt]s?(x)`. This
* means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example
* `login-screen.wrong-credentials.spec.ts`.
*
* Use [testConfig.testMatch](https://playwright.dev/docs/api/class-testconfig#test-config-test-match) to change this
* option for all projects.
@ -1191,8 +1192,9 @@ interface TestConfig {
* Only the files matching one of these patterns are executed as test files. Matching is performed against the
* absolute file path. Strings are treated as glob patterns.
*
* By default, Playwright looks for files matching the following glob pattern: `**\/?(*.)@(spec|test).?(m)[jt]s?(x)`.
* This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.spec.ts`.
* By default, Playwright looks for files matching the following glob pattern: `**\/*.@(spec|test).?(m)[jt]s?(x)`. This
* means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example
* `login-screen.wrong-credentials.spec.ts`.
*
* **Usage**
*
@ -5875,8 +5877,9 @@ interface TestProject {
* Only the files matching one of these patterns are executed as test files. Matching is performed against the
* absolute file path. Strings are treated as glob patterns.
*
* By default, Playwright looks for files matching the following glob pattern: `**\/?(*.)@(spec|test).?(m)[jt]s?(x)`.
* This means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example `login-screen.spec.ts`.
* By default, Playwright looks for files matching the following glob pattern: `**\/*.@(spec|test).?(m)[jt]s?(x)`. This
* means JavaScript or TypeScript files with `".test"` or `".spec"` suffix, for example
* `login-screen.wrong-credentials.spec.ts`.
*
* Use [testConfig.testMatch](https://playwright.dev/docs/api/class-testconfig#test-config-test-match) to change this
* option for all projects.

17
tests/playwright-test/loader.spec.ts
View file

@ -153,14 +153,6 @@ test('should match tests well', async ({ runInlineTest }) => {
import { test, expect } from '@playwright/test';
test('works', () => {});
`,
'test.ts': `
import { test, expect } from '@playwright/test';
test('works', () => {});
`,
'spec.ts': `
import { test, expect } from '@playwright/test';
test('works', () => {});
`,
'strange.....spec.ts': `
import { test, expect } from '@playwright/test';
test('works', () => {});
@ -184,7 +176,7 @@ test('should match tests well', async ({ runInlineTest }) => {
});
expect(result.exitCode).toBe(0);
expect(result.passed).toBe(5);
expect(result.passed).toBe(3);
});
test('should load an mjs file', async ({ runInlineTest }) => {
@ -690,14 +682,19 @@ test('should support dynamic import', async ({ runInlineTest, nodeVersion }) =>
expect(result.exitCode).toBe(0);
});
test('should allow test.extend.ts file', async ({ runInlineTest }) => {
test('should allow test.extend.ts and test.ts files', async ({ runInlineTest }) => {
const result = await runInlineTest({
'test.extend.ts': `
export { test, expect } from '@playwright/test';
`,
'test.ts': `
export const helper = 42;
`,
'a.test.ts': `
import { test, expect } from './test.extend';
import { helper } from './test';
test('pass1', async () => {
expect(helper).toBe(42);
});
`,
});