Fix some tests and docs, little code fix up.
Fix some tests and docs. Add ability to run one test file with help gulp task. Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
This commit is contained in:
committed by
Paris Kasidiaris
parent
d222eec9f7
commit
de82bd00ae
+15
-2
@@ -14,7 +14,7 @@ const sorcery = require('sorcery');
|
|||||||
const source = require('vinyl-source-stream');
|
const source = require('vinyl-source-stream');
|
||||||
const sourcemaps = require('gulp-sourcemaps');
|
const sourcemaps = require('gulp-sourcemaps');
|
||||||
const ts = require('gulp-typescript');
|
const ts = require('gulp-typescript');
|
||||||
|
const util = require('gulp-util');
|
||||||
|
|
||||||
let buildDir = process.env.BUILD_DIR || 'build';
|
let buildDir = process.env.BUILD_DIR || 'build';
|
||||||
let tsProject = ts.createProject('tsconfig.json');
|
let tsProject = ts.createProject('tsconfig.json');
|
||||||
@@ -121,13 +121,26 @@ gulp.task('mocha', ['instrument-test'], function () {
|
|||||||
.pipe(istanbul.writeReports());
|
.pipe(istanbul.writeReports());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run single test file by file name(without file extension). Example of the command:
|
||||||
|
* gulp mocha-test --test InputHandler.test
|
||||||
|
*/
|
||||||
|
gulp.task('mocha-test', ['instrument-test'], function () {
|
||||||
|
let testName = util.env.test;
|
||||||
|
util.log("Run test by Name: " + testName);
|
||||||
|
return gulp.src([`${outDir}/${testName}.js`, `${outDir}/**/${testName}.js`], {read: false})
|
||||||
|
.pipe(mocha())
|
||||||
|
.once('error', () => process.exit(1))
|
||||||
|
.pipe(istanbul.writeReports());
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use `sorcery` to resolve the source map chain and point back to the TypeScript files.
|
* Use `sorcery` to resolve the source map chain and point back to the TypeScript files.
|
||||||
* (Without this task the source maps produced for the JavaScript bundle points into the
|
* (Without this task the source maps produced for the JavaScript bundle points into the
|
||||||
* compiled JavaScript files in ${outDir}/).
|
* compiled JavaScript files in ${outDir}/).
|
||||||
*/
|
*/
|
||||||
gulp.task('sorcery', ['browserify'], function () {
|
gulp.task('sorcery', ['browserify'], function () {
|
||||||
var chain = sorcery.loadSync(`${buildDir}/xterm.js`);
|
let chain = sorcery.loadSync(`${buildDir}/xterm.js`);
|
||||||
chain.apply();
|
chain.apply();
|
||||||
chain.writeSync();
|
chain.writeSync();
|
||||||
});
|
});
|
||||||
|
|||||||
+2
-1
@@ -62,7 +62,8 @@
|
|||||||
"tslint": "^4.0.2",
|
"tslint": "^4.0.2",
|
||||||
"typescript": "~2.2.0",
|
"typescript": "~2.2.0",
|
||||||
"vinyl-buffer": "^1.0.0",
|
"vinyl-buffer": "^1.0.0",
|
||||||
"vinyl-source-stream": "^1.1.0"
|
"vinyl-source-stream": "^1.1.0",
|
||||||
|
"gulp-util": "^3.0.8"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prestart": "npm run build",
|
"prestart": "npm run build",
|
||||||
|
|||||||
+2
-2
@@ -9,7 +9,7 @@ import { CircularList } from './utils/CircularList';
|
|||||||
* This class represents a terminal buffer (an internal state of the terminal)/
|
* This class represents a terminal buffer (an internal state of the terminal)/
|
||||||
*/
|
*/
|
||||||
export class Buffer {
|
export class Buffer {
|
||||||
public lines: CircularList<any>;
|
public lines: CircularList<string>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new Buffer.
|
* Create a new Buffer.
|
||||||
@@ -29,7 +29,7 @@ export class Buffer {
|
|||||||
public scrollTop: number = 0,
|
public scrollTop: number = 0,
|
||||||
public tabs: any = {},
|
public tabs: any = {},
|
||||||
) {
|
) {
|
||||||
this.lines = new CircularList(this.terminal.scrollback);
|
this.lines = new CircularList<string>(this.terminal.scrollback);
|
||||||
this.scrollBottom = this.terminal.rows - 1;
|
this.scrollBottom = this.terminal.rows - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { CharMeasure } from './utils/CharMeasure';
|
|||||||
import { CircularList } from './utils/CircularList';
|
import { CircularList } from './utils/CircularList';
|
||||||
import { SelectionManager } from './SelectionManager';
|
import { SelectionManager } from './SelectionManager';
|
||||||
import { SelectionModel } from './SelectionModel';
|
import { SelectionModel } from './SelectionModel';
|
||||||
|
import {BufferSet} from './BufferSet';
|
||||||
|
|
||||||
class TestSelectionManager extends SelectionManager {
|
class TestSelectionManager extends SelectionManager {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -40,13 +41,31 @@ describe('SelectionManager', () => {
|
|||||||
let rowContainer: HTMLElement;
|
let rowContainer: HTMLElement;
|
||||||
let selectionManager: TestSelectionManager;
|
let selectionManager: TestSelectionManager;
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
dom = new jsdom.JSDOM('');
|
dom = new jsdom.JSDOM('');
|
||||||
window = dom.window;
|
window = dom.window;
|
||||||
document = window.document;
|
document = window.document
|
||||||
buffer = new CircularList<any>(100);
|
|
||||||
terminal = <any>{ cols: 80, rows: 2 };
|
terminal = <any>{ cols: 80, rows: 2 };
|
||||||
|
terminal.scrollback = 100;
|
||||||
|
terminal.buffers = new BufferSet(terminal);
|
||||||
|
terminal.buffer = terminal.buffers.active;
|
||||||
selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
|
selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
|
||||||
|
=======
|
||||||
|
beforeEach(done => {
|
||||||
|
jsdom.env('', (err, w) => {
|
||||||
|
window = w;
|
||||||
|
document = window.document;
|
||||||
|
buffer = new CircularList<any>(100);
|
||||||
|
terminal = <any>{ cols: 80, rows: 2 };
|
||||||
|
terminal.scrollback = 10;
|
||||||
|
terminal.buffers = new BufferSet(terminal);
|
||||||
|
terminal.buffer = terminal.buffers.active;
|
||||||
|
|
||||||
|
selectionManager = new TestSelectionManager(terminal, buffer, rowContainer, null);
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
>>>>>>> Fix some tests and docs, little code fix up.
|
||||||
});
|
});
|
||||||
|
|
||||||
function stringToRow(text: string): [number, string, number][] {
|
function stringToRow(text: string): [number, string, number][] {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
import { assert } from 'chai';
|
import { assert } from 'chai';
|
||||||
import { ITerminal } from './Interfaces';
|
import { ITerminal } from './Interfaces';
|
||||||
import { SelectionModel } from './SelectionModel';
|
import { SelectionModel } from './SelectionModel';
|
||||||
|
import {BufferSet} from './BufferSet';
|
||||||
|
|
||||||
class TestSelectionModel extends SelectionModel {
|
class TestSelectionModel extends SelectionModel {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -22,6 +23,10 @@ describe('SelectionManager', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
terminal = <any>{ cols: 80, rows: 2, ybase: 0 };
|
terminal = <any>{ cols: 80, rows: 2, ybase: 0 };
|
||||||
|
terminal.scrollback = 10;
|
||||||
|
terminal.buffers = new BufferSet(terminal);
|
||||||
|
terminal.buffer = terminal.buffers.active;
|
||||||
|
|
||||||
model = new TestSelectionModel(terminal);
|
model = new TestSelectionModel(terminal);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+11
-9
@@ -1,10 +1,10 @@
|
|||||||
import { assert } from 'chai';
|
import { assert } from 'chai';
|
||||||
import { Viewport } from './Viewport';
|
import { Viewport } from './Viewport';
|
||||||
|
import {BufferSet} from './BufferSet';
|
||||||
|
|
||||||
describe('Viewport', () => {
|
describe('Viewport', () => {
|
||||||
let terminal;
|
let terminal;
|
||||||
let viewportElement;
|
let viewportElement;
|
||||||
let selectionContainer;
|
|
||||||
let charMeasure;
|
let charMeasure;
|
||||||
let viewport;
|
let viewport;
|
||||||
let scrollAreaElement;
|
let scrollAreaElement;
|
||||||
@@ -13,7 +13,6 @@ describe('Viewport', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
terminal = {
|
terminal = {
|
||||||
lines: [],
|
|
||||||
rows: 0,
|
rows: 0,
|
||||||
ydisp: 0,
|
ydisp: 0,
|
||||||
on: () => {},
|
on: () => {},
|
||||||
@@ -26,8 +25,11 @@ describe('Viewport', () => {
|
|||||||
style: {
|
style: {
|
||||||
height: 0
|
height: 0
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
scrollback: 10
|
||||||
};
|
};
|
||||||
|
terminal.buffers = new BufferSet(terminal);
|
||||||
|
terminal.buffer = terminal.buffers.active;
|
||||||
viewportElement = {
|
viewportElement = {
|
||||||
addEventListener: () => {},
|
addEventListener: () => {},
|
||||||
style: {
|
style: {
|
||||||
@@ -60,14 +62,14 @@ describe('Viewport', () => {
|
|||||||
}, 0);
|
}, 0);
|
||||||
});
|
});
|
||||||
it('should set the height of the viewport when the line-height changed', () => {
|
it('should set the height of the viewport when the line-height changed', () => {
|
||||||
terminal.lines.push('');
|
terminal.buffer.lines.push('');
|
||||||
terminal.lines.push('');
|
terminal.buffer.lines.push('');
|
||||||
terminal.rows = 1;
|
terminal.rows = 1;
|
||||||
viewport.refresh();
|
viewport.refresh();
|
||||||
assert.equal(viewportElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
assert.equal(viewportElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
||||||
charMeasure.height = 20;
|
charMeasure.height = 2 * CHARACTER_HEIGHT;
|
||||||
viewport.refresh();
|
viewport.refresh();
|
||||||
assert.equal(viewportElement.style.height, 20 + 'px');
|
assert.equal(viewportElement.style.height, 2 * CHARACTER_HEIGHT + 'px');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -75,13 +77,13 @@ describe('Viewport', () => {
|
|||||||
it('should sync the scroll area', done => {
|
it('should sync the scroll area', done => {
|
||||||
// Allow CharMeasure to be initialized
|
// Allow CharMeasure to be initialized
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
terminal.lines.push('');
|
terminal.buffer.lines.push('');
|
||||||
terminal.rows = 1;
|
terminal.rows = 1;
|
||||||
assert.equal(scrollAreaElement.style.height, 0 * CHARACTER_HEIGHT + 'px');
|
assert.equal(scrollAreaElement.style.height, 0 * CHARACTER_HEIGHT + 'px');
|
||||||
viewport.syncScrollArea();
|
viewport.syncScrollArea();
|
||||||
assert.equal(viewportElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
assert.equal(viewportElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
||||||
assert.equal(scrollAreaElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
assert.equal(scrollAreaElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
||||||
terminal.lines.push('');
|
terminal.buffer.lines.push('');
|
||||||
viewport.syncScrollArea();
|
viewport.syncScrollArea();
|
||||||
assert.equal(viewportElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
assert.equal(viewportElement.style.height, 1 * CHARACTER_HEIGHT + 'px');
|
||||||
assert.equal(scrollAreaElement.style.height, 2 * CHARACTER_HEIGHT + 'px');
|
assert.equal(scrollAreaElement.style.height, 2 * CHARACTER_HEIGHT + 'px');
|
||||||
|
|||||||
+1
-3
@@ -20,7 +20,7 @@ export class Viewport {
|
|||||||
* @param terminal The terminal this viewport belongs to.
|
* @param terminal The terminal this viewport belongs to.
|
||||||
* @param viewportElement The DOM element acting as the viewport.
|
* @param viewportElement The DOM element acting as the viewport.
|
||||||
* @param scrollArea The DOM element acting as the scroll area.
|
* @param scrollArea The DOM element acting as the scroll area.
|
||||||
* @param charMeasureElement A DOM element used to measure the character size of. the terminal.
|
* @param charMeasure A DOM element used to measure the character size of. the terminal.
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
private terminal: ITerminal,
|
private terminal: ITerminal,
|
||||||
@@ -43,8 +43,6 @@ export class Viewport {
|
|||||||
/**
|
/**
|
||||||
* Refreshes row height, setting line-height, viewport height and scroll area height if
|
* Refreshes row height, setting line-height, viewport height and scroll area height if
|
||||||
* necessary.
|
* necessary.
|
||||||
* @param charSize A character size measurement bounding rect object, if it doesn't exist it will
|
|
||||||
* be created.
|
|
||||||
*/
|
*/
|
||||||
private refresh(): void {
|
private refresh(): void {
|
||||||
if (this.charMeasure.height > 0) {
|
if (this.charMeasure.height > 0) {
|
||||||
|
|||||||
+2
-2
@@ -415,7 +415,7 @@ Terminal.prototype.setOption = function(key, value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.options[key] !== value) {
|
if (this.options[key] !== value) {
|
||||||
if (this.buffer.length > value) {
|
if (this.buffer.lines.length > value) {
|
||||||
const amountToTrim = this.buffer.lines.length - value;
|
const amountToTrim = this.buffer.lines.length - value;
|
||||||
const needsRefresh = (this.buffer.ydisp - amountToTrim < 0);
|
const needsRefresh = (this.buffer.ydisp - amountToTrim < 0);
|
||||||
this.buffer.lines.trimStart(amountToTrim);
|
this.buffer.lines.trimStart(amountToTrim);
|
||||||
@@ -498,7 +498,7 @@ Terminal.prototype.blur = function() {
|
|||||||
*/
|
*/
|
||||||
Terminal.bindBlur = function (term) {
|
Terminal.bindBlur = function (term) {
|
||||||
on(term.textarea, 'blur', function (ev) {
|
on(term.textarea, 'blur', function (ev) {
|
||||||
term.refresh(term.y, term.y);
|
term.refresh(term.buffer.y, term.buffer.y);
|
||||||
if (term.sendFocus) {
|
if (term.sendFocus) {
|
||||||
term.send(C0.ESC + '[O');
|
term.send(C0.ESC + '[O');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user