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

Incorporate feedback from PR

Browse source
This commit is contained in:
Jon Hermansen 2025-02-17 15:21:03 -05:00
parent 39a2e9cf3e
commit 914625fe07
3 changed files with 1 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/playwright/src/common/config.ts
View file

@ -56,7 +56,6 @@ export class FullConfigInternal {
cliProjectFilter?: string[]; cliProjectFilter?: string[];
cliListOnly = false; cliListOnly = false;
cliPassWithNoTests?: boolean; cliPassWithNoTests?: boolean;
cliFailOnFlakyTests?: boolean;
cliLastFailed?: boolean; cliLastFailed?: boolean;
testIdMatcher?: Matcher; testIdMatcher?: Matcher;
lastFailedTestIdMatcher?: Matcher; lastFailedTestIdMatcher?: Matcher;

5
packages/playwright/src/runner/failureTracker.ts
View file

@ -49,7 +49,7 @@ export class FailureTracker {
} }
result(): 'failed' | 'passed' { result(): 'failed' | 'passed' {
return this._hasWorkerErrors || this.hasReachedMaxFailures() || this.hasFailedTests() || (this.failOnFlakyTests() && this.hasFlakyTests()) ? 'failed' : 'passed'; return this._hasWorkerErrors || this.hasReachedMaxFailures() || this.hasFailedTests() || (this._config.config.failOnFlakyTests && this.hasFlakyTests()) ? 'failed' : 'passed';
} }
hasFailedTests() { hasFailedTests() {
@ -64,7 +64,4 @@ export class FailureTracker {
return this._config.config.maxFailures; return this._config.config.maxFailures;
} }
failOnFlakyTests() {
return this._config.config.failOnFlakyTests || this._config.cliFailOnFlakyTests;
}
} }

67
tests/playwright-test/config.spec.ts
View file

@ -72,37 +72,6 @@ test('should prioritize command line timeout over project timeout', async ({ run
expect(result.output).toContain('Test timeout of 500ms exceeded.'); expect(result.output).toContain('Test timeout of 500ms exceeded.');
}); });
test('should default to failOnFlakyTests false', async ({ runInlineTest }) => {
const result = await runInlineTest({
'a.test.js': `
import { test, expect } from '@playwright/test';
test('flake', async ({}, testInfo) => {
expect(testInfo.retry).toBe(1);
});
`,
});
expect(result.exitCode).not.toBe(0);
expect(result.flaky).toBe(0);
});
test('should prioritize command line --fail-on-flaky-tests flag over config failOnFlakyTests', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `
module.exports = {
failOnFlakyTests: false
};
`,
'a.test.js': `
import { test, expect } from '@playwright/test';
test('flake', async ({}, testInfo) => {
expect(testInfo.retry).toBe(1);
});
`,
}, { 'retries': 1, 'fail-on-flaky-tests': true });
expect(result.exitCode).not.toBe(0);
expect(result.flaky).toBe(1);
});
test('should support failOnFlakyTests config option', async ({ runInlineTest }) => { test('should support failOnFlakyTests config option', async ({ runInlineTest }) => {
const result = await runInlineTest({ const result = await runInlineTest({
'playwright.config.ts': ` 'playwright.config.ts': `
@ -122,42 +91,6 @@ test('should support failOnFlakyTests config option', async ({ runInlineTest })
expect(result.flaky).toBe(1); expect(result.flaky).toBe(1);
}); });
test('should support failOnFlakyTests config option + retries CLI flag', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `
module.exports = {
failOnFlakyTests: true,
};
`,
'a.test.js': `
import { test, expect } from '@playwright/test';
test('flake', async ({}, testInfo) => {
expect(testInfo.retry).toBe(1);
});
`,
}, { 'retries': 1 });
expect(result.exitCode).not.toBe(0);
expect(result.flaky).toBe(1);
});
test('should support fail-on-flaky-tests CLI flag + retries config option', async ({ runInlineTest }) => {
const result = await runInlineTest({
'playwright.config.ts': `
module.exports = {
retries: 1,
};
`,
'a.test.js': `
import { test, expect } from '@playwright/test';
test('flake', async ({}, testInfo) => {
expect(testInfo.retry).toBe(1);
});
`,
}, { 'fail-on-flaky-tests': true });
expect(result.exitCode).not.toBe(0);
expect(result.flaky).toBe(1);
});
test('should read config from --config, resolve relative testDir', async ({ runInlineTest }) => { test('should read config from --config, resolve relative testDir', async ({ runInlineTest }) => {
const result = await runInlineTest({ const result = await runInlineTest({
'my.config.ts': ` 'my.config.ts': `