From 5ac1f60ece0a112a55f329ed34b455dcc776b22c Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 3 Oct 2017 20:58:50 +0900 Subject: remove deprecated property in KeyboardEvent --- test/actions/input.test.js | 11 ++++++++--- test/reducers/input.test.js | 22 +++++++--------------- test/shared/keys.test.js | 31 ------------------------------- 3 files changed, 15 insertions(+), 49 deletions(-) delete mode 100644 test/shared/keys.test.js (limited to 'test') diff --git a/test/actions/input.test.js b/test/actions/input.test.js index 9ec6de4..904d3e7 100644 --- a/test/actions/input.test.js +++ b/test/actions/input.test.js @@ -5,10 +5,15 @@ import * as inputActions from '../../src/actions/input'; describe("input actions", () => { describe("keyPress", () => { it('create INPUT_KEY_PRESS action', () => { - let action = inputActions.keyPress(123, true); + let action = inputActions.keyPress('a', false); expect(action.type).to.equal(actions.INPUT_KEY_PRESS); - expect(action.code).to.equal(123); - expect(action.ctrl).to.be.true; + expect(action.key).to.equal('a'); + }); + + it('create INPUT_KEY_PRESS action from key with ctrl', () => { + let action = inputActions.keyPress('b', true); + expect(action.type).to.equal(actions.INPUT_KEY_PRESS); + expect(action.key).to.equal(''); }); }); diff --git a/test/reducers/input.test.js b/test/reducers/input.test.js index d7a0855..3c3bf39 100644 --- a/test/reducers/input.test.js +++ b/test/reducers/input.test.js @@ -5,30 +5,22 @@ import inputReducer from '../../src/reducers/input'; describe("input reducer", () => { it('return the initial state', () => { let state = inputReducer(undefined, {}); - expect(state).to.have.deep.property('keys', []); + expect(state).to.have.deep.property('keys', ''); }); it('return next state for INPUT_KEY_PRESS', () => { - let action = { type: actions.INPUT_KEY_PRESS, code: 123, ctrl: true }; + let action = { type: actions.INPUT_KEY_PRESS, key: 'a' }; let state = inputReducer(undefined, action); - expect(state).to.have.deep.property('keys', [{ code: 123, ctrl: true }]); + expect(state).to.have.deep.property('keys', 'a'); - action = { type: actions.INPUT_KEY_PRESS, code: 456, ctrl: false }; + action = { type: actions.INPUT_KEY_PRESS, key: '' }; state = inputReducer(state, action); - expect(state).to.have.deep.property('keys', [ - { code: 123, ctrl: true }, - { code: 456, ctrl: false } - ]); + expect(state).to.have.deep.property('keys', 'a'); }); it('return next state for INPUT_CLEAR_KEYS', () => { let action = { type: actions.INPUT_CLEAR_KEYS }; - let state = inputReducer({ - keys: [ - { code: 123, ctrl: true }, - { code: 456, ctrl: false } - ] - }, action); - expect(state).to.have.deep.property('keys', []); + let state = inputReducer({ keys: 'abc' }, action); + expect(state).to.have.deep.property('keys', ''); }); }); diff --git a/test/shared/keys.test.js b/test/shared/keys.test.js deleted file mode 100644 index 53c953d..0000000 --- a/test/shared/keys.test.js +++ /dev/null @@ -1,31 +0,0 @@ -import { expect } from "chai"; -import * as keys from '../../src/shared/keys'; - -describe("keys", () => { - const KEYMAP = { - 'gGG': [], - 'gg': { type: 'scroll.top' }, - }; - - const g = 'g'.charCodeAt(0); - const G = 'G'.charCodeAt(0); - const x = 'x'.charCodeAt(0); - - describe('#asKeymapChars', () => { - let keySequence = [ - { code: g }, - { code: x, ctrl: true }, - { code: G } - ]; - expect(keys.asKeymapChars(keySequence)).to.equal('gG'); - }); - - describe('#asCaretChars', () => { - let keySequence = [ - { code: g }, - { code: x, ctrl: true }, - { code: G } - ]; - expect(keys.asCaretChars(keySequence)).to.equal('g^XG'); - }); -}); -- cgit v1.2.3