Merge pull request #2335 from Tyriar/unit_exit_code
Fix unit tests and the returned exit code
This commit is contained in:
+3
-1
@@ -21,7 +21,7 @@ if (process.argv.length > 2) {
|
|||||||
testFiles = process.argv.slice(2);
|
testFiles = process.argv.slice(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
cp.spawnSync(
|
const run = cp.spawnSync(
|
||||||
path.resolve(__dirname, '../node_modules/.bin/mocha'),
|
path.resolve(__dirname, '../node_modules/.bin/mocha'),
|
||||||
testFiles,
|
testFiles,
|
||||||
{
|
{
|
||||||
@@ -30,3 +30,5 @@ cp.spawnSync(
|
|||||||
stdio: 'inherit'
|
stdio: 'inherit'
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
process.exit(run.status);
|
||||||
+32
-11
@@ -94,6 +94,7 @@ describe('Terminal', () => {
|
|||||||
expect(e.domEvent).to.be.an.instanceof(Object);
|
expect(e.domEvent).to.be.an.instanceof(Object);
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
(<any>term).textarea = { value: '' };
|
||||||
const evKeyDown = <KeyboardEvent>{
|
const evKeyDown = <KeyboardEvent>{
|
||||||
preventDefault: () => { },
|
preventDefault: () => { },
|
||||||
stopPropagation: () => { },
|
stopPropagation: () => { },
|
||||||
@@ -555,12 +556,16 @@ describe('Terminal', () => {
|
|||||||
afterEach(() => term.browser.isMac = originalIsMac);
|
afterEach(() => term.browser.isMac = originalIsMac);
|
||||||
|
|
||||||
it('should interfere with the alt key on keyDown', () => {
|
it('should interfere with the alt key on keyDown', () => {
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.keyCode = 81;
|
evKeyDown.keyCode = 81;
|
||||||
assert.equal(term.keyDown(evKeyDown), false);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, true);
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.keyCode = 192;
|
evKeyDown.keyCode = 192;
|
||||||
assert.equal(term.keyDown(evKeyDown), false);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -573,21 +578,29 @@ describe('Terminal', () => {
|
|||||||
afterEach(() => term.browser.isMac = originalIsMac);
|
afterEach(() => term.browser.isMac = originalIsMac);
|
||||||
|
|
||||||
it('should not interfere with the alt key on keyDown', () => {
|
it('should not interfere with the alt key on keyDown', () => {
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.keyCode = 81;
|
evKeyDown.keyCode = 81;
|
||||||
assert.equal(term.keyDown(evKeyDown), true);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, false);
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.keyCode = 192;
|
evKeyDown.keyCode = 192;
|
||||||
assert.equal(term.keyDown(evKeyDown), true);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should interefere with the alt + arrow keys', () => {
|
it('should interfere with the alt + arrow keys', () => {
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.keyCode = 37;
|
evKeyDown.keyCode = 37;
|
||||||
assert.equal(term.keyDown(evKeyDown), false);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, true);
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.keyCode = 39;
|
evKeyDown.keyCode = 39;
|
||||||
assert.equal(term.keyDown(evKeyDown), false);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should emit key with alt + key on keyPress', (done) => {
|
it('should emit key with alt + key on keyPress', (done) => {
|
||||||
@@ -639,24 +652,32 @@ describe('Terminal', () => {
|
|||||||
afterEach(() => term.browser.isWindows = originalIsWindows);
|
afterEach(() => term.browser.isWindows = originalIsWindows);
|
||||||
|
|
||||||
it('should not interfere with the alt + ctrl key on keyDown', () => {
|
it('should not interfere with the alt + ctrl key on keyDown', () => {
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyPress.altKey = true;
|
evKeyPress.altKey = true;
|
||||||
evKeyPress.ctrlKey = true;
|
evKeyPress.ctrlKey = true;
|
||||||
evKeyPress.keyCode = 81;
|
evKeyPress.keyCode = 81;
|
||||||
assert.equal(term.keyDown(evKeyPress), true);
|
term.keyDown(evKeyPress);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, false);
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.ctrlKey = true;
|
evKeyDown.ctrlKey = true;
|
||||||
evKeyDown.keyCode = 81;
|
evKeyDown.keyCode = 81;
|
||||||
assert.equal(term.keyDown(evKeyDown), true);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should interefere with the alt + ctrl + arrow keys', () => {
|
it('should interefere with the alt + ctrl + arrow keys', () => {
|
||||||
evKeyDown.altKey = true;
|
evKeyDown.altKey = true;
|
||||||
evKeyDown.ctrlKey = true;
|
evKeyDown.ctrlKey = true;
|
||||||
|
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.keyCode = 37;
|
evKeyDown.keyCode = 37;
|
||||||
assert.equal(term.keyDown(evKeyDown), false);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, true);
|
||||||
|
(<any>term)._keyDownHandled = false;
|
||||||
evKeyDown.keyCode = 39;
|
evKeyDown.keyCode = 39;
|
||||||
assert.equal(term.keyDown(evKeyDown), false);
|
term.keyDown(evKeyDown);
|
||||||
|
assert.equal((<any>term)._keyDownHandled, true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should emit key with alt + ctrl + key on keyPress', (done) => {
|
it('should emit key with alt + ctrl + key on keyPress', (done) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user