Merge pull request #2551 from Tyriar/puppeteer_slowmo
Make integration tests very fast by removing slowMo
This commit is contained in:
@@ -20,7 +20,6 @@ describe('AttachAddon', () => {
|
||||
this.timeout(20000);
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
@@ -43,7 +42,7 @@ describe('AttachAddon', () => {
|
||||
const server = new WebSocket.Server({ port });
|
||||
server.on('connection', socket => socket.send('foo'));
|
||||
await page.evaluate(`window.term.loadAddon(new window.AttachAddon(new WebSocket('ws://localhost:${port}')))`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foo');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foo');
|
||||
server.close();
|
||||
});
|
||||
|
||||
@@ -55,7 +54,7 @@ describe('AttachAddon', () => {
|
||||
const data = new Uint8Array([102, 111, 111]);
|
||||
server.on('connection', socket => socket.send(data));
|
||||
await page.evaluate(`window.term.loadAddon(new window.AttachAddon(new WebSocket('ws://localhost:${port}')))`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foo');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foo');
|
||||
server.close();
|
||||
});
|
||||
});
|
||||
@@ -69,3 +68,12 @@ async function openTerminal(options: ITerminalOptions = {}): Promise<void> {
|
||||
await page.waitForSelector('.xterm-text-layer');
|
||||
}
|
||||
}
|
||||
|
||||
async function pollFor(page: puppeteer.Page, fn: string, val: any): Promise<void> {
|
||||
const result = await page.evaluate(fn);
|
||||
if (result !== val) {
|
||||
return new Promise<void>(r => {
|
||||
setTimeout(() => r(pollFor(page, fn, val)), 10);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ describe('FitAddon', () => {
|
||||
this.timeout(20000);
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
|
||||
@@ -22,7 +22,6 @@ describe('Search Tests', function (): void {
|
||||
before(async function (): Promise<any> {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
|
||||
@@ -19,7 +19,6 @@ describe('WebLinksAddon', () => {
|
||||
this.timeout(10000);
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
@@ -54,22 +53,21 @@ describe('WebLinksAddon', () => {
|
||||
async function testHostName(hostname: string): Promise<void> {
|
||||
await openTerminal({ rendererType: 'dom' });
|
||||
await page.evaluate(`window.term.loadAddon(new window.WebLinksAddon())`);
|
||||
await page.evaluate(`
|
||||
window.term.writeln(' http://${hostname} ');
|
||||
window.term.writeln(' http://${hostname}/a~b#c~d?e~f ');
|
||||
window.term.writeln(' http://${hostname}/colon:test ');
|
||||
window.term.writeln(' http://${hostname}/colon:test: ');
|
||||
window.term.writeln('"http://${hostname}/"');
|
||||
window.term.writeln('\\'http://${hostname}/\\'');
|
||||
window.term.writeln('http://${hostname}/subpath/+/id');
|
||||
`);
|
||||
assert.equal(await getLinkAtCell(3, 1), `http://${hostname}`);
|
||||
assert.equal(await getLinkAtCell(3, 2), `http://${hostname}/a~b#c~d?e~f`);
|
||||
assert.equal(await getLinkAtCell(3, 3), `http://${hostname}/colon:test`);
|
||||
assert.equal(await getLinkAtCell(3, 4), `http://${hostname}/colon:test`);
|
||||
assert.equal(await getLinkAtCell(2, 5), `http://${hostname}/`);
|
||||
assert.equal(await getLinkAtCell(2, 6), `http://${hostname}/`);
|
||||
assert.equal(await getLinkAtCell(1, 7), `http://${hostname}/subpath/+/id`);
|
||||
const data = ` http://${hostname} \\r\\n` +
|
||||
` http://${hostname}/a~b#c~d?e~f \\r\\n` +
|
||||
` http://${hostname}/colon:test \\r\\n` +
|
||||
` http://${hostname}/colon:test: \\r\\n` +
|
||||
`"http://${hostname}/"\\r\\n` +
|
||||
`\\'http://${hostname}/\\'\\r\\n` +
|
||||
`http://${hostname}/subpath/+/id`;
|
||||
await writeSync(page, data);
|
||||
await pollForLinkAtCell(3, 1, `http://${hostname}`);
|
||||
await pollForLinkAtCell(3, 2, `http://${hostname}/a~b#c~d?e~f`);
|
||||
await pollForLinkAtCell(3, 3, `http://${hostname}/colon:test`);
|
||||
await pollForLinkAtCell(3, 4, `http://${hostname}/colon:test`);
|
||||
await pollForLinkAtCell(2, 5, `http://${hostname}/`);
|
||||
await pollForLinkAtCell(2, 6, `http://${hostname}/`);
|
||||
await pollForLinkAtCell(1, 7, `http://${hostname}/subpath/+/id`);
|
||||
}
|
||||
|
||||
async function openTerminal(options: ITerminalOptions = {}): Promise<void> {
|
||||
@@ -82,8 +80,30 @@ async function openTerminal(options: ITerminalOptions = {}): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
async function getLinkAtCell(col: number, row: number): Promise<string> {
|
||||
async function pollForLinkAtCell(col: number, row: number, value: string): Promise<void> {
|
||||
const rowSelector = `.xterm-rows > :nth-child(${row})`;
|
||||
await page.hover(`${rowSelector} > :nth-child(${col})`);
|
||||
return await page.evaluate(`Array.prototype.reduce.call(document.querySelectorAll('${rowSelector} > span[style]'), (a, b) => a + b.textContent, '');`);
|
||||
// Ensure the hover element exists before trying to hover it
|
||||
await pollFor(page, `!!document.querySelector('${rowSelector} > :nth-child(${col})')`, true);
|
||||
await pollFor(page, `document.querySelectorAll('${rowSelector} > span[style]').length >= ${value.length}`, true, async () => page.hover(`${rowSelector} > :nth-child(${col})`));
|
||||
assert.equal(await page.evaluate(`Array.prototype.reduce.call(document.querySelectorAll('${rowSelector} > span[style]'), (a, b) => a + b.textContent, '');`), value);
|
||||
}
|
||||
|
||||
async function pollFor(page: puppeteer.Page, fn: string, val: any, preFn?: () => Promise<void>): Promise<void> {
|
||||
if (preFn) {
|
||||
await preFn();
|
||||
}
|
||||
const result = await page.evaluate(fn);
|
||||
if (result !== val) {
|
||||
return new Promise<void>(r => {
|
||||
setTimeout(() => r(pollFor(page, fn, val, preFn)), 10);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function writeSync(page: puppeteer.Page, data: string): Promise<void> {
|
||||
await page.evaluate(`
|
||||
window.ready = false;
|
||||
window.term.write('${data}', () => window.ready = true);
|
||||
`);
|
||||
await pollFor(page, 'window.ready', true);
|
||||
}
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
*/
|
||||
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import { assert } from 'chai';
|
||||
import { ITerminalOptions } from '../../../src/Types';
|
||||
import { ITheme } from 'xterm';
|
||||
import { assert } from 'chai';
|
||||
|
||||
const APP = 'http://127.0.0.1:3000/test';
|
||||
|
||||
@@ -16,8 +16,6 @@ const width = 800;
|
||||
const height = 600;
|
||||
|
||||
describe('WebGL Renderer Integration Tests', function(): void {
|
||||
this.timeout(20000);
|
||||
|
||||
it('dispose removes renderer canvases', async () => {
|
||||
await setupBrowser();
|
||||
assert.equal(await page.evaluate(`document.querySelectorAll('.xterm canvas').length`), 3);
|
||||
@@ -44,14 +42,14 @@ describe('WebGL Renderer Integration Tests', function(): void {
|
||||
};
|
||||
await page.evaluate(`window.term.setOption('theme', ${JSON.stringify(theme)});`);
|
||||
await writeSync(`\\x1b[30m█\\x1b[31m█\\x1b[32m█\\x1b[33m█\\x1b[34m█\\x1b[35m█\\x1b[36m█\\x1b[37m█`);
|
||||
assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
await pollFor(page, () => getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
await pollFor(page, () => getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
await pollFor(page, () => getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
await pollFor(page, () => getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
await pollFor(page, () => getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
await pollFor(page, () => getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
await pollFor(page, () => getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
await pollFor(page, () => getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
});
|
||||
|
||||
it('foreground colors bright', async () => {
|
||||
@@ -67,14 +65,14 @@ describe('WebGL Renderer Integration Tests', function(): void {
|
||||
};
|
||||
await page.evaluate(`window.term.setOption('theme', ${JSON.stringify(theme)});`);
|
||||
await writeSync(`\\x1b[90m█\\x1b[91m█\\x1b[92m█\\x1b[93m█\\x1b[94m█\\x1b[95m█\\x1b[96m█\\x1b[97m█`);
|
||||
assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
await pollFor(page, () => getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
await pollFor(page, () => getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
await pollFor(page, () => getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
await pollFor(page, () => getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
await pollFor(page, () => getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
await pollFor(page, () => getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
await pollFor(page, () => getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
await pollFor(page, () => getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
});
|
||||
|
||||
it('background colors normal', async () => {
|
||||
@@ -90,14 +88,14 @@ describe('WebGL Renderer Integration Tests', function(): void {
|
||||
};
|
||||
await page.evaluate(`window.term.setOption('theme', ${JSON.stringify(theme)});`);
|
||||
await writeSync(`\\x1b[40m \\x1b[41m \\x1b[42m \\x1b[43m \\x1b[44m \\x1b[45m \\x1b[46m \\x1b[47m `);
|
||||
assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
await pollFor(page, () => getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
await pollFor(page, () => getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
await pollFor(page, () => getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
await pollFor(page, () => getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
await pollFor(page, () => getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
await pollFor(page, () => getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
await pollFor(page, () => getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
await pollFor(page, () => getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
});
|
||||
|
||||
it('background colors bright', async () => {
|
||||
@@ -113,14 +111,14 @@ describe('WebGL Renderer Integration Tests', function(): void {
|
||||
};
|
||||
await page.evaluate(`window.term.setOption('theme', ${JSON.stringify(theme)});`);
|
||||
await writeSync(`\\x1b[100m \\x1b[101m \\x1b[102m \\x1b[103m \\x1b[104m \\x1b[105m \\x1b[106m \\x1b[107m `);
|
||||
assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
await pollFor(page, () => getCellColor(1, 1), [1, 2, 3, 255]);
|
||||
await pollFor(page, () => getCellColor(2, 1), [4, 5, 6, 255]);
|
||||
await pollFor(page, () => getCellColor(3, 1), [7, 8, 9, 255]);
|
||||
await pollFor(page, () => getCellColor(4, 1), [10, 11, 12, 255]);
|
||||
await pollFor(page, () => getCellColor(5, 1), [13, 14, 15, 255]);
|
||||
await pollFor(page, () => getCellColor(6, 1), [16, 17, 18, 255]);
|
||||
await pollFor(page, () => getCellColor(7, 1), [19, 20, 21, 255]);
|
||||
await pollFor(page, () => getCellColor(8, 1), [22, 23, 24, 255]);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -156,7 +154,6 @@ async function getCellColor(col: number, row: number): Promise<number[]> {
|
||||
async function setupBrowser(): Promise<void> {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
@@ -170,3 +167,21 @@ async function setupBrowser(): Promise<void> {
|
||||
window.term.loadAddon(window.addon);
|
||||
`);
|
||||
}
|
||||
|
||||
async function pollFor<T>(page: puppeteer.Page, evalOrFn: string | (() => Promise<T>), val: T, preFn?: () => Promise<void>): Promise<void> {
|
||||
if (preFn) {
|
||||
await preFn();
|
||||
}
|
||||
const result = typeof evalOrFn === 'string' ? await page.evaluate(evalOrFn) : await evalOrFn();
|
||||
let equal = false;
|
||||
if (typeof result === 'object') {
|
||||
equal = Object.keys(result).every(e => result[e] === (val as any)[e]);
|
||||
} else {
|
||||
equal = result === val;
|
||||
}
|
||||
if (!equal) {
|
||||
return new Promise<void>(r => {
|
||||
setTimeout(() => r(pollFor(page, evalOrFn, val, preFn)), 10);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/chai": "^3.4.34",
|
||||
"@types/deep-equal": "^1.0.1",
|
||||
"@types/glob": "^5.0.35",
|
||||
"@types/jsdom": "11.0.1",
|
||||
"@types/mocha": "^2.2.33",
|
||||
@@ -39,6 +40,7 @@
|
||||
"@types/webpack": "^4.4.11",
|
||||
"@types/ws": "^6.0.1",
|
||||
"chai": "3.5.0",
|
||||
"deep-equal": "^1.1.0",
|
||||
"express": "^4.17.1",
|
||||
"express-ws": "^4.0.0",
|
||||
"glob": "^7.0.5",
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
*/
|
||||
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import { assert } from 'chai';
|
||||
import { ITerminalOptions } from 'xterm';
|
||||
import { pollFor } from './TestUtils';
|
||||
|
||||
const APP = 'http://127.0.0.1:3000/test';
|
||||
|
||||
@@ -15,12 +15,9 @@ const width = 800;
|
||||
const height = 600;
|
||||
|
||||
describe('CharWidth Integration Tests', function(): void {
|
||||
this.timeout(20000);
|
||||
|
||||
before(async function(): Promise<any> {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
@@ -41,37 +38,37 @@ describe('CharWidth Integration Tests', function(): void {
|
||||
it('ASCII chars', async function(): Promise<void> {
|
||||
const input = 'This is just ASCII text.#';
|
||||
await page.evaluate(`window.term.write('${input}')`);
|
||||
assert.equal(25, await sumWidths(0, 1, '#'));
|
||||
await pollFor(page, () => sumWidths(0, 1, '#'), 25);
|
||||
});
|
||||
|
||||
it('combining chars', async function(): Promise<void> {
|
||||
const input = 'e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301#';
|
||||
await page.evaluate(`window.term.write('${input}')`);
|
||||
assert.equal(10, await sumWidths(0, 1, '#'));
|
||||
await pollFor(page, () => sumWidths(0, 1, '#'), 10);
|
||||
});
|
||||
|
||||
it('surrogate chars', async function(): Promise<void> {
|
||||
const input = '𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞#';
|
||||
await page.evaluate(`window.term.write('${input}')`);
|
||||
assert.equal(28, await sumWidths(0, 1, '#'));
|
||||
await pollFor(page, () => sumWidths(0, 1, '#'), 28);
|
||||
});
|
||||
|
||||
it('surrogate combining chars', async function(): Promise<void> {
|
||||
const input = '𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301#';
|
||||
await page.evaluate(`window.term.write('${input}')`);
|
||||
assert.equal(12, await sumWidths(0, 1, '#'));
|
||||
await pollFor(page, () => sumWidths(0, 1, '#'), 12);
|
||||
});
|
||||
|
||||
it('fullwidth chars', async function(): Promise<void> {
|
||||
const input = '1234567890#';
|
||||
await page.evaluate(`window.term.write('${input}')`);
|
||||
assert.equal(21, await sumWidths(0, 1, '#'));
|
||||
await pollFor(page, () => sumWidths(0, 1, '#'), 21);
|
||||
});
|
||||
|
||||
it('fullwidth chars offset 1', async function(): Promise<void> {
|
||||
const input = 'a1234567890#';
|
||||
await page.evaluate(`window.term.write('${input}')`);
|
||||
assert.equal(22, await sumWidths(0, 1, '#'));
|
||||
await pollFor(page, () => sumWidths(0, 1, '#'), 22);
|
||||
});
|
||||
|
||||
// TODO: multiline tests once #1685 is resolved
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import { assert } from 'chai';
|
||||
import { ITerminalOptions } from 'xterm';
|
||||
import { pollFor } from './TestUtils';
|
||||
|
||||
const APP = 'http://127.0.0.1:3000/test';
|
||||
|
||||
@@ -15,12 +16,9 @@ const width = 800;
|
||||
const height = 600;
|
||||
|
||||
describe('InputHandler Integration Tests', function(): void {
|
||||
this.timeout(20000);
|
||||
|
||||
before(async function(): Promise<any> {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
@@ -45,7 +43,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('bar\\x1b[3D\\x1b[4@')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(2), [' foo', ' bar']);
|
||||
await pollFor(page, () => getLinesAsArray(2), [' foo', ' bar']);
|
||||
});
|
||||
|
||||
it('CUU: Cursor Up Ps Times (default = 1) - CSI Ps A', async function(): Promise<any> {
|
||||
@@ -55,7 +53,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Ab')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(4), ['', ' b', '', 'a']);
|
||||
await pollFor(page, () => getLinesAsArray(4), ['', ' b', '', 'a']);
|
||||
});
|
||||
|
||||
it('CUD: Cursor Down Ps Times (default = 1) - CSI Ps B', async function(): Promise<any> {
|
||||
@@ -65,7 +63,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Bb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(4), ['', 'a', '', ' b']);
|
||||
await pollFor(page, () => getLinesAsArray(4), ['', 'a', '', ' b']);
|
||||
});
|
||||
|
||||
it('CUF: Cursor Forward Ps Times (default = 1) - CSI Ps C', async function(): Promise<any> {
|
||||
@@ -75,7 +73,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Cb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(1), [' a b']);
|
||||
await pollFor(page, () => getLinesAsArray(1), [' a b']);
|
||||
});
|
||||
|
||||
it('CUB: Cursor Backward Ps Times (default = 1) - CSI Ps D', async function(): Promise<any> {
|
||||
@@ -85,7 +83,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Db')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(1), ['fba']);
|
||||
await pollFor(page, () => getLinesAsArray(1), ['fba']);
|
||||
});
|
||||
|
||||
it('CNL: Cursor Next Line Ps Times (default = 1) - CSI Ps E', async function(): Promise<any> {
|
||||
@@ -95,7 +93,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Eb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(4), ['', 'a', '', 'b']);
|
||||
await pollFor(page, () => getLinesAsArray(4), ['', 'a', '', 'b']);
|
||||
});
|
||||
|
||||
it('CPL: Cursor Preceding Line Ps Times (default = 1) - CSI Ps F', async function(): Promise<any> {
|
||||
@@ -105,7 +103,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Fb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(5), ['', 'b', '', 'a', '']);
|
||||
await pollFor(page, () => getLinesAsArray(5), ['', 'b', '', 'a', '']);
|
||||
});
|
||||
|
||||
it('CHA: Cursor Character Absolute [column] (default = [row,1]) - CSI Ps G', async function(): Promise<any> {
|
||||
@@ -115,7 +113,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[10Gb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(1), ['aoo b']);
|
||||
await pollFor(page, () => getLinesAsArray(1), ['aoo b']);
|
||||
});
|
||||
|
||||
it('CUP: Cursor Position [row;column] (default = [1,1]) - CSI Ps ; Ps H', async function(): Promise<any> {
|
||||
@@ -125,7 +123,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[3;3Hb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['aoo', '', ' b']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['aoo', '', ' b']);
|
||||
});
|
||||
|
||||
it('CHT: Cursor Forward Tabulation Ps tab stops (default = 1) - CSI Ps I', async function(): Promise<any> {
|
||||
@@ -135,7 +133,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\\n\\r\x1b[2Ib')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(2), [' a', ' b']);
|
||||
await pollFor(page, () => getLinesAsArray(2), [' a', ' b']);
|
||||
});
|
||||
|
||||
it('ED: Erase in Display, VT100 - CSI Ps J', async function(): Promise<any> {
|
||||
@@ -145,26 +143,26 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
window.term.resize(5, 5);
|
||||
window.term.write('${fixture}\x1b[J')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await page.evaluate(`
|
||||
// 0: Erase Below
|
||||
window.term.reset()
|
||||
window.term.write('${fixture}\x1b[0J')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await page.evaluate(`
|
||||
// 1: Erase Above
|
||||
window.term.reset()
|
||||
window.term.write('${fixture}\x1b[1J')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['', ' f', 'ghi']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['', ' f', 'ghi']);
|
||||
await page.evaluate(`
|
||||
// 2: Erase Saved Lines (scrollback)
|
||||
window.term.reset()
|
||||
window.term.write('1\\n2\\n3\\n4\\n5${fixture}\x1b[3J')
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), 5);
|
||||
assert.deepEqual(await getLinesAsArray(5), [' 4', ' 5', 'abc', 'def', 'ghi']);
|
||||
await pollFor(page, () => page.evaluate(`window.term.buffer.length`), 5);
|
||||
await pollFor(page, () => getLinesAsArray(5), [' 4', ' 5', 'abc', 'def', 'ghi']);
|
||||
});
|
||||
|
||||
it('DECSED: Erase in Display, VT220 - CSI ? Ps J', async function(): Promise<any> {
|
||||
@@ -174,26 +172,26 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
window.term.resize(5, 5);
|
||||
window.term.write('${fixture}\x1b[?J')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await page.evaluate(`
|
||||
// 0: Erase Below
|
||||
window.term.reset()
|
||||
window.term.write('${fixture}\x1b[?0J')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
|
||||
await page.evaluate(`
|
||||
// 1: Erase Above
|
||||
window.term.reset()
|
||||
window.term.write('${fixture}\x1b[?1J')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['', ' f', 'ghi']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['', ' f', 'ghi']);
|
||||
await page.evaluate(`
|
||||
// 2: Erase Saved Lines (scrollback)
|
||||
window.term.reset()
|
||||
window.term.write('1\\n2\\n3\\n4\\n5${fixture}\x1b[?3J')
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), 5);
|
||||
assert.deepEqual(await getLinesAsArray(5), [' 4', ' 5', 'abc', 'def', 'ghi']);
|
||||
await pollFor(page, () => page.evaluate(`window.term.buffer.length`), 5);
|
||||
await pollFor(page, () => getLinesAsArray(5), [' 4', ' 5', 'abc', 'def', 'ghi']);
|
||||
});
|
||||
|
||||
it('IL: Insert Ps Line(s) (default = 1) - CSI Ps L', async function(): Promise<any> {
|
||||
@@ -203,7 +201,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[2Lb')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(4), ['b', '', 'a', 'foo']);
|
||||
await pollFor(page, () => getLinesAsArray(4), ['b', '', 'a', 'foo']);
|
||||
});
|
||||
|
||||
it('DL: Delete Ps Line(s) (default = 1) - CSI Ps M', async function(): Promise<any> {
|
||||
@@ -213,7 +211,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\x1b[1Ed\\ne\\nf\x1b[2F\x1b[2M')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(5), [' b', ' f', '', '', '']);
|
||||
await pollFor(page, () => getLinesAsArray(5), [' b', ' f', '', '', '']);
|
||||
});
|
||||
|
||||
it('DCH: Delete Ps Character(s) (default = 1) - CSI Ps P', async function(): Promise<any> {
|
||||
@@ -223,7 +221,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
// Explicit
|
||||
window.term.write('\\n\\rdef\x1b[2;1H\x1b[2P')
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(2), ['bc', 'f']);
|
||||
await pollFor(page, () => getLinesAsArray(2), ['bc', 'f']);
|
||||
});
|
||||
|
||||
describe('DSR: Device Status Report', () => {
|
||||
@@ -232,31 +230,31 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
window.term.onData(e => window.result = e);
|
||||
window.term.write('\\x1b[5n');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.result`), '\x1b[0n');
|
||||
await pollFor(page, () => page.evaluate(`window.result`), '\x1b[0n');
|
||||
});
|
||||
|
||||
it('Report Cursor Position (CPR) - CSI 6 n', async function(): Promise<any> {
|
||||
await page.evaluate(`window.term.write('\\n\\nfoo')`);
|
||||
assert.deepEqual(await page.evaluate(`
|
||||
await pollFor(page, () => page.evaluate(`
|
||||
[window.term.buffer.cursorY, window.term.buffer.cursorX]
|
||||
`), [2, 3]);
|
||||
await page.evaluate(`
|
||||
window.term.onData(e => window.result = e);
|
||||
window.term.write('\\x1b[6n');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.result`), '\x1b[3;4R');
|
||||
await pollFor(page, () => page.evaluate(`window.result`), '\x1b[3;4R');
|
||||
});
|
||||
|
||||
it('Report Cursor Position (DECXCPR) - CSI ? 6 n', async function(): Promise<any> {
|
||||
await page.evaluate(`window.term.write('\\n\\nfoo')`);
|
||||
assert.deepEqual(await page.evaluate(`
|
||||
await pollFor(page, () => page.evaluate(`
|
||||
[window.term.buffer.cursorY, window.term.buffer.cursorX]
|
||||
`), [2, 3]);
|
||||
await page.evaluate(`
|
||||
window.term.onData(e => window.result = e);
|
||||
window.term.write('\\x1b[?6n');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.result`), '\x1b[?3;4R');
|
||||
await pollFor(page, () => page.evaluate(`window.result`), '\x1b[?3;4R');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -277,22 +275,23 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
await page.mouse.up();
|
||||
// Clear selection
|
||||
await page.mouse.click((coords.left + coords.right) / 2, (coords.top + coords.bottom) / 2);
|
||||
assert.equal(await page.evaluate(`window.term.getSelection().length`), 0);
|
||||
await pollFor(page, () => page.evaluate(`window.term.getSelection().length`), 0);
|
||||
// Enable mouse events
|
||||
await page.evaluate(`window.term.write('\x1b[?1003h')`);
|
||||
// Click and drag and ensure there is no selection
|
||||
await page.mouse.click((coords.left + coords.right) / 2, (coords.top + coords.bottom) / 2);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move((coords.left + coords.right) / 2, (coords.top + coords.bottom) / 4);
|
||||
assert.equal(await page.evaluate(`window.term.getSelection().length`), 0, 'mouse events are on so there should be no selection');
|
||||
// mouse events are on so there should be no selection
|
||||
await pollFor(page, () => page.evaluate(`window.term.getSelection().length`), 0);
|
||||
await page.mouse.up();
|
||||
});
|
||||
it('Pm = 2004, Set bracketed paste mode', async function(): Promise<any> {
|
||||
assert.equal(await simulatePaste('foo'), 'foo');
|
||||
await pollFor(page, () => simulatePaste('foo'), 'foo');
|
||||
await page.evaluate(`window.term.write('\x1b[?2004h')`);
|
||||
assert.equal(await simulatePaste('bar'), '\x1b[200~bar\x1b[201~');
|
||||
await pollFor(page, () => simulatePaste('bar'), '\x1b[200~bar\x1b[201~');
|
||||
await page.evaluate(`window.term.write('\x1b[?2004l')`);
|
||||
assert.equal(await simulatePaste('baz'), 'baz');
|
||||
await pollFor(page, () => simulatePaste('baz'), 'baz');
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -309,32 +308,32 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
window.term.writeln('');
|
||||
window.term.write('#\x1b[5b');
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(4), ['##', '##', '##', '######']);
|
||||
assert.deepEqual(await getCursor(), {col: 6, row: 3});
|
||||
await pollFor(page, () => getLinesAsArray(4), ['##', '##', '##', '######']);
|
||||
await pollFor(page, () => getCursor(), {col: 6, row: 3});
|
||||
// should not repeat on fullwidth chars
|
||||
await page.evaluate(`
|
||||
window.term.reset();
|
||||
window.term.write('¥\x1b[10b');
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(1), ['¥']);
|
||||
await pollFor(page, () => getLinesAsArray(1), ['¥']);
|
||||
// should repeat only base char of combining
|
||||
await page.evaluate(`
|
||||
window.term.reset();
|
||||
window.term.write('e\u0301\x1b[5b');
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(1), ['e\u0301eeeee']);
|
||||
await pollFor(page, () => getLinesAsArray(1), ['e\u0301eeeee']);
|
||||
// should wrap correctly
|
||||
await page.evaluate(`
|
||||
window.term.reset();
|
||||
window.term.write('#\x1b[15b');
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(2), ['##########', '######']);
|
||||
await pollFor(page, () => getLinesAsArray(2), ['##########', '######']);
|
||||
await page.evaluate(`
|
||||
window.term.reset();
|
||||
window.term.write('\x1b[?7l'); // disable wrap around
|
||||
window.term.write('#\x1b[15b');
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(2), ['##########', '']);
|
||||
await pollFor(page, () => getLinesAsArray(2), ['##########', '']);
|
||||
// any successful sequence should reset REP
|
||||
await page.evaluate(`
|
||||
window.term.reset();
|
||||
@@ -344,7 +343,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
window.term.writeln('');
|
||||
window.term.write('abcdefg\x1b[3D\x1b[10b#\x1b[3b');
|
||||
`);
|
||||
assert.deepEqual(await getLinesAsArray(3), ['#', ' #', 'abcd####']);
|
||||
await pollFor(page, () => getLinesAsArray(3), ['#', ' #', 'abcd####']);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -360,7 +359,7 @@ describe('InputHandler Integration Tests', function(): void {
|
||||
window.term.resize(10, 4);
|
||||
window.term.write('\\x1b[?47l\\x1b8');
|
||||
`);
|
||||
assert.deepEqual(await getCursor(), {col: 1, row: 3});
|
||||
await pollFor(page, () => getCursor(), {col: 1, row: 3});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
+132
-137
@@ -4,8 +4,8 @@
|
||||
*/
|
||||
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import { assert } from 'chai';
|
||||
import { ITerminalOptions } from 'xterm';
|
||||
import { pollFor, writeSync } from './TestUtils';
|
||||
|
||||
const APP = 'http://127.0.0.1:3000/test';
|
||||
|
||||
@@ -198,22 +198,17 @@ function parseReport(encoding: string, msg: number[]): {state: any; row: number;
|
||||
/**
|
||||
* Mouse tracking tests.
|
||||
*/
|
||||
describe('Mouse Tracking Tests', function(): void {
|
||||
this.timeout(60000);
|
||||
|
||||
before(async function(): Promise<any> {
|
||||
describe('Mouse Tracking Tests', () => {
|
||||
before(async function(): Promise<void> {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
await page.setViewport({ width, height });
|
||||
});
|
||||
|
||||
after(() => {
|
||||
browser.close();
|
||||
});
|
||||
after(async () => browser.close());
|
||||
|
||||
beforeEach(async () => {
|
||||
await page.goto(APP);
|
||||
@@ -242,22 +237,22 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'DEFAULT';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?9h');`);
|
||||
await writeSync(page, '\x1b[?9h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// mouseup should not report
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
|
||||
// mousemove should not report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// test at max rows/cols
|
||||
// bug: we are capped at col 95 currently
|
||||
@@ -265,7 +260,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 95, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 95, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// button press/move/release tests
|
||||
// left button
|
||||
@@ -274,7 +269,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// middle button
|
||||
// bug: default action not cancelled (adds data to getReports from clipboard under X11)
|
||||
// await mouseMove(43, 24);
|
||||
@@ -282,7 +277,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
@@ -290,15 +285,15 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// wheel
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -310,7 +305,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
|
||||
// ALT
|
||||
@@ -322,7 +317,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// SHIFT
|
||||
// note: caught by selection manager
|
||||
@@ -337,9 +332,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
}
|
||||
@@ -358,34 +353,34 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
});
|
||||
it('SGR encoding', async () => {
|
||||
const encoding = 'SGR';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?9h\x1b[?1006h');`);
|
||||
await writeSync(page, '\x1b[?9h\x1b[?1006h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// mouseup should not report
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
|
||||
// mousemove should not report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// test at max rows/cols
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// button press/move/release tests
|
||||
// left button
|
||||
@@ -394,7 +389,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// middle button
|
||||
// bug: default action not cancelled (adds data to getReports from clipboard under X11)
|
||||
// await mouseMove(43, 24);
|
||||
@@ -402,7 +397,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
@@ -410,15 +405,15 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// wheel
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -430,7 +425,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
|
||||
// ALT
|
||||
@@ -442,7 +437,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// SHIFT
|
||||
// note: caught by selection manager
|
||||
@@ -455,9 +450,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
}
|
||||
@@ -476,7 +471,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
});
|
||||
});
|
||||
describe('DECSET 1000 (VT200 mouse)', () => {
|
||||
@@ -491,26 +486,26 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'DEFAULT';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?1000h');`);
|
||||
await writeSync(page, '\x1b[?1000h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mouseup should report, encoding cannot report released button
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mousemove should not report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 51, row: 11, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -521,7 +516,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 95, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 95, row: rows, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -533,7 +528,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -544,7 +539,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
@@ -552,7 +547,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -561,9 +556,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -575,7 +570,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
|
||||
@@ -590,7 +585,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
|
||||
@@ -608,11 +603,11 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
]);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
@@ -633,7 +628,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
|
||||
@@ -643,26 +638,26 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'SGR';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?1000h\x1b[?1006h');`);
|
||||
await writeSync(page, '\x1b[?1000h\x1b[?1006h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mouseup should report
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mousemove should not report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 51, row: 11, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -671,7 +666,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: cols, row: rows, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -683,7 +678,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -694,7 +689,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
@@ -702,7 +697,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'right', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -711,9 +706,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -725,7 +720,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
|
||||
@@ -740,7 +735,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
|
||||
@@ -757,11 +752,11 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
]);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
@@ -782,7 +777,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
|
||||
@@ -801,26 +796,26 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'DEFAULT';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?1002h');`);
|
||||
await writeSync(page, '\x1b[?1002h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mouseup should report, encoding cannot report released button
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mousemove should not report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 51, row: 11, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -831,7 +826,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 95, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 95, row: rows, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -843,7 +838,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
@@ -855,7 +850,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
@@ -863,7 +858,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
@@ -873,9 +868,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -887,7 +882,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
|
||||
@@ -903,7 +898,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
|
||||
@@ -921,11 +916,11 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
]);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
|
||||
@@ -947,7 +942,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
|
||||
@@ -958,27 +953,27 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'SGR';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?1002h\x1b[?1006h');`);
|
||||
await writeSync(page, '\x1b[?1002h\x1b[?1006h');
|
||||
|
||||
// test at 0,0
|
||||
// bug: release is fired immediately
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mouseup should report, encoding cannot report released button
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mousemove should not report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), []);
|
||||
await pollFor(page, () => getReports(encoding), []);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 51, row: 11, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -987,7 +982,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: cols, row: rows, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -999,7 +994,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
@@ -1011,7 +1006,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
@@ -1019,7 +1014,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'right', modifier: {control: false, shift: false, meta: false}}}
|
||||
@@ -1029,9 +1024,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -1043,7 +1038,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
@@ -1059,7 +1054,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
@@ -1077,11 +1072,11 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
]);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
@@ -1103,7 +1098,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
@@ -1120,28 +1115,28 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'DEFAULT';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?1003h');`);
|
||||
await writeSync(page, '\x1b[?1003h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mouseup should report, encoding cannot report released button
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mousemove should report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 51, row: 11, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -1152,7 +1147,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 95, row: rows, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 95, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 95, row: rows, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
@@ -1164,7 +1159,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
@@ -1177,14 +1172,14 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
@@ -1195,9 +1190,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -1208,7 +1203,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
@@ -1224,7 +1219,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
@@ -1242,12 +1237,12 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
]);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
@@ -1269,7 +1264,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
@@ -1281,28 +1276,28 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
const encoding = 'SGR';
|
||||
await resetMouseModes();
|
||||
await mouseMove(0, 0);
|
||||
await page.evaluate(`window.term.write('\x1b[?1003h\x1b[?1006h');`);
|
||||
await writeSync(page, '\x1b[?1003h\x1b[?1006h');
|
||||
|
||||
// test at 0,0
|
||||
await mouseDown('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mouseup should report, encoding cannot report released button
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 1, row: 1, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
|
||||
// mousemove should report
|
||||
await mouseMove(50, 10);
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 51, row: 11, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
]);
|
||||
@@ -1313,7 +1308,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(cols - 1, rows - 1);
|
||||
await mouseDown('left');
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: cols, row: rows, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: cols, row: rows, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
|
||||
@@ -1325,7 +1320,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseDown('left');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('left');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
|
||||
@@ -1338,14 +1333,14 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
// await mouseDown('middle');
|
||||
// await mouseMove(44, 24);
|
||||
// await mouseUp('middle');
|
||||
// assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'middle', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
// right button
|
||||
// bug: default action not cancelled (popup shown)
|
||||
await mouseMove(43, 24);
|
||||
await mouseDown('right');
|
||||
await mouseMove(44, 24);
|
||||
await mouseUp('right');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
|
||||
@@ -1356,9 +1351,9 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseMove(43, 24);
|
||||
await getReports(encoding); // clear reports
|
||||
await wheelUp();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await wheelDown();
|
||||
assert.deepEqual(await getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
|
||||
|
||||
// modifiers
|
||||
// CTRL
|
||||
@@ -1369,7 +1364,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Control');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
|
||||
@@ -1385,7 +1380,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await mouseUp('left');
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Alt');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
|
||||
@@ -1403,12 +1398,12 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await wheelDown();
|
||||
await page.keyboard.up('Shift');
|
||||
if (noShift) {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
|
||||
]);
|
||||
} else {
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
|
||||
@@ -1430,7 +1425,7 @@ describe('Mouse Tracking Tests', function(): void {
|
||||
await page.keyboard.up('Control');
|
||||
await page.keyboard.up('Alt');
|
||||
// await page.keyboard.up('Shift');
|
||||
assert.deepEqual(await getReports(encoding), [
|
||||
await pollFor(page, () => getReports(encoding), [
|
||||
{col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
{col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
|
||||
|
||||
+6
-18
@@ -6,6 +6,7 @@
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import { assert } from 'chai';
|
||||
import { ITerminalOptions } from 'xterm';
|
||||
import { writeSync } from './TestUtils';
|
||||
|
||||
const APP = 'http://127.0.0.1:3000/test';
|
||||
|
||||
@@ -15,12 +16,9 @@ const width = 800;
|
||||
const height = 600;
|
||||
|
||||
describe('Parser Integration Tests', function(): void {
|
||||
this.timeout(20000);
|
||||
|
||||
before(async function(): Promise<any> {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
@@ -29,9 +27,7 @@ describe('Parser Integration Tests', function(): void {
|
||||
await openTerminal();
|
||||
});
|
||||
|
||||
after(() => {
|
||||
browser.close();
|
||||
});
|
||||
after(async () => browser.close());
|
||||
|
||||
describe('addCsiHandler', () => {
|
||||
it('should call custom CSI handler with js array params', async () => {
|
||||
@@ -43,9 +39,7 @@ describe('Parser Integration Tests', function(): void {
|
||||
return false;
|
||||
}, '');
|
||||
`);
|
||||
await page.evaluate(`
|
||||
window.term.write('\x1b[38;5;123mparams\x1b[38:2::50:100:150msubparams');
|
||||
`);
|
||||
await writeSync(page, '\x1b[38;5;123mparams\x1b[38:2::50:100:150msubparams');
|
||||
assert.deepEqual(await page.evaluate(`(() => _customCsiHandlerParams)();`), [[38, 5, 123], [38, [2, -1, 50, 100, 150]]]);
|
||||
});
|
||||
});
|
||||
@@ -67,9 +61,7 @@ describe('Parser Integration Tests', function(): void {
|
||||
return false;
|
||||
});
|
||||
`);
|
||||
await page.evaluate(`
|
||||
window.term.write('\x1bP1;2+psome data\x1b\\\\');
|
||||
`);
|
||||
await writeSync(page, '\x1bP1;2+psome data\x1b\\\\');
|
||||
assert.deepEqual(await page.evaluate(`(() => _customDcsHandlerCallStack)();`), [['C', [1, 2], 'some data'], ['B', [1, 2], 'some data']]);
|
||||
});
|
||||
});
|
||||
@@ -91,9 +83,7 @@ describe('Parser Integration Tests', function(): void {
|
||||
return false;
|
||||
});
|
||||
`);
|
||||
await page.evaluate(`
|
||||
window.term.write('\x1b(B');
|
||||
`);
|
||||
await writeSync(page, '\x1b(B');
|
||||
assert.deepEqual(await page.evaluate(`(() => _customEscHandlerCallStack)();`), ['C', 'B']);
|
||||
});
|
||||
});
|
||||
@@ -115,9 +105,7 @@ describe('Parser Integration Tests', function(): void {
|
||||
return false;
|
||||
});
|
||||
`);
|
||||
await page.evaluate(`
|
||||
window.term.write('\x1b]1234;some data\x07');
|
||||
`);
|
||||
await writeSync(page, '\x1b]1234;some data\x07');
|
||||
assert.deepEqual(await page.evaluate(`(() => _customOscHandlerCallStack)();`), [['C', 'some data'], ['B', 'some data']]);
|
||||
});
|
||||
});
|
||||
|
||||
+107
-108
@@ -6,6 +6,7 @@
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import { assert } from 'chai';
|
||||
import { ITerminalOptions } from 'xterm';
|
||||
import { pollFor, timeout, writeSync } from './TestUtils';
|
||||
|
||||
const APP = 'http://127.0.0.1:3000/test';
|
||||
|
||||
@@ -15,54 +16,46 @@ const width = 800;
|
||||
const height = 600;
|
||||
|
||||
describe('API Integration Tests', function(): void {
|
||||
this.timeout(20000);
|
||||
|
||||
before(async function(): Promise<any> {
|
||||
before(async () => {
|
||||
browser = await puppeteer.launch({
|
||||
headless: process.argv.indexOf('--headless') !== -1,
|
||||
slowMo: 80,
|
||||
args: [`--window-size=${width},${height}`, `--no-sandbox`]
|
||||
});
|
||||
page = (await browser.pages())[0];
|
||||
await page.setViewport({ width, height });
|
||||
});
|
||||
|
||||
after(() => {
|
||||
browser.close();
|
||||
});
|
||||
after(async () => browser.close());
|
||||
beforeEach(async () => page.goto(APP));
|
||||
|
||||
beforeEach(async () => {
|
||||
await page.goto(APP);
|
||||
});
|
||||
|
||||
it('Default options', async function(): Promise<any> {
|
||||
it('Default options', async () => {
|
||||
await openTerminal();
|
||||
assert.equal(await page.evaluate(`window.term.cols`), 80);
|
||||
assert.equal(await page.evaluate(`window.term.rows`), 24);
|
||||
});
|
||||
|
||||
it('write', async function(): Promise<any> {
|
||||
it('write', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.term.write('foo');
|
||||
window.term.write('bar');
|
||||
window.term.write('文');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foobar文');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foobar文');
|
||||
});
|
||||
|
||||
it('write with callback', async function(): Promise<any> {
|
||||
it('write with callback', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.term.write('foo', () => { window.__x = 'a'; });
|
||||
window.term.write('bar', () => { window.__x += 'b'; });
|
||||
window.term.write('文', () => { window.__x += 'c'; });
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foobar文');
|
||||
assert.equal(await page.evaluate(`window.__x`), 'abc');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foobar文');
|
||||
await pollFor(page, `window.__x`, 'abc');
|
||||
});
|
||||
|
||||
it('write - bytes (UTF8)', async function(): Promise<any> {
|
||||
it('write - bytes (UTF8)', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
// foo
|
||||
@@ -72,10 +65,10 @@ describe('API Integration Tests', function(): void {
|
||||
// 文
|
||||
window.term.write(new Uint8Array([230, 150, 135]));
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foobar文');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foobar文');
|
||||
});
|
||||
|
||||
it('write - bytes (UTF8) with callback', async function(): Promise<any> {
|
||||
it('write - bytes (UTF8) with callback', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
// foo
|
||||
@@ -85,48 +78,48 @@ describe('API Integration Tests', function(): void {
|
||||
// 文
|
||||
window.term.write(new Uint8Array([230, 150, 135]), () => { window.__x += 'C'; });
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foobar文');
|
||||
assert.equal(await page.evaluate(`window.__x`), 'ABC');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foobar文');
|
||||
await pollFor(page, `window.__x`, 'ABC');
|
||||
});
|
||||
|
||||
it('writeln', async function(): Promise<any> {
|
||||
it('writeln', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.term.writeln('foo');
|
||||
window.term.writeln('bar');
|
||||
window.term.writeln('文');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foo');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).translateToString(true)`), 'bar');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(2).translateToString(true)`), '文');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foo');
|
||||
await pollFor(page, `window.term.buffer.getLine(1).translateToString(true)`, 'bar');
|
||||
await pollFor(page, `window.term.buffer.getLine(2).translateToString(true)`, '文');
|
||||
});
|
||||
|
||||
it('writeln with callback', async function(): Promise<any> {
|
||||
it('writeln with callback', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.term.writeln('foo', () => { window.__x = '1'; });
|
||||
window.term.writeln('bar', () => { window.__x += '2'; });
|
||||
window.term.writeln('文', () => { window.__x += '3'; });
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foo');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).translateToString(true)`), 'bar');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(2).translateToString(true)`), '文');
|
||||
assert.equal(await page.evaluate(`window.__x`), '123');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foo');
|
||||
await pollFor(page, `window.term.buffer.getLine(1).translateToString(true)`, 'bar');
|
||||
await pollFor(page, `window.term.buffer.getLine(2).translateToString(true)`, '文');
|
||||
await pollFor(page, `window.__x`, '123');
|
||||
});
|
||||
|
||||
it('writeln - bytes (UTF8)', async function(): Promise<any> {
|
||||
it('writeln - bytes (UTF8)', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.term.writeln(new Uint8Array([102, 111, 111]));
|
||||
window.term.writeln(new Uint8Array([98, 97, 114]));
|
||||
window.term.writeln(new Uint8Array([230, 150, 135]));
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foo');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).translateToString(true)`), 'bar');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(2).translateToString(true)`), '文');
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'foo');
|
||||
await pollFor(page, `window.term.buffer.getLine(1).translateToString(true)`, 'bar');
|
||||
await pollFor(page, `window.term.buffer.getLine(2).translateToString(true)`, '文');
|
||||
});
|
||||
|
||||
it('paste', async function(): Promise<any> {
|
||||
it('paste', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
@@ -137,26 +130,28 @@ describe('API Integration Tests', function(): void {
|
||||
window.term.paste('foo');
|
||||
});
|
||||
`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), ['foo', '\rfoo\rbar\r', '\x1b[200~foo\x1b[201~']);
|
||||
await pollFor(page, `window.calls`, ['foo', '\rfoo\rbar\r', '\x1b[200~foo\x1b[201~']);
|
||||
});
|
||||
|
||||
it('clear', async function(): Promise<any> {
|
||||
it('clear', async () => {
|
||||
await openTerminal({ rows: 5 });
|
||||
await page.evaluate(`
|
||||
window.term.write('test0');
|
||||
window.parsed = 0;
|
||||
for (let i = 1; i < 10; i++) {
|
||||
window.term.write('\\n\\rtest' + i);
|
||||
window.term.write('\\n\\rtest' + i, () => window.parsed++);
|
||||
}
|
||||
`);
|
||||
await pollFor(page, `window.parsed`, 9);
|
||||
await page.evaluate(`window.term.clear()`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), '5');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'test9');
|
||||
await pollFor(page, `window.term.buffer.length`, 5);
|
||||
await pollFor(page, `window.term.buffer.getLine(0).translateToString(true)`, 'test9');
|
||||
for (let i = 1; i < 5; i++) {
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(${i}).translateToString(true)`), '');
|
||||
await pollFor(page, `window.term.buffer.getLine(${i}).translateToString(true)`, '');
|
||||
}
|
||||
});
|
||||
|
||||
it('getOption, setOption', async function(): Promise<any> {
|
||||
it('getOption, setOption', async () => {
|
||||
await openTerminal();
|
||||
assert.equal(await page.evaluate(`window.term.getOption('rendererType')`), 'canvas');
|
||||
await page.evaluate(`window.term.setOption('rendererType', 'dom')`);
|
||||
@@ -164,9 +159,10 @@ describe('API Integration Tests', function(): void {
|
||||
});
|
||||
|
||||
describe('renderer', () => {
|
||||
it('foreground', async function(): Promise<any> {
|
||||
it('foreground', async () => {
|
||||
await openTerminal({ rendererType: 'dom' });
|
||||
await page.evaluate(`window.term.write('\\x1b[30m0\\x1b[31m1\\x1b[32m2\\x1b[33m3\\x1b[34m4\\x1b[35m5\\x1b[36m6\\x1b[37m7')`);
|
||||
await writeSync(page, '\\x1b[30m0\\x1b[31m1\\x1b[32m2\\x1b[33m3\\x1b[34m4\\x1b[35m5\\x1b[36m6\\x1b[37m7');
|
||||
await pollFor(page, `document.querySelectorAll('.xterm-rows > :nth-child(1) > *').length`, 9);
|
||||
assert.deepEqual(await page.evaluate(`
|
||||
[
|
||||
document.querySelector('.xterm-rows > :nth-child(1) > :nth-child(1)').className,
|
||||
@@ -188,9 +184,10 @@ describe('API Integration Tests', function(): void {
|
||||
]);
|
||||
});
|
||||
|
||||
it('background', async function(): Promise<any> {
|
||||
it('background', async () => {
|
||||
await openTerminal({ rendererType: 'dom' });
|
||||
await page.evaluate(`window.term.write('\\x1b[40m0\\x1b[41m1\\x1b[42m2\\x1b[43m3\\x1b[44m4\\x1b[45m5\\x1b[46m6\\x1b[47m7')`);
|
||||
await writeSync(page, '\\x1b[40m0\\x1b[41m1\\x1b[42m2\\x1b[43m3\\x1b[44m4\\x1b[45m5\\x1b[46m6\\x1b[47m7');
|
||||
await pollFor(page, `document.querySelectorAll('.xterm-rows > :nth-child(1) > *').length`, 9);
|
||||
assert.deepEqual(await page.evaluate(`
|
||||
[
|
||||
document.querySelector('.xterm-rows > :nth-child(1) > :nth-child(1)').className,
|
||||
@@ -213,7 +210,7 @@ describe('API Integration Tests', function(): void {
|
||||
});
|
||||
});
|
||||
|
||||
it('selection', async function(): Promise<any> {
|
||||
it('selection', async () => {
|
||||
await openTerminal({ rows: 5, cols: 5 });
|
||||
await page.evaluate(`window.term.write('\\n\\nfoo\\n\\n\\rbar\\n\\n\\rbaz')`);
|
||||
assert.equal(await page.evaluate(`window.term.hasSelection()`), false);
|
||||
@@ -233,7 +230,7 @@ describe('API Integration Tests', function(): void {
|
||||
assert.deepEqual(await page.evaluate(`window.term.getSelectionPosition()`), { startColumn: 1, startRow: 2, endColumn: 3, endRow: 2 });
|
||||
});
|
||||
|
||||
it('focus, blur', async function(): Promise<any> {
|
||||
it('focus, blur', async () => {
|
||||
await openTerminal();
|
||||
assert.equal(await page.evaluate(`document.activeElement.className`), '');
|
||||
await page.evaluate(`window.term.focus()`);
|
||||
@@ -243,7 +240,7 @@ describe('API Integration Tests', function(): void {
|
||||
});
|
||||
|
||||
describe('loadAddon', () => {
|
||||
it('constructor', async function(): Promise<any> {
|
||||
it('constructor', async () => {
|
||||
await openTerminal({ cols: 5 });
|
||||
await page.evaluate(`
|
||||
window.cols = 0;
|
||||
@@ -255,7 +252,7 @@ describe('API Integration Tests', function(): void {
|
||||
assert.equal(await page.evaluate(`window.cols`), 5);
|
||||
});
|
||||
|
||||
it('dispose (addon)', async function(): Promise<any> {
|
||||
it('dispose (addon)', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.disposeCalled = false
|
||||
@@ -270,7 +267,7 @@ describe('API Integration Tests', function(): void {
|
||||
assert.equal(await page.evaluate(`window.disposeCalled`), true);
|
||||
});
|
||||
|
||||
it('dispose (terminal)', async function(): Promise<any> {
|
||||
it('dispose (terminal)', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.disposeCalled = false
|
||||
@@ -286,19 +283,19 @@ describe('API Integration Tests', function(): void {
|
||||
});
|
||||
|
||||
describe('Events', () => {
|
||||
it('onCursorMove', async function(): Promise<any> {
|
||||
it('onCursorMove', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.callCount = 0;
|
||||
window.term.onCursorMove(e => window.callCount++);
|
||||
window.term.write('foo');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 1);
|
||||
await pollFor(page, `window.callCount`, 1);
|
||||
await page.evaluate(`window.term.write('bar')`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 2);
|
||||
await pollFor(page, `window.callCount`, 2);
|
||||
});
|
||||
|
||||
it('onData', async function(): Promise<any> {
|
||||
it('onData', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
@@ -308,7 +305,7 @@ describe('API Integration Tests', function(): void {
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), ['f', 'o', 'o']);
|
||||
});
|
||||
|
||||
it('onKey', async function(): Promise<any> {
|
||||
it('onKey', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
@@ -318,19 +315,19 @@ describe('API Integration Tests', function(): void {
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), ['f', 'o', 'o']);
|
||||
});
|
||||
|
||||
it('onLineFeed', async function(): Promise<any> {
|
||||
it('onLineFeed', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.callCount = 0;
|
||||
window.term.onLineFeed(() => callCount++);
|
||||
window.term.writeln('foo');
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 1);
|
||||
await pollFor(page, `window.callCount`, 1);
|
||||
await page.evaluate(`window.term.writeln('bar')`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 2);
|
||||
await pollFor(page, `window.callCount`, 2);
|
||||
});
|
||||
|
||||
it('onScroll', async function(): Promise<any> {
|
||||
it('onScroll', async () => {
|
||||
await openTerminal({ rows: 5 });
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
@@ -339,94 +336,96 @@ describe('API Integration Tests', function(): void {
|
||||
window.term.writeln('foo');
|
||||
}
|
||||
`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), []);
|
||||
await pollFor(page, `window.calls`, []);
|
||||
await page.evaluate(`window.term.writeln('bar')`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), [1]);
|
||||
await pollFor(page, `window.calls`, [1]);
|
||||
await page.evaluate(`window.term.writeln('baz')`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), [1, 2]);
|
||||
await pollFor(page, `window.calls`, [1, 2]);
|
||||
});
|
||||
|
||||
it('onSelectionChange', async function(): Promise<any> {
|
||||
it('onSelectionChange', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.callCount = 0;
|
||||
window.term.onSelectionChange(() => window.callCount++);
|
||||
`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 0);
|
||||
await pollFor(page, `window.callCount`, 0);
|
||||
await page.evaluate(`window.term.selectAll()`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 1);
|
||||
await pollFor(page, `window.callCount`, 1);
|
||||
await page.evaluate(`window.term.clearSelection()`);
|
||||
assert.equal(await page.evaluate(`window.callCount`), 2);
|
||||
await pollFor(page, `window.callCount`, 2);
|
||||
});
|
||||
|
||||
it('onRender', async function(): Promise<any> {
|
||||
it('onRender', async () => {
|
||||
await openTerminal();
|
||||
await timeout(20); // Ensure all init events are fired
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
window.term.onRender(e => window.calls.push([e.start, e.end]));
|
||||
`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), []);
|
||||
await pollFor(page, `window.calls`, []);
|
||||
await page.evaluate(`window.term.write('foo')`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), [[0, 0]]);
|
||||
await pollFor(page, `window.calls`, [[0, 0]]);
|
||||
await page.evaluate(`window.term.write('bar\\n\\nbaz')`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), [[0, 0], [0, 2]]);
|
||||
await pollFor(page, `window.calls`, [[0, 0], [0, 2]]);
|
||||
});
|
||||
|
||||
it('onResize', async function(): Promise<any> {
|
||||
it('onResize', async () => {
|
||||
await openTerminal();
|
||||
await timeout(20); // Ensure all init events are fired
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
window.term.onResize(e => window.calls.push([e.cols, e.rows]));
|
||||
`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), []);
|
||||
await pollFor(page, `window.calls`, []);
|
||||
await page.evaluate(`window.term.resize(10, 5)`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), [[10, 5]]);
|
||||
await pollFor(page, `window.calls`, [[10, 5]]);
|
||||
await page.evaluate(`window.term.resize(20, 15)`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), [[10, 5], [20, 15]]);
|
||||
await pollFor(page, `window.calls`, [[10, 5], [20, 15]]);
|
||||
});
|
||||
|
||||
it('onTitleChange', async function(): Promise<any> {
|
||||
it('onTitleChange', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`
|
||||
window.calls = [];
|
||||
window.term.onTitleChange(e => window.calls.push(e));
|
||||
`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), []);
|
||||
await pollFor(page, `window.calls`, []);
|
||||
await page.evaluate(`window.term.write('\\x1b]2;foo\\x9c')`);
|
||||
assert.deepEqual(await page.evaluate(`window.calls`), ['foo']);
|
||||
await pollFor(page, `window.calls`, ['foo']);
|
||||
});
|
||||
});
|
||||
|
||||
describe('buffer', () => {
|
||||
it('cursorX, cursorY', async function(): Promise<any> {
|
||||
it('cursorX, cursorY', async () => {
|
||||
await openTerminal({ rows: 5, cols: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorX`), 0);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorY`), 0);
|
||||
await page.evaluate(`window.term.write('foo')`);
|
||||
await writeSync(page, 'foo');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorX`), 3);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorY`), 0);
|
||||
await page.evaluate(`window.term.write('\\n')`);
|
||||
await writeSync(page, '\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorX`), 3);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorY`), 1);
|
||||
await page.evaluate(`window.term.write('\\r')`);
|
||||
await writeSync(page, '\\r');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorX`), 0);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorY`), 1);
|
||||
await page.evaluate(`window.term.write('abcde')`);
|
||||
await writeSync(page, 'abcde');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorX`), 5);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorY`), 1);
|
||||
await page.evaluate(`window.term.write('\\n\\r\\n\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\r\\n\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorX`), 0);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.cursorY`), 4);
|
||||
});
|
||||
|
||||
it('viewportY', async function(): Promise<any> {
|
||||
it('viewportY', async () => {
|
||||
await openTerminal({ rows: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.viewportY`), 0);
|
||||
await page.evaluate(`window.term.write('\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.viewportY`), 0);
|
||||
await page.evaluate(`window.term.write('\\n')`);
|
||||
await writeSync(page, '\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.viewportY`), 1);
|
||||
await page.evaluate(`window.term.write('\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.viewportY`), 5);
|
||||
await page.evaluate(`window.term.scrollLines(-1)`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.viewportY`), 4);
|
||||
@@ -434,14 +433,14 @@ describe('API Integration Tests', function(): void {
|
||||
assert.equal(await page.evaluate(`window.term.buffer.viewportY`), 0);
|
||||
});
|
||||
|
||||
it('baseY', async function(): Promise<any> {
|
||||
it('baseY', async () => {
|
||||
await openTerminal({ rows: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.baseY`), 0);
|
||||
await page.evaluate(`window.term.write('\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.baseY`), 0);
|
||||
await page.evaluate(`window.term.write('\\n')`);
|
||||
await writeSync(page, '\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.baseY`), 1);
|
||||
await page.evaluate(`window.term.write('\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.baseY`), 5);
|
||||
await page.evaluate(`window.term.scrollLines(-1)`);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.baseY`), 5);
|
||||
@@ -449,44 +448,44 @@ describe('API Integration Tests', function(): void {
|
||||
assert.equal(await page.evaluate(`window.term.buffer.baseY`), 5);
|
||||
});
|
||||
|
||||
it('length', async function(): Promise<any> {
|
||||
it('length', async () => {
|
||||
await openTerminal({ rows: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), 5);
|
||||
await page.evaluate(`window.term.write('\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), 5);
|
||||
await page.evaluate(`window.term.write('\\n')`);
|
||||
await writeSync(page, '\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), 6);
|
||||
await page.evaluate(`window.term.write('\\n\\n\\n\\n')`);
|
||||
await writeSync(page, '\\n\\n\\n\\n');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.length`), 10);
|
||||
});
|
||||
|
||||
describe('getLine', () => {
|
||||
it('invalid index', async function(): Promise<any> {
|
||||
it('invalid index', async () => {
|
||||
await openTerminal({ rows: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(-1)`), undefined);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(5)`), undefined);
|
||||
});
|
||||
|
||||
it('isWrapped', async function(): Promise<any> {
|
||||
it('isWrapped', async () => {
|
||||
await openTerminal({ cols: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).isWrapped`), false);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).isWrapped`), false);
|
||||
await page.evaluate(`window.term.write('abcde')`);
|
||||
await writeSync(page, 'abcde');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).isWrapped`), false);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).isWrapped`), false);
|
||||
await page.evaluate(`window.term.write('f')`);
|
||||
await writeSync(page, 'f');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).isWrapped`), false);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).isWrapped`), true);
|
||||
});
|
||||
|
||||
it('translateToString', async function(): Promise<any> {
|
||||
it('translateToString', async () => {
|
||||
await openTerminal({ cols: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString()`), ' ');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), '');
|
||||
await page.evaluate(`window.term.write('foo')`);
|
||||
await writeSync(page, 'foo');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString()`), 'foo ');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'foo');
|
||||
await page.evaluate(`window.term.write('bar')`);
|
||||
await writeSync(page, 'bar');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString()`), 'fooba');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(true)`), 'fooba');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(1).translateToString(true)`), 'r');
|
||||
@@ -494,13 +493,13 @@ describe('API Integration Tests', function(): void {
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).translateToString(false, 1, 3)`), 'oo');
|
||||
});
|
||||
|
||||
it('getCell', async function(): Promise<any> {
|
||||
it('getCell', async () => {
|
||||
await openTerminal({ cols: 5 });
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(-1)`), undefined);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(5)`), undefined);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(0).char`), '');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(0).width`), 1);
|
||||
await page.evaluate(`window.term.write('a文')`);
|
||||
await writeSync(page, 'a文');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(0).char`), 'a');
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(0).width`), 1);
|
||||
assert.equal(await page.evaluate(`window.term.buffer.getLine(0).getCell(1).char`), '文');
|
||||
@@ -511,7 +510,7 @@ describe('API Integration Tests', function(): void {
|
||||
});
|
||||
});
|
||||
|
||||
it('dispose', async function(): Promise<any> {
|
||||
it('dispose', async () => {
|
||||
await page.evaluate(`
|
||||
window.term = new Terminal();
|
||||
window.term.dispose();
|
||||
@@ -519,7 +518,7 @@ describe('API Integration Tests', function(): void {
|
||||
assert.equal(await page.evaluate(`window.term._core._isDisposed`), true);
|
||||
});
|
||||
|
||||
it('dispose (opened)', async function(): Promise<any> {
|
||||
it('dispose (opened)', async () => {
|
||||
await openTerminal();
|
||||
await page.evaluate(`window.term.dispose()`);
|
||||
assert.equal(await page.evaluate(`window.term._core._isDisposed`), true);
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
/**
|
||||
* Copyright (c) 2019 The xterm.js authors. All rights reserved.
|
||||
* @license MIT
|
||||
*/
|
||||
|
||||
import * as puppeteer from 'puppeteer';
|
||||
import deepEqual = require('deep-equal');
|
||||
|
||||
export async function pollFor<T>(page: puppeteer.Page, evalOrFn: string | (() => Promise<T>), val: T, preFn?: () => Promise<void>): Promise<void> {
|
||||
if (preFn) {
|
||||
await preFn();
|
||||
}
|
||||
const result = typeof evalOrFn === 'string' ? await page.evaluate(evalOrFn) : await evalOrFn();
|
||||
if (!deepEqual(result, val)) {
|
||||
return new Promise<void>(r => {
|
||||
setTimeout(() => r(pollFor(page, evalOrFn, val, preFn)), 1);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export async function writeSync(page: puppeteer.Page, data: string): Promise<void> {
|
||||
await page.evaluate(`
|
||||
window.ready = false;
|
||||
window.term.write('${data}', () => window.ready = true);
|
||||
`);
|
||||
await pollFor(page, 'window.ready', true);
|
||||
}
|
||||
|
||||
export async function timeout(ms: number): Promise<void> {
|
||||
return new Promise<void>(r => setTimeout(r, ms));
|
||||
}
|
||||
@@ -130,6 +130,11 @@
|
||||
resolved "https://registry.yarnpkg.com/@types/cli-table/-/cli-table-0.3.0.tgz#f1857156bf5fd115c6a2db260ba0be1f8fc5671c"
|
||||
integrity sha512-QnZUISJJXyhyD6L1e5QwXDV/A5i2W1/gl6D6YMc8u0ncPepbv/B4w3S+izVvtAg60m6h+JP09+Y/0zF2mojlFQ==
|
||||
|
||||
"@types/deep-equal@^1.0.1":
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
|
||||
integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
|
||||
|
||||
"@types/events@*":
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
|
||||
@@ -1454,6 +1459,18 @@ deep-eql@^0.1.3:
|
||||
dependencies:
|
||||
type-detect "0.1.1"
|
||||
|
||||
deep-equal@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"
|
||||
integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==
|
||||
dependencies:
|
||||
is-arguments "^1.0.4"
|
||||
is-date-object "^1.0.1"
|
||||
is-regex "^1.0.4"
|
||||
object-is "^1.0.1"
|
||||
object-keys "^1.1.1"
|
||||
regexp.prototype.flags "^1.2.0"
|
||||
|
||||
deep-extend@^0.6.0:
|
||||
version "0.6.0"
|
||||
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
|
||||
@@ -2567,6 +2584,11 @@ is-accessor-descriptor@^1.0.0:
|
||||
dependencies:
|
||||
kind-of "^6.0.0"
|
||||
|
||||
is-arguments@^1.0.4:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
|
||||
integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
|
||||
|
||||
is-arrayish@^0.2.1:
|
||||
version "0.2.1"
|
||||
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
|
||||
@@ -3634,7 +3656,12 @@ object-copy@^0.1.0:
|
||||
define-property "^0.2.5"
|
||||
kind-of "^3.0.3"
|
||||
|
||||
object-keys@^1.0.11, object-keys@^1.0.12:
|
||||
object-is@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
|
||||
integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
|
||||
|
||||
object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
|
||||
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
|
||||
@@ -4238,6 +4265,13 @@ regex-not@^1.0.0, regex-not@^1.0.2:
|
||||
extend-shallow "^3.0.2"
|
||||
safe-regex "^1.1.0"
|
||||
|
||||
regexp.prototype.flags@^1.2.0:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
|
||||
integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==
|
||||
dependencies:
|
||||
define-properties "^1.1.2"
|
||||
|
||||
release-zalgo@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
|
||||
|
||||
Reference in New Issue
Block a user