fix(test-runner): better test match glob (#7382)
This commit is contained in:
parent
6aefa02e91
commit
368880962f
|
|
@ -191,7 +191,7 @@ export class Loader {
|
||||||
name: takeFirst(this._configOverrides.name, projectConfig.name, this._config.name, ''),
|
name: takeFirst(this._configOverrides.name, projectConfig.name, this._config.name, ''),
|
||||||
testDir,
|
testDir,
|
||||||
testIgnore: takeFirst(this._configOverrides.testIgnore, projectConfig.testIgnore, this._config.testIgnore, []),
|
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),
|
timeout: takeFirst(this._configOverrides.timeout, projectConfig.timeout, this._config.timeout, 10000),
|
||||||
use: mergeObjects(mergeObjects(this._config.use, projectConfig.use), this._configOverrides.use),
|
use: mergeObjects(mergeObjects(this._config.use, projectConfig.use), this._configOverrides.use),
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -104,3 +104,47 @@ test('should validate configuration object', async ({ runInlineTest }) => {
|
||||||
expect(result.failed).toBe(0);
|
expect(result.failed).toBe(0);
|
||||||
expect(result.output).toContain('playwright.config.ts: config.timeout must be a non-negative number');
|
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);
|
||||||
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue