yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make web-first matchers work outside of pw tests (#9624)

Browse Source
This commit is contained in:
Pavel Feldman 2021-10-19 13:46:56 -08:00 committed by GitHub
parent a346af4ebf
commit 9d03a85c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/playwright-test/src/matchers/toBeTruthy.ts
View File

@ -27,9 +27,6 @@ export async function toBeTruthy(
query: (isNot: boolean, timeout: number) => Promise<{ matches: boolean, log?: string[] }>, query: (isNot: boolean, timeout: number) => Promise<{ matches: boolean, log?: string[] }>,
options: { timeout?: number } = {}, options: { timeout?: number } = {},
) { ) {
const testInfo = currentTestInfo();
if (!testInfo)
throw new Error(`${matcherName} must be called during the test`);
expectType(receiver, receiverType, matcherName); expectType(receiver, receiverType, matcherName);
const matcherOptions = { const matcherOptions = {
@ -37,7 +34,8 @@ export async function toBeTruthy(
promise: this.promise, promise: this.promise,
}; };
let defaultExpectTimeout = testInfo.project.expect?.timeout; const testInfo = currentTestInfo();
let defaultExpectTimeout = testInfo?.project.expect?.timeout;
if (typeof defaultExpectTimeout === 'undefined') if (typeof defaultExpectTimeout === 'undefined')
defaultExpectTimeout = 5000; defaultExpectTimeout = 5000;
const timeout = options.timeout === 0 ? 0 : options.timeout || defaultExpectTimeout; const timeout = options.timeout === 0 ? 0 : options.timeout || defaultExpectTimeout;

6
packages/playwright-test/src/matchers/toEqual.ts
View File

@ -35,9 +35,6 @@ export async function toEqual<T>(
expected: T, expected: T,
options: { timeout?: number, contains?: boolean } = {}, options: { timeout?: number, contains?: boolean } = {},
) { ) {
const testInfo = currentTestInfo();
if (!testInfo)
throw new Error(`${matcherName} must be called during the test`);
expectType(receiver, receiverType, matcherName); expectType(receiver, receiverType, matcherName);
const matcherOptions = { const matcherOptions = {
@ -46,7 +43,8 @@ export async function toEqual<T>(
promise: this.promise, promise: this.promise,
}; };
let defaultExpectTimeout = testInfo.project.expect?.timeout; const testInfo = currentTestInfo();
let defaultExpectTimeout = testInfo?.project.expect?.timeout;
if (typeof defaultExpectTimeout === 'undefined') if (typeof defaultExpectTimeout === 'undefined')
defaultExpectTimeout = 5000; defaultExpectTimeout = 5000;
const timeout = options.timeout === 0 ? 0 : options.timeout || defaultExpectTimeout; const timeout = options.timeout === 0 ? 0 : options.timeout || defaultExpectTimeout;

6
packages/playwright-test/src/matchers/toMatchText.ts
View File

@ -35,9 +35,6 @@ export async function toMatchText(
expected: string | RegExp, expected: string | RegExp,
options: { timeout?: number, matchSubstring?: boolean } = {}, options: { timeout?: number, matchSubstring?: boolean } = {},
) { ) {
const testInfo = currentTestInfo();
if (!testInfo)
throw new Error(`${matcherName} must be called during the test`);
expectType(receiver, receiverType, matcherName); expectType(receiver, receiverType, matcherName);
const matcherOptions = { const matcherOptions = {
@ -60,7 +57,8 @@ export async function toMatchText(
); );
} }
let defaultExpectTimeout = testInfo.project.expect?.timeout; const testInfo = currentTestInfo();
let defaultExpectTimeout = testInfo?.project.expect?.timeout;
if (typeof defaultExpectTimeout === 'undefined') if (typeof defaultExpectTimeout === 'undefined')
defaultExpectTimeout = 5000; defaultExpectTimeout = 5000;
const timeout = options.timeout === 0 ? 0 : options.timeout || defaultExpectTimeout; const timeout = options.timeout === 0 ? 0 : options.timeout || defaultExpectTimeout;