From 4ebb61b5801a7966ce5fa934d275192a67967c57 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 15 Feb 2020 05:18:46 -0800
Subject: [PATCH] Adopt playwright breaking changes

---
 addons/xterm-addon-attach/src/AttachAddon.api.ts       | 4 ++--
 addons/xterm-addon-fit/src/FitAddon.api.ts             | 4 ++--
 addons/xterm-addon-search/src/SearchAddon.api.ts       | 4 ++--
 addons/xterm-addon-serialize/src/SerializeAddon.api.ts | 4 ++--
 addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts | 4 ++--
 addons/xterm-addon-web-links/src/WebLinksAddon.api.ts  | 4 ++--
 addons/xterm-addon-webgl/src/WebglRenderer.api.ts      | 4 ++--
 test/api/CharWidth.api.ts                              | 4 ++--
 test/api/InputHandler.api.ts                           | 4 ++--
 test/api/MouseTracking.api.ts                          | 4 ++--
 test/api/Parser.api.ts                                 | 4 ++--
 test/api/Terminal.api.ts                               | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/xterm-addon-attach/src/AttachAddon.api.ts b/addons/xterm-addon-attach/src/AttachAddon.api.ts
index 14ac1e1c..065c1940 100644
--- a/addons/xterm-addon-attach/src/AttachAddon.api.ts
+++ b/addons/xterm-addon-attach/src/AttachAddon.api.ts
@@ -20,8 +20,8 @@ describe('AttachAddon', () => {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
   });
 
   after(async () => {
diff --git a/addons/xterm-addon-fit/src/FitAddon.api.ts b/addons/xterm-addon-fit/src/FitAddon.api.ts
index 824db4e8..33a0e6fd 100644
--- a/addons/xterm-addon-fit/src/FitAddon.api.ts
+++ b/addons/xterm-addon-fit/src/FitAddon.api.ts
@@ -22,8 +22,8 @@ describe('FitAddon', () => {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
     await page.goto(APP);
     await openTerminal(page);
     // This is used to do conditional assertions since cell height is 1 pixel higher with the
diff --git a/addons/xterm-addon-search/src/SearchAddon.api.ts b/addons/xterm-addon-search/src/SearchAddon.api.ts
index 7d278245..21e9d04b 100644
--- a/addons/xterm-addon-search/src/SearchAddon.api.ts
+++ b/addons/xterm-addon-search/src/SearchAddon.api.ts
@@ -22,8 +22,8 @@ describe('Search Tests', function(): void {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
     await page.goto(APP);
     await openTerminal(page);
     await page.evaluate(`window.search = new SearchAddon();`);
diff --git a/addons/xterm-addon-serialize/src/SerializeAddon.api.ts b/addons/xterm-addon-serialize/src/SerializeAddon.api.ts
index aba4b091..072804f2 100644
--- a/addons/xterm-addon-serialize/src/SerializeAddon.api.ts
+++ b/addons/xterm-addon-serialize/src/SerializeAddon.api.ts
@@ -20,8 +20,8 @@ describe('SerializeAddon', () => {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
     await page.goto(APP);
     await openTerminal(page, { rows: 10, cols: 10, rendererType: 'dom' });
     await page.evaluate(`
diff --git a/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts b/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts
index 3402dac7..cf12dae1 100644
--- a/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts
+++ b/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts
@@ -20,8 +20,8 @@ describe('Unicode11Addon', () => {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
   });
 
   after(async () => {
diff --git a/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts
index 00181956..16789233 100644
--- a/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts
+++ b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts
@@ -20,8 +20,8 @@ describe('WebLinksAddon', () => {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
   });
 
   after(async () => await browser.close());
diff --git a/addons/xterm-addon-webgl/src/WebglRenderer.api.ts b/addons/xterm-addon-webgl/src/WebglRenderer.api.ts
index 014825c7..c3e27c7d 100644
--- a/addons/xterm-addon-webgl/src/WebglRenderer.api.ts
+++ b/addons/xterm-addon-webgl/src/WebglRenderer.api.ts
@@ -902,8 +902,8 @@ async function setupBrowser(options: ITerminalOptions = { rendererType: 'dom' })
     headless: process.argv.indexOf('--headless') !== -1,
     args: [`--window-size=${width},${height}`, `--no-sandbox`]
   });
-  page = (await browser.defaultContext().pages())[0];
-  await page.setViewport({ width, height });
+  page = await (await browser.newContext()).newPage();
+  await page.setViewportSize({ width, height });
   await page.goto(APP);
   await openTerminal(page, options);
   await page.evaluate(`
diff --git a/test/api/CharWidth.api.ts b/test/api/CharWidth.api.ts
index 1bafea50..1fe8a34d 100644
--- a/test/api/CharWidth.api.ts
+++ b/test/api/CharWidth.api.ts
@@ -19,8 +19,8 @@ describe('CharWidth Integration Tests', function(): void {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
     await page.goto(APP);
     await openTerminal(page, { rows: 5, cols: 30 });
   });
diff --git a/test/api/InputHandler.api.ts b/test/api/InputHandler.api.ts
index 60f434a7..a4d3f82f 100644
--- a/test/api/InputHandler.api.ts
+++ b/test/api/InputHandler.api.ts
@@ -25,8 +25,8 @@ describe('InputHandler Integration Tests', function(): void {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
     await page.goto(APP);
     await openTerminal(page);
   });
diff --git a/test/api/MouseTracking.api.ts b/test/api/MouseTracking.api.ts
index f6129625..27283c19 100644
--- a/test/api/MouseTracking.api.ts
+++ b/test/api/MouseTracking.api.ts
@@ -214,8 +214,8 @@ describe('Mouse Tracking Tests', () => {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
   });
 
   after(async () => browser.close());
diff --git a/test/api/Parser.api.ts b/test/api/Parser.api.ts
index 87f64de3..5ac287a5 100644
--- a/test/api/Parser.api.ts
+++ b/test/api/Parser.api.ts
@@ -20,8 +20,8 @@ describe('Parser Integration Tests', function(): void {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
     await page.goto(APP);
     await openTerminal(page);
   });
diff --git a/test/api/Terminal.api.ts b/test/api/Terminal.api.ts
index 7bd0c0f3..188a6f7c 100644
--- a/test/api/Terminal.api.ts
+++ b/test/api/Terminal.api.ts
@@ -20,8 +20,8 @@ describe('API Integration Tests', function(): void {
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
-    page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    page = await (await browser.newContext()).newPage();
+    await page.setViewportSize({ width, height });
   });
 
   after(async () => browser.close());