Remove DEBUG, test fit addon based on a range

This commit is contained in:
Daniel Imms
2020-02-15 12:26:59 -08:00
parent 35ddcdd266
commit bdb01e6166
2 changed files with 18 additions and 22 deletions
+18 -18
View File
@@ -14,8 +14,6 @@ let page: Page;
const width = 1024;
const height = 768;
let isFirefox = false;
describe('FitAddon', () => {
before(async function(): Promise<any> {
const browserType = getBrowserType();
@@ -27,10 +25,6 @@ describe('FitAddon', () => {
await page.setViewportSize({ width, height });
await page.goto(APP);
await openTerminal(page);
// This is used to do conditional assertions since cell height is 1 pixel higher with the
// default font on Firefox. Minor differences in font rendering/sizing is expected so this is
// fine.
isFirefox = await page.evaluate(`navigator.userAgent.toLowerCase().indexOf('firefox') > -1`);
});
after(async () => {
@@ -49,18 +43,18 @@ describe('FitAddon', () => {
it('default', async function(): Promise<any> {
await loadFit();
assert.deepEqual(await page.evaluate(`window.fit.proposeDimensions()`), {
cols: 87,
rows: isFirefox ? 28 : 26
});
const dimensions: {cols: number, rows: number} = await page.evaluate(`window.fit.proposeDimensions()`);
assert.equal(dimensions.cols, 87);
assert.isAbove(dimensions.rows, 24);
assert.isBelow(dimensions.rows, 29);
});
it('width', async function(): Promise<any> {
await loadFit(1008);
assert.deepEqual(await page.evaluate(`window.fit.proposeDimensions()`), {
cols: 110,
rows: isFirefox ? 28 : 26
});
const dimensions: {cols: number, rows: number} = await page.evaluate(`window.fit.proposeDimensions()`);
assert.equal(dimensions.cols, 110);
assert.isAbove(dimensions.rows, 24);
assert.isBelow(dimensions.rows, 29);
});
it('small', async function(): Promise<any> {
@@ -80,15 +74,21 @@ describe('FitAddon', () => {
it('default', async function(): Promise<any> {
await loadFit();
await page.evaluate(`window.fit.fit()`);
assert.equal(await page.evaluate(`window.term.cols`), 87);
assert.equal(await page.evaluate(`window.term.rows`), isFirefox ? 28 : 26);
const cols: number = await page.evaluate(`window.term.cols`);
const rows: number = await page.evaluate(`window.term.rows`);
assert.equal(cols, 87);
assert.isAbove(rows, 24);
assert.isBelow(rows, 29);
});
it('width', async function(): Promise<any> {
await loadFit(1008);
await page.evaluate(`window.fit.fit()`);
assert.equal(await page.evaluate(`window.term.cols`), 110);
assert.equal(await page.evaluate(`window.term.rows`), isFirefox ? 28 : 26);
const cols: number = await page.evaluate(`window.term.cols`);
const rows: number = await page.evaluate(`window.term.rows`);
assert.equal(cols, 110);
assert.isAbove(rows, 24);
assert.isBelow(rows, 29);
});
it('small', async function(): Promise<any> {
-4
View File
@@ -108,12 +108,8 @@ jobs:
displayName: 'Integration tests (Chromium)'
- script: xvfb-run --auto-servernum -- bash -c "yarn test-api-firefox --headless --forbid-only"
displayName: 'Integration tests (Firefox)'
env:
DEBUG: "*"
- script: xvfb-run --auto-servernum -- bash -c "yarn test-api-webkit --headless --forbid-only"
displayName: 'Integration tests (Webkit)'
env:
DEBUG: "*"
- job: macOS_IntegrationTests
pool: