From 41f418e91e163072aaafb64232c35bbd07739494 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 25 Jul 2019 10:13:40 -0700 Subject: [PATCH] Revert tests to how they used to be --- src/Terminal.test.ts | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/src/Terminal.test.ts b/src/Terminal.test.ts index 2de54396..714257f9 100644 --- a/src/Terminal.test.ts +++ b/src/Terminal.test.ts @@ -556,16 +556,12 @@ describe('Terminal', () => { afterEach(() => term.browser.isMac = originalIsMac); it('should interfere with the alt key on keyDown', () => { - (term)._keyDownHandled = false; evKeyDown.altKey = true; evKeyDown.keyCode = 81; - term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, true); - (term)._keyDownHandled = false; + assert.equal(term.keyDown(evKeyDown), false); evKeyDown.altKey = true; evKeyDown.keyCode = 192; - term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, true); + assert.equal(term.keyDown(evKeyDown), false); }); }); @@ -578,29 +574,22 @@ describe('Terminal', () => { afterEach(() => term.browser.isMac = originalIsMac); it('should not interfere with the alt key on keyDown', () => { - (term)._keyDownHandled = false; evKeyDown.altKey = true; evKeyDown.keyCode = 81; - term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, false); - (term)._keyDownHandled = false; + assert.equal(term.keyDown(evKeyDown), true); evKeyDown.altKey = true; evKeyDown.keyCode = 192; term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, false); + assert.equal(term.keyDown(evKeyDown), true); }); it('should interfere with the alt + arrow keys', () => { - (term)._keyDownHandled = false; evKeyDown.altKey = true; evKeyDown.keyCode = 37; - term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, true); - (term)._keyDownHandled = false; + assert.equal(term.keyDown(evKeyDown), false); evKeyDown.altKey = true; evKeyDown.keyCode = 39; - term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, true); + assert.equal(term.keyDown(evKeyDown), false); }); it('should emit key with alt + key on keyPress', (done) => { @@ -652,32 +641,26 @@ describe('Terminal', () => { afterEach(() => term.browser.isWindows = originalIsWindows); it('should not interfere with the alt + ctrl key on keyDown', () => { - (term)._keyDownHandled = false; evKeyPress.altKey = true; evKeyPress.ctrlKey = true; evKeyPress.keyCode = 81; - term.keyDown(evKeyPress); - assert.equal((term)._keyDownHandled, false); - (term)._keyDownHandled = false; + assert.equal(term.keyDown(evKeyPress), true); evKeyDown.altKey = true; evKeyDown.ctrlKey = true; evKeyDown.keyCode = 81; term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, false); + assert.equal(term.keyDown(evKeyPress), true); }); - it('should interefere with the alt + ctrl + arrow keys', () => { + it('should interfere with the alt + ctrl + arrow keys', () => { evKeyDown.altKey = true; evKeyDown.ctrlKey = true; - (term)._keyDownHandled = false; evKeyDown.keyCode = 37; - term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, true); - (term)._keyDownHandled = false; + assert.equal(term.keyDown(evKeyDown), false); evKeyDown.keyCode = 39; term.keyDown(evKeyDown); - assert.equal((term)._keyDownHandled, true); + assert.equal(term.keyDown(evKeyDown), false); }); it('should emit key with alt + ctrl + key on keyPress', (done) => {