bring back viewport option - fixes #6716

webdriverio · Apr 14, 2021 · fe7fd77 · fe7fd77
1 parent 3bd267a
commit fe7fd77
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/devtools/src/launcher.ts b/packages/devtools/src/launcher.ts
@@ -95,6 +95,8 @@ async function launchChrome (capabilities: ExtendedCapabilities) {
     log.info(`Connect Puppeteer with browser on port ${chrome.port}`)
     const browser = await puppeteer.connect({
         ...chromeOptions,
+        // @ts-ignore ToDo(@L0tso): remove comment once https://github.com/puppeteer/puppeteer/pull/6942 is released
+        defaultViewport: null,
         browserURL: `http://localhost:${chrome.port}`
     }) as unknown as Browser // casting from @types/puppeteer to built in type
 

diff --git a/packages/devtools/tests/__snapshots__/launcher.test.ts.snap b/packages/devtools/tests/__snapshots__/launcher.test.ts.snap
@@ -259,6 +259,7 @@ Array [
   Array [
     Object {
       "browserURL": "http://localhost:1234",
+      "defaultViewport": null,
     },
   ],
 ]
@@ -284,6 +285,7 @@ Array [
   Array [
     Object {
       "browserURL": "http://localhost:1234",
+      "defaultViewport": null,
     },
   ],
 ]

diff --git a/packages/webdriverio/src/commands/browser/getPuppeteer.ts b/packages/webdriverio/src/commands/browser/getPuppeteer.ts
@@ -70,7 +70,7 @@ export default async function getPuppeteer (this: WebdriverIO.Browser) {
         const { hostname, port } = this.options
         this.puppeteer = await puppeteer.connect({
             browserWSEndpoint: `ws://${hostname}:${port}/devtools/${this.sessionId}`,
-            // @ts-ignore ToDo: remove once https://github.com/puppeteer/puppeteer/pull/6942 is released
+            // @ts-ignore ToDo(@L0tso): remove comment once https://github.com/puppeteer/puppeteer/pull/6942 is released
             defaultViewport: null
         }) as any as PuppeteerBrowser
         return this.puppeteer
@@ -82,7 +82,7 @@ export default async function getPuppeteer (this: WebdriverIO.Browser) {
     if (chromiumOptions && chromiumOptions.debuggerAddress) {
         this.puppeteer = await puppeteer.connect({
             browserURL: `http://${chromiumOptions.debuggerAddress}`,
-            // @ts-ignore ToDo: remove once https://github.com/puppeteer/puppeteer/pull/6942 is released
+            // @ts-ignore ToDo(@L0tso): remove comment once https://github.com/puppeteer/puppeteer/pull/6942 is released
             defaultViewport: null
         }) as any as PuppeteerBrowser
         return this.puppeteer
@@ -112,7 +112,7 @@ export default async function getPuppeteer (this: WebdriverIO.Browser) {
 
             this.puppeteer = await puppeteer.connect({
                 browserURL: `http://localhost:${rdPort}`,
-                // @ts-ignore ToDo(@L0tso): remove once https://github.com/puppeteer/puppeteer/pull/6942 is merged
+                // @ts-ignore ToDo(@L0tso): remove comment once https://github.com/puppeteer/puppeteer/pull/6942 is merged
                 defaultViewport: null
             }) as any as PuppeteerBrowser
             return this.puppeteer as any as PuppeteerBrowser