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

fix tests, poll property

Browse source
This commit is contained in:
Dmitry Gozman 2024-09-14 17:03:36 +01:00
parent 561435841e
commit 01f9de3d75
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
packages/playwright/src/matchers/expect.ts
View file

@ -121,10 +121,10 @@ function createExpect(info: ExpectMetaInfo, prefix: string[], customMatchers: Re
const [actual, messageOrOptions] = argumentsList; const [actual, messageOrOptions] = argumentsList;
const message = isString(messageOrOptions) ? messageOrOptions : messageOrOptions?.message || info.message; const message = isString(messageOrOptions) ? messageOrOptions : messageOrOptions?.message || info.message;
const newInfo = { ...info, message }; const newInfo = { ...info, message };
if (newInfo.isPoll) { if (newInfo.poll) {
if (typeof actual !== 'function') if (typeof actual !== 'function')
throw new Error('`expect.poll()` accepts only function as a first argument'); throw new Error('`expect.poll()` accepts only function as a first argument');
newInfo.generator = actual as any; newInfo.poll.generator = actual as any;
} }
return createMatchers(actual, newInfo, prefix); return createMatchers(actual, newInfo, prefix);
}, },
@ -189,10 +189,10 @@ function createExpect(info: ExpectMetaInfo, prefix: string[], customMatchers: Re
if ('soft' in configuration) if ('soft' in configuration)
newInfo.isSoft = configuration.soft; newInfo.isSoft = configuration.soft;
if ('_poll' in configuration) { if ('_poll' in configuration) {
newInfo.isPoll = !!configuration._poll; newInfo.poll = configuration._poll ? { ...info.poll, generator: () => {} } : undefined;
if (typeof configuration._poll === 'object') { if (typeof configuration._poll === 'object') {
newInfo.pollTimeout = configuration._poll.timeout; newInfo.poll!.timeout = configuration._poll.timeout ?? newInfo.poll!.timeout;
newInfo.pollIntervals = configuration._poll.intervals; newInfo.poll!.intervals = configuration._poll.intervals ?? newInfo.poll!.intervals;
} }
} }
return createExpect(newInfo, prefix, customMatchers); return createExpect(newInfo, prefix, customMatchers);
@ -249,11 +249,12 @@ type ExpectMetaInfo = {
message?: string; message?: string;
isNot?: boolean; isNot?: boolean;
isSoft?: boolean; isSoft?: boolean;
isPoll?: boolean; poll?: {
timeout?: number;
intervals?: number[];
generator: Generator;
};
timeout?: number; timeout?: number;
pollTimeout?: number;
pollIntervals?: number[];
generator?: Generator;
}; };
class ExpectMetaInfoProxyHandler implements ProxyHandler<any> { class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
@ -287,7 +288,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
this._info.isNot = !this._info.isNot; this._info.isNot = !this._info.isNot;
return new Proxy(matcher, this); return new Proxy(matcher, this);
} }
if (this._info.isPoll) { if (this._info.poll) {
if ((customAsyncMatchers as any)[matcherName] || matcherName === 'resolves' || matcherName === 'rejects') if ((customAsyncMatchers as any)[matcherName] || matcherName === 'resolves' || matcherName === 'rejects')
throw new Error(`\`expect.poll()\` does not support "${matcherName}" matcher.`); throw new Error(`\`expect.poll()\` does not support "${matcherName}" matcher.`);
matcher = (...args: any[]) => pollMatcher(resolvedMatcherName, this._info, this._prefix, ...args); matcher = (...args: any[]) => pollMatcher(resolvedMatcherName, this._info, this._prefix, ...args);
@ -302,7 +303,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
const customMessage = this._info.message || ''; const customMessage = this._info.message || '';
const argsSuffix = computeArgsSuffix(matcherName, args); const argsSuffix = computeArgsSuffix(matcherName, args);
const defaultTitle = `expect${this._info.isPoll ? '.poll' : ''}${this._info.isSoft ? '.soft' : ''}${this._info.isNot ? '.not' : ''}.${matcherName}${argsSuffix}`; const defaultTitle = `expect${this._info.poll ? '.poll' : ''}${this._info.isSoft ? '.soft' : ''}${this._info.isNot ? '.not' : ''}.${matcherName}${argsSuffix}`;
const title = customMessage || defaultTitle; const title = customMessage || defaultTitle;
// This looks like it is unnecessary, but it isn't - we need to filter // This looks like it is unnecessary, but it isn't - we need to filter
@ -336,7 +337,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
const callback = () => matcher.call(target, ...args); const callback = () => matcher.call(target, ...args);
// toPass and poll matchers can contain other steps, expects and API calls, // toPass and poll matchers can contain other steps, expects and API calls,
// so they behave like a retriable step. // so they behave like a retriable step.
const result = (matcherName === 'toPass' || this._info.isPoll) ? const result = (matcherName === 'toPass' || this._info.poll) ?
zones.run('stepZone', step, callback) : zones.run('stepZone', step, callback) :
zones.run<ExpectZone, any>('expectZone', { title, stepId: step.stepId }, callback); zones.run<ExpectZone, any>('expectZone', { title, stepId: step.stepId }, callback);
if (result instanceof Promise) if (result instanceof Promise)
@ -352,7 +353,8 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
async function pollMatcher(qualifiedMatcherName: string, info: ExpectMetaInfo, prefix: string[], ...args: any[]) { async function pollMatcher(qualifiedMatcherName: string, info: ExpectMetaInfo, prefix: string[], ...args: any[]) {
const testInfo = currentTestInfo(); const testInfo = currentTestInfo();
const timeout = info.pollTimeout ?? currentExpectTimeout(); const poll = info.poll!;
const timeout = poll.timeout ?? currentExpectTimeout();
const { deadline, timeoutMessage } = testInfo ? testInfo._deadlineForMatcher(timeout) : TestInfoImpl._defaultDeadlineForMatcher(timeout); const { deadline, timeoutMessage } = testInfo ? testInfo._deadlineForMatcher(timeout) : TestInfoImpl._defaultDeadlineForMatcher(timeout);
const result = await pollAgainstDeadline<Error|undefined>(async () => { const result = await pollAgainstDeadline<Error|undefined>(async () => {
@ -362,12 +364,9 @@ async function pollMatcher(qualifiedMatcherName: string, info: ExpectMetaInfo, p
const innerInfo: ExpectMetaInfo = { const innerInfo: ExpectMetaInfo = {
...info, ...info,
isSoft: false, // soft is outside of poll, not inside isSoft: false, // soft is outside of poll, not inside
isPoll: false, poll: undefined,
pollTimeout: undefined,
pollIntervals: undefined,
generator: undefined,
}; };
const value = await info.generator!(); const value = await poll.generator();
try { try {
let matchers = createMatchers(value, innerInfo, prefix); let matchers = createMatchers(value, innerInfo, prefix);
if (info.isNot) if (info.isNot)
@ -377,7 +376,7 @@ async function pollMatcher(qualifiedMatcherName: string, info: ExpectMetaInfo, p
} catch (error) { } catch (error) {
return { continuePolling: true, result: error }; return { continuePolling: true, result: error };
} }
}, deadline, info.pollIntervals ?? [100, 250, 500, 1000]); }, deadline, poll.intervals ?? [100, 250, 500, 1000]);
if (result.timedOut) { if (result.timedOut) {
const message = result.result ? [ const message = result.result ? [