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

fix(clock): ensure Date.now() is an integer (#31648)

Browse source 
Fixes https://github.com/microsoft/playwright/issues/31644
This commit is contained in:
Pavel Feldman 2024-07-12 11:44:25 -07:00 committed by GitHub
parent 3127571b24
commit 297143885a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/playwright-core/src/server/injected/clock.ts
View file

@ -53,7 +53,7 @@ type Timer = {
interface Embedder { interface Embedder {
dateNow(): number; dateNow(): number;
performanceNow(): DOMHighResTimeStamp; performanceNow(): EmbedderTicks;
setTimeout(task: () => void, timeout?: number): () => void; setTimeout(task: () => void, timeout?: number): () => void;
setInterval(task: () => void, delay: number): () => void; setInterval(task: () => void, delay: number): () => void;
} }
@ -147,6 +147,8 @@ export class ClockController {
} }
private async _runTo(to: Ticks) { private async _runTo(to: Ticks) {
to = Math.ceil(to) as Ticks;
if (this._now.ticks > to) if (this._now.ticks > to)
return; return;
@ -182,7 +184,7 @@ export class ClockController {
} }
private _innerResume() { private _innerResume() {
const now = this._embedder.performanceNow() as EmbedderTicks; const now = this._embedder.performanceNow();
this._realTime = { startTicks: now, lastSyncTicks: now }; this._realTime = { startTicks: now, lastSyncTicks: now };
this._updateRealTimeTimer(); this._updateRealTimeTimer();
} }
@ -209,7 +211,7 @@ export class ClockController {
this._currentRealTimeTimer = { this._currentRealTimeTimer = {
callAt, callAt,
dispose: this._embedder.setTimeout(() => { dispose: this._embedder.setTimeout(() => {
const now = Math.ceil(this._embedder.performanceNow()) as EmbedderTicks; const now = this._embedder.performanceNow();
this._currentRealTimeTimer = undefined; this._currentRealTimeTimer = undefined;
const sinceLastSync = now - this._realTime!.lastSyncTicks; const sinceLastSync = now - this._realTime!.lastSyncTicks;
this._realTime!.lastSyncTicks = now; this._realTime!.lastSyncTicks = now;
@ -662,7 +664,7 @@ export function createClock(globalObject: WindowOrWorkerGlobalScope): { clock: C
const originals = platformOriginals(globalObject); const originals = platformOriginals(globalObject);
const embedder: Embedder = { const embedder: Embedder = {
dateNow: () => originals.raw.Date.now(), dateNow: () => originals.raw.Date.now(),
performanceNow: () => originals.raw.performance!.now(), performanceNow: () => Math.ceil(originals.raw.performance!.now()) as EmbedderTicks,
setTimeout: (task: () => void, timeout?: number) => { setTimeout: (task: () => void, timeout?: number) => {
const timerId = originals.bound.setTimeout(task, timeout); const timerId = originals.bound.setTimeout(task, timeout);
return () => originals.bound.clearTimeout(timerId); return () => originals.bound.clearTimeout(timerId);

22
tests/page/page-clock.spec.ts
View file

@ -510,3 +510,25 @@ it.describe('while on pause', () => {
expect(calls).toEqual([{ params: ['outer'] }, { params: ['inner'] }]); expect(calls).toEqual([{ params: ['outer'] }, { params: ['inner'] }]);
}); });
}); });
it.describe('Date.now', () => {
it('check Date.now is an integer', async ({ page }) => {
await page.clock.install();
await page.goto('data:text/html,');
await page.waitForTimeout(1000);
const dateValue = await page.evaluate('Date.now()');
expect(Number.isInteger(dateValue)).toBeTruthy();
await page.waitForTimeout(1000);
const dateValue2 = await page.evaluate('Date.now()');
expect(Number.isInteger(dateValue2)).toBeTruthy();
});
it('check Date.now is an integer (2)', async ({ page }) => {
await page.clock.install({ time: 0 });
await page.goto('data:text/html,');
await page.clock.pauseAt(1000);
await page.clock.runFor(0.5);
const dateValue = await page.evaluate('Date.now()');
expect(dateValue).toBe(1001);
});
});