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

fix: expect.poll

Browse source
This commit is contained in:
Simon Knott 2024-09-02 10:00:07 +02:00
parent 7b3cb7e34e
commit 8ac8ec9904
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,10 +270,12 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
if (typeof matcherName !== 'string') if (typeof matcherName !== 'string')
return matcher; return matcher;
let resolvedMatcherName = matcherName;
for (let i = this._prefix.length; i > 0; i--) { for (let i = this._prefix.length; i > 0; i--) {
const qualifiedName = qualifiedMatcherName(this._prefix.slice(0, i), matcherName); const qualifiedName = qualifiedMatcherName(this._prefix.slice(0, i), matcherName);
if (Reflect.has(target, qualifiedName)) { if (Reflect.has(target, qualifiedName)) {
matcher = Reflect.get(target, qualifiedName, receiver); matcher = Reflect.get(target, qualifiedName, receiver);
resolvedMatcherName = qualifiedName;
break; break;
} }
} }
@ -288,7 +290,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
if (this._info.isPoll) { if (this._info.isPoll) {
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(matcherName, !!this._info.isNot, this._info.pollIntervals, this._info.pollTimeout ?? currentExpectTimeout(), this._info.generator!, ...args); matcher = (...args: any[]) => pollMatcher(resolvedMatcherName, !!this._info.isNot, this._info.pollIntervals, this._info.pollTimeout ?? currentExpectTimeout(), this._info.generator!, ...args);
} }
return (...args: any[]) => { return (...args: any[]) => {
const testInfo = currentTestInfo(); const testInfo = currentTestInfo();
@ -318,6 +320,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
const step = testInfo._addStep(stepInfo); const step = testInfo._addStep(stepInfo);
const reportStepError = (jestError: Error | unknown) => { const reportStepError = (jestError: Error | unknown) => {
console.error(jestError);
const error = isExpectError(jestError) ? new ExpectError(jestError, customMessage, stackFrames) : jestError; const error = isExpectError(jestError) ? new ExpectError(jestError, customMessage, stackFrames) : jestError;
step.complete({ error }); step.complete({ error });
if (this._info.isSoft) if (this._info.isSoft)
@ -348,7 +351,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
} }
} }
async function pollMatcher(matcherName: any, isNot: boolean, pollIntervals: number[] | undefined, timeout: number, generator: () => any, ...args: any[]) { async function pollMatcher(qualifiedMatcherName: any, isNot: boolean, pollIntervals: number[] | undefined, timeout: number, generator: () => any, ...args: any[]) {
const testInfo = currentTestInfo(); const testInfo = currentTestInfo();
const { deadline, timeoutMessage } = testInfo ? testInfo._deadlineForMatcher(timeout) : TestInfoImpl._defaultDeadlineForMatcher(timeout); const { deadline, timeoutMessage } = testInfo ? testInfo._deadlineForMatcher(timeout) : TestInfoImpl._defaultDeadlineForMatcher(timeout);
@ -361,7 +364,7 @@ async function pollMatcher(matcherName: any, isNot: boolean, pollIntervals: numb
if (isNot) if (isNot)
expectInstance = expectInstance.not; expectInstance = expectInstance.not;
try { try {
expectInstance[matcherName].call(expectInstance, ...args); expectInstance[qualifiedMatcherName].call(expectInstance, ...args);
return { continuePolling: false, result: undefined }; return { continuePolling: false, result: undefined };
} catch (error) { } catch (error) {
return { continuePolling: true, result: error }; return { continuePolling: true, result: error };

7
tests/playwright-test/expect-poll.spec.ts
View file

@ -172,7 +172,9 @@ test('should support .not predicate', async ({ runInlineTest }) => {
test('should support custom matchers', async ({ runInlineTest }) => { test('should support custom matchers', async ({ runInlineTest }) => {
const result = await runInlineTest({ const result = await runInlineTest({
'a.spec.ts': ` 'a.spec.ts': `
expect.extend({ import { test, expect as baseExpect } from '@playwright/test';
const expect = baseExpect.extend({
toBeWithinRange(received, floor, ceiling) { toBeWithinRange(received, floor, ceiling) {
const pass = received >= floor && received <= ceiling; const pass = received >= floor && received <= ceiling;
if (pass) { if (pass) {
@ -191,10 +193,9 @@ test('should support custom matchers', async ({ runInlineTest }) => {
}, },
}); });
import { test, expect } from '@playwright/test';
test('should poll', async () => { test('should poll', async () => {
let i = 0; let i = 0;
await test.expect.poll(() => ++i).toBeWithinRange(3, Number.MAX_VALUE); await expect.poll(() => ++i).toBeWithinRange(3, Number.MAX_VALUE);
}); });
` `
}); });