Fix tests that depended on canvas renderer

This commit is contained in:
Daniel Imms
2022-07-27 10:33:10 -07:00
parent 1c6ce99419
commit 48cfd23219
3 changed files with 8 additions and 14 deletions
+4 -4
View File
@@ -48,7 +48,7 @@ describe('FitAddon', () => {
it('default', async function(): Promise<any> {
await loadFit();
const dimensions: {cols: number, rows: number} = await page.evaluate(`window.fit.proposeDimensions()`);
assert.equal(dimensions.cols, 87);
assert.equal(dimensions.cols, 86);
assert.isAbove(dimensions.rows, 24);
assert.isBelow(dimensions.rows, 29);
});
@@ -56,7 +56,7 @@ describe('FitAddon', () => {
it('width', async function(): Promise<any> {
await loadFit(1008);
const dimensions: {cols: number, rows: number} = await page.evaluate(`window.fit.proposeDimensions()`);
assert.equal(dimensions.cols, 110);
assert.equal(dimensions.cols, 109);
assert.isAbove(dimensions.rows, 24);
assert.isBelow(dimensions.rows, 29);
});
@@ -89,7 +89,7 @@ describe('FitAddon', () => {
await page.evaluate(`window.fit.fit()`);
const cols: number = await page.evaluate(`window.term.cols`);
const rows: number = await page.evaluate(`window.term.rows`);
assert.equal(cols, 87);
assert.equal(cols, 86);
assert.isAbove(rows, 24);
assert.isBelow(rows, 29);
});
@@ -99,7 +99,7 @@ describe('FitAddon', () => {
await page.evaluate(`window.fit.fit()`);
const cols: number = await page.evaluate(`window.term.cols`);
const rows: number = await page.evaluate(`window.term.rows`);
assert.equal(cols, 110);
assert.equal(cols, 109);
assert.isAbove(rows, 24);
assert.isBelow(rows, 29);
});
+3 -9
View File
@@ -726,9 +726,7 @@ describe('API Integration Tests', function(): void {
describe('registerDecoration', () => {
describe('bufferDecorations', () => {
it('should register decorations and render them when terminal open is called', async () => {
await page.evaluate(`window.term = new Terminal({ allowProposedApi: true })`);
await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
await page.waitForSelector('.xterm-text-layer');
await openTerminal(page);
await page.evaluate(`window.marker1 = window.term.registerMarker(1)`);
await page.evaluate(`window.marker2 = window.term.registerMarker(2)`);
await page.evaluate(`window.term.registerDecoration({ marker: window.marker1 })`);
@@ -757,9 +755,7 @@ describe('API Integration Tests', function(): void {
});
describe('overviewRulerDecorations', () => {
it('should not add an overview ruler when width is not set', async () => {
await page.evaluate(`window.term = new Terminal({ allowProposedApi: true })`);
await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
await page.waitForSelector('.xterm-text-layer');
await openTerminal(page);
await page.evaluate(`window.marker1 = window.term.registerMarker(1)`);
await page.evaluate(`window.marker2 = window.term.registerMarker(2)`);
await page.evaluate(`window.term.registerDecoration({ marker: window.marker1, overviewRulerOptions: { color: 'red', position: 'full' } })`);
@@ -768,9 +764,7 @@ describe('API Integration Tests', function(): void {
await pollFor(page, `document.querySelectorAll('.xterm-decoration-overview-ruler').length`, 0);
});
it('should add an overview ruler when width is set', async () => {
await page.evaluate(`window.term = new Terminal({ allowProposedApi: true, overviewRulerWidth: 15 })`);
await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
await page.waitForSelector('.xterm-text-layer');
await openTerminal(page, { overviewRulerWidth: 15 });
await page.evaluate(`window.marker1 = window.term.registerMarker(1)`);
await page.evaluate(`window.marker2 = window.term.registerMarker(2)`);
await page.evaluate(`window.term.registerDecoration({ marker: window.marker1, overviewRulerOptions: { color: 'red', position: 'full' } })`);
+1 -1
View File
@@ -64,7 +64,7 @@ export function getBrowserType(): playwright.BrowserType<playwright.WebKitBrowse
return browserType;
}
export function launchBrowser() {
export function launchBrowser(): Promise<playwright.Browser> {
const browserType = getBrowserType();
const options: Record<string, unknown> = {
headless: process.argv.includes('--headless')