From 1cde8a3167ec0bce0a9e837d38f876e90eed0d97 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 31 May 2019 19:34:10 -0700 Subject: [PATCH] Get tests passing --- .../src/{WebLinksAddon.test.ts => WebLinksAddon.api.ts} | 6 +++--- addons/xterm-addon-web-links/src/tsconfig.json | 6 +++++- demo/client.ts | 2 ++ demo/test.html | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) rename addons/xterm-addon-web-links/src/{WebLinksAddon.test.ts => WebLinksAddon.api.ts} (96%) diff --git a/addons/xterm-addon-web-links/src/WebLinksAddon.test.ts b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts similarity index 96% rename from addons/xterm-addon-web-links/src/WebLinksAddon.test.ts rename to addons/xterm-addon-web-links/src/WebLinksAddon.api.ts index dd11b967..7dfe9514 100644 --- a/addons/xterm-addon-web-links/src/WebLinksAddon.test.ts +++ b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts @@ -7,14 +7,14 @@ import * as puppeteer from 'puppeteer'; import { assert } from 'chai'; import { ITerminalOptions } from 'xterm'; -const APP = 'http://127.0.0.1:3000'; +const APP = 'http://127.0.0.1:3000/test'; let browser: puppeteer.Browser; let page: puppeteer.Page; const width = 800; const height = 600; -describe('API Integration Tests', () => { +describe.only('WebLinksAddon', () => { before(async function(): Promise { this.timeout(10000); browser = await puppeteer.launch({ @@ -74,7 +74,7 @@ async function testHostName(hostname: string): Promise { async function openTerminal(options: ITerminalOptions = {}): Promise { await page.evaluate(`window.term = new Terminal(${JSON.stringify(options)})`); - await page.evaluate(`window.term.open(document.querySelector('#terminal'))`); + await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`); if (options.rendererType === 'dom') { await page.waitForSelector('.xterm-rows'); } else { diff --git a/addons/xterm-addon-web-links/src/tsconfig.json b/addons/xterm-addon-web-links/src/tsconfig.json index e4e51438..66bf3fb6 100644 --- a/addons/xterm-addon-web-links/src/tsconfig.json +++ b/addons/xterm-addon-web-links/src/tsconfig.json @@ -12,5 +12,9 @@ "sourceMap": true, "removeComments": true, "strict": true - } + }, + "include": [ + "./**/*", + "../../../typings/xterm.d.ts" + ] } diff --git a/demo/client.ts b/demo/client.ts index 10d27c86..8ff5ba11 100644 --- a/demo/client.ts +++ b/demo/client.ts @@ -25,6 +25,7 @@ import { Terminal as TerminalType, ITerminalOptions } from 'xterm'; export interface IWindowWithTerminal extends Window { term: TerminalType; Terminal?: typeof TerminalType; + WebLinksAddon?: typeof WebLinksAddon; } declare let window: IWindowWithTerminal; @@ -74,6 +75,7 @@ const disposeRecreateButtonHandler = () => { if (document.location.pathname === '/test') { window.Terminal = Terminal; + window.WebLinksAddon = WebLinksAddon; } else { createTerminal(); document.getElementById('dispose').addEventListener('click', disposeRecreateButtonHandler); diff --git a/demo/test.html b/demo/test.html index 275c542d..c14ca4bc 100644 --- a/demo/test.html +++ b/demo/test.html @@ -2,8 +2,8 @@ xterm.js integration test fixture - - + +