Merge branch 'master' of https://github.com/xtermjs/xterm.js into playwright

addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts

@@ -4,8 +4,8 @@
  */
 
 import * as playwright from 'playwright';
-import { ITerminalOptions } from 'xterm';
 import { assert } from 'chai';
+import { openTerminal } from '../../../out-test/api/TestUtils';
 
 const APP = 'http://127.0.0.1:3000/test';
 
@@ -32,7 +32,7 @@ describe('Unicode11Addon', () => {
   beforeEach(async function(): Promise<any> {
     this.timeout(20000);
     await page.goto(APP);
-    await openTerminal();
+    await openTerminal(page);
   });
 
   it('wcwidth V11 emoji test', async () => {
@@ -49,28 +49,3 @@ describe('Unicode11Addon', () => {
     assert.deepEqual(await page.evaluate(`window.term._core.unicodeService.getStringCellWidth('🤣🤣🤣🤣🤣🤣🤣🤣🤣🤣')`), 20);
   });
 });
-
-async function openTerminal(options: ITerminalOptions = {}): Promise<void> {
-  await page.evaluate(`window.term = new Terminal(${JSON.stringify(options)})`);
-  await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
-  if (options.rendererType === 'dom') {
-    await page.waitForSelector('.xterm-rows');
-  } else {
-    await page.waitForSelector('.xterm-text-layer');
-  }
-}
-
-function getBrowserType(): playwright.BrowserType {
-  // Default to chromium
-  let browserType: playwright.BrowserType = playwright['chromium'];
-
-  const index = process.argv.indexOf('--browser');
-  if (index !== -1 && process.argv.length > index + 2 && typeof process.argv[index + 1] === 'string') {
-    const string = process.argv[index + 1];
-    if (string === 'firefox' || string === 'webkit') {
-      browserType = playwright[string];
-    }
-  }
-
-  return browserType;
-}