From 8906ba332cf2cc8450fc1e945d921e3957f4bcd1 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Wed, 24 Feb 2021 15:11:34 -0800 Subject: [PATCH] chore: spell overridden (#5605) --- .../firefox/juggler/NetworkObserver.js | 6 +++--- src/server/injected/utilityScript.ts | 2 +- src/server/network.ts | 2 +- src/server/screenshotter.ts | 16 ++++++++-------- src/server/trace/viewer/frameSnapshot.ts | 6 +++--- src/server/trace/viewer/snapshotServer.ts | 8 ++++---- src/server/trace/viewer/traceModel.ts | 6 +++--- test/page-request-continue.spec.ts | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js index b3a4e9ddf3..b97ddc9074 100644 --- a/browser_patches/firefox/juggler/NetworkObserver.js +++ b/browser_patches/firefox/juggler/NetworkObserver.js @@ -245,7 +245,7 @@ class NetworkRequest { const body = atob(postData); synthesized.setData(body, body.length); - const overridenHeader = (lowerCaseName, defaultValue) => { + const overriddenHeader = (lowerCaseName, defaultValue) => { if (headers) { for (const header of headers) { if (header.name.toLowerCase() === lowerCaseName) { @@ -256,8 +256,8 @@ class NetworkRequest { return defaultValue; } // Clear content-length, so that upload stream resets it. - this.httpChannel.setRequestHeader('content-length', overridenHeader('content-length', ''), false /* merge */); - this.httpChannel.explicitSetUploadStream(synthesized, overridenHeader('content-type', 'application/octet-stream'), -1, this.httpChannel.requestMethod, false); + this.httpChannel.setRequestHeader('content-length', overriddenHeader('content-length', ''), false /* merge */); + this.httpChannel.explicitSetUploadStream(synthesized, overriddenHeader('content-type', 'application/octet-stream'), -1, this.httpChannel.requestMethod, false); } } diff --git a/src/server/injected/utilityScript.ts b/src/server/injected/utilityScript.ts index 9a2089b820..978d35c506 100644 --- a/src/server/injected/utilityScript.ts +++ b/src/server/injected/utilityScript.ts @@ -53,7 +53,7 @@ export default class UtilityScript { if (value && typeof value === 'object' && typeof value.then === 'function') { return (async () => { // By using async function we ensure that return value is a native Promise, - // and not some overriden Promise in the page. + // and not some overridden Promise in the page. // This makes Firefox and WebKit debugging protocols recognize it as a Promise, // properly await and return the value. const promiseValue = await value; diff --git a/src/server/network.ts b/src/server/network.ts index bf594a7233..f76670f9a5 100644 --- a/src/server/network.ts +++ b/src/server/network.ts @@ -242,7 +242,7 @@ export class Route extends SdkObject { const newUrl = new URL(overrides.url); const oldUrl = new URL(this._request.url()); if (oldUrl.protocol !== newUrl.protocol) - throw new Error('New URL must have same protocol as overriden URL'); + throw new Error('New URL must have same protocol as overridden URL'); } await this._delegate.continue(overrides); } diff --git a/src/server/screenshotter.ts b/src/server/screenshotter.ts index 9b25234eab..19a3aaaa63 100644 --- a/src/server/screenshotter.ts +++ b/src/server/screenshotter.ts @@ -73,19 +73,19 @@ export class Screenshotter { if (options.fullPage) { const fullPageSize = await this._fullPageSize(); let documentRect = { x: 0, y: 0, width: fullPageSize.width, height: fullPageSize.height }; - let overridenViewportSize: types.Size | null = null; + let overriddenViewportSize: types.Size | null = null; const fitsViewport = fullPageSize.width <= viewportSize.width && fullPageSize.height <= viewportSize.height; if (!this._page._delegate.canScreenshotOutsideViewport() && !fitsViewport) { - overridenViewportSize = fullPageSize; + overriddenViewportSize = fullPageSize; progress.throwIfAborted(); // Avoid side effects. - await this._page.setViewportSize(overridenViewportSize); + await this._page.setViewportSize(overriddenViewportSize); progress.cleanupWhenAborted(() => this._restoreViewport(originalViewportSize)); } if (options.clip) documentRect = trimClipToSize(options.clip, documentRect); const buffer = await this._screenshot(progress, format, documentRect, undefined, options); progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup. - if (overridenViewportSize) + if (overriddenViewportSize) await this._restoreViewport(originalViewportSize); return buffer; } @@ -106,15 +106,15 @@ export class Screenshotter { assert(boundingBox.width !== 0, 'Node has 0 width.'); assert(boundingBox.height !== 0, 'Node has 0 height.'); - let overridenViewportSize: types.Size | null = null; + let overriddenViewportSize: types.Size | null = null; const fitsViewport = boundingBox.width <= viewportSize.width && boundingBox.height <= viewportSize.height; if (!this._page._delegate.canScreenshotOutsideViewport() && !fitsViewport) { - overridenViewportSize = helper.enclosingIntSize({ + overriddenViewportSize = helper.enclosingIntSize({ width: Math.max(viewportSize.width, boundingBox.width), height: Math.max(viewportSize.height, boundingBox.height), }); progress.throwIfAborted(); // Avoid side effects. - await this._page.setViewportSize(overridenViewportSize); + await this._page.setViewportSize(overriddenViewportSize); progress.cleanupWhenAborted(() => this._restoreViewport(originalViewportSize)); await handle._waitAndScrollIntoViewIfNeeded(progress); @@ -131,7 +131,7 @@ export class Screenshotter { documentRect.y += scrollOffset.y; const buffer = await this._screenshot(progress, format, helper.enclosingIntRect(documentRect), undefined, options); progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup. - if (overridenViewportSize) + if (overriddenViewportSize) await this._restoreViewport(originalViewportSize); return buffer; }).catch(rewriteError); diff --git a/src/server/trace/viewer/frameSnapshot.ts b/src/server/trace/viewer/frameSnapshot.ts index 3d5c68d811..876a7b56ea 100644 --- a/src/server/trace/viewer/frameSnapshot.ts +++ b/src/server/trace/viewer/frameSnapshot.ts @@ -21,7 +21,7 @@ export * as trace from '../common/traceEvents'; export type SerializedFrameSnapshot = { html: string; resourcesByUrl: { [key: string]: { resourceId: string, frameId: string }[] }; - overridenUrls: { [key: string]: boolean }; + overriddenUrls: { [key: string]: boolean }; resourceOverrides: { [key: string]: string }; }; @@ -83,11 +83,11 @@ export class FrameSnapshot { html += ``; const resourcesByUrl = this.contextEntry.resourcesByUrl; - const overridenUrls = this.contextEntry.overridenUrls; + const overriddenUrls = this.contextEntry.overriddenUrls; const resourceOverrides: any = {}; for (const o of this._snapshots[this._index].snapshot.resourceOverrides) resourceOverrides[o.url] = o.sha1; - return { html, resourcesByUrl, overridenUrls, resourceOverrides }; + return { html, resourcesByUrl, overriddenUrls: overriddenUrls, resourceOverrides }; } } diff --git a/src/server/trace/viewer/snapshotServer.ts b/src/server/trace/viewer/snapshotServer.ts index 553a6b94a6..cf0ae41d69 100644 --- a/src/server/trace/viewer/snapshotServer.ts +++ b/src/server/trace/viewer/snapshotServer.ts @@ -171,18 +171,18 @@ export class SnapshotServer { if (request.mode === 'navigate') { const htmlResponse = await fetch(`/snapshot-data?pageId=${parsed.pageId}&snapshotId=${parsed.snapshotId || ''}×tamp=${parsed.timestamp || ''}&frameId=${parsed.frameId || ''}`); - const { html, resourcesByUrl, overridenUrls, resourceOverrides } = await htmlResponse.json(); + const { html, resourcesByUrl, overriddenUrls, resourceOverrides } = await htmlResponse.json(); if (!html) return respondNotAvailable(); pageToResourcesByUrl.set(parsed.pageId, resourcesByUrl); - pageToOverriddenUrls.set(parsed.pageId, overridenUrls); + pageToOverriddenUrls.set(parsed.pageId, overriddenUrls); snapshotToResourceOverrides.set(parsed.snapshotId + '@' + parsed.timestamp, resourceOverrides); const response = new Response(html, { status: 200, headers: { 'Content-Type': 'text/html' } }); return response; } const resourcesByUrl = pageToResourcesByUrl.get(parsed.pageId); - const overridenUrls = pageToOverriddenUrls.get(parsed.pageId); + const overriddenUrls = pageToOverriddenUrls.get(parsed.pageId); const resourceOverrides = snapshotToResourceOverrides.get(parsed.snapshotId + '@' + parsed.timestamp); const urlWithoutHash = removeHash(request.url); const resourcesWithUrl = resourcesByUrl?.[urlWithoutHash] || []; @@ -201,7 +201,7 @@ export class SnapshotServer { // as the original request url. // Response url turns into resource base uri that is used to resolve // relative links, e.g. url(/foo/bar) in style sheets. - if (overridenUrls?.[urlWithoutHash]) { + if (overriddenUrls?.[urlWithoutHash]) { // No cache, so that we refetch overridden resources. headers.set('Cache-Control', 'no-cache'); } diff --git a/src/server/trace/viewer/traceModel.ts b/src/server/trace/viewer/traceModel.ts index 87e2cc8b41..1de711ce1d 100644 --- a/src/server/trace/viewer/traceModel.ts +++ b/src/server/trace/viewer/traceModel.ts @@ -40,7 +40,7 @@ export class TraceModel { destroyed: undefined as any, pages: [], resourcesByUrl: {}, - overridenUrls: {} + overriddenUrls: {} }); break; } @@ -111,7 +111,7 @@ export class TraceModel { override.sha1 = refOverride?.sha1; delete override.ref; } - contextEntry.overridenUrls[override.url] = true; + contextEntry.overriddenUrls[override.url] = true; } break; } @@ -184,7 +184,7 @@ export type ContextEntry = { destroyed: trace.ContextDestroyedTraceEvent; pages: PageEntry[]; resourcesByUrl: { [key: string]: { resourceId: string, frameId: string }[] }; - overridenUrls: { [key: string]: boolean }; + overriddenUrls: { [key: string]: boolean }; } export type InterestingPageEvent = trace.DialogOpenedEvent | trace.DialogClosedEvent | trace.NavigationEvent | trace.LoadEvent; diff --git a/test/page-request-continue.spec.ts b/test/page-request-continue.spec.ts index 61b162c315..c98bc6316d 100644 --- a/test/page-request-continue.spec.ts +++ b/test/page-request-continue.spec.ts @@ -74,7 +74,7 @@ it('should not allow changing protocol when overriding url', async ({page, serve }); await page.goto(server.EMPTY_PAGE); expect(error).toBeTruthy(); - expect(error.message).toContain('New URL must have same protocol as overriden URL'); + expect(error.message).toContain('New URL must have same protocol as overridden URL'); }); it('should override method along with url', async ({page, server}) => {