From 7e35d11f659029febd738c83b19ab4b8a8b69642 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 9 Sep 2017 22:50:00 +0900 Subject: add console actions/reducer tests and fix targets --- test/actions/console.test.js | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/actions/console.test.js (limited to 'test/actions') diff --git a/test/actions/console.test.js b/test/actions/console.test.js new file mode 100644 index 0000000..512ee40 --- /dev/null +++ b/test/actions/console.test.js @@ -0,0 +1,37 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as consoleActions from '../../src/actions/console'; + +describe("console actions", () => { + describe("showCommand", () => { + it('create CONSOLE_SHOW_COMMAND action', () => { + let action = consoleActions.showCommand('hello'); + expect(action.type).to.equal(actions.CONSOLE_SHOW_COMMAND); + expect(action.text).to.equal('hello'); + }); + }); + + describe("setCompletions", () => { + it('create CONSOLE_SET_COMPLETIONS action', () => { + let action = consoleActions.setCompletions([1,2,3]); + expect(action.type).to.equal(actions.CONSOLE_SET_COMPLETIONS); + expect(action.completions).to.deep.equal([1, 2, 3]); + }); + }); + + describe("showError", () => { + it('create CONSOLE_SHOW_ERROR action', () => { + let action = consoleActions.showError('an error'); + expect(action.type).to.equal(actions.CONSOLE_SHOW_ERROR); + expect(action.text).to.equal('an error'); + }); + }); + + describe("hide", () => { + it('create CONSOLE_HIDE action', () => { + let action = consoleActions.hide(); + expect(action.type).to.equal(actions.CONSOLE_HIDE); + }); + }); +}); + -- cgit v1.2.3 From 3c67cc0a002aded07e88ea25acc881ff080d1ae4 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 09:20:54 +0900 Subject: completion as action/reducer --- src/actions/background.js | 11 +++++++++++ src/actions/index.js | 4 +++- src/background/index.js | 20 +++++--------------- src/console/console-frame.js | 4 ---- src/console/console.js | 12 ++++-------- src/content/index.js | 19 ------------------- src/reducers/background.js | 38 ++++++++++++++++++++++++++++++++++++++ test/actions/background.test.js | 14 ++++++++++++++ 8 files changed, 75 insertions(+), 47 deletions(-) create mode 100644 src/actions/background.js create mode 100644 src/reducers/background.js create mode 100644 test/actions/background.test.js (limited to 'test/actions') diff --git a/src/actions/background.js b/src/actions/background.js new file mode 100644 index 0000000..40b901b --- /dev/null +++ b/src/actions/background.js @@ -0,0 +1,11 @@ +import actions from '../actions'; + +export function requestCompletions(line) { + let command = line.split(' ', 1)[0]; + let keywords = line.replace(command + ' ', ''); + return { + type: actions.BACKGROUND_REQUEST_COMPLETIONS, + command, + keywords + }; +} diff --git a/src/actions/index.js b/src/actions/index.js index 38ced9d..8f22193 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -2,5 +2,7 @@ export default { CONSOLE_SHOW_COMMAND: 'vimvixen.console.show.command', CONSOLE_SET_COMPLETIONS: 'vimvixen.console.set.completions', CONSOLE_SHOW_ERROR: 'vimvixen.console.show.error', - CONSOLE_HIDE: 'vimvixen.console.hide' + CONSOLE_HIDE: 'vimvixen.console.hide', + + BACKGROUND_REQUEST_COMPLETIONS: 'vimvixen.background.request.completions' }; diff --git a/src/background/index.js b/src/background/index.js index 61d4895..a80d1ea 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -2,6 +2,7 @@ import * as actions from '../shared/actions'; import * as tabs from './tabs'; import * as zooms from './zooms'; import KeyQueue from './key-queue'; +import backgroundReducers from '../reducers/background'; const queue = new KeyQueue(); @@ -81,22 +82,11 @@ browser.runtime.onMessage.addListener((request, sender) => { return keyPressHandle(request, sender); case 'event.cmd.enter': return cmdEnterHandle(request, sender); - case 'event.cmd.tabs.completion': - return tabs.getCompletions(request.text).then((tabs) => { - let items = tabs.map((tab) => { - return { - caption: tab.title, - content: tab.title, - url: tab.url, - icon: tab.favIconUrl - } - }); - return { - name: "Buffers", - items: items - }; - }); default: return browser.tabs.sendMessage(sender.tab.id, request); } }); + +browser.runtime.onMessage.addListener((action, sender) => { + return backgroundReducers(undefined, action, sender.tab.id); +}); diff --git a/src/console/console-frame.js b/src/console/console-frame.js index 8b4c17a..063026c 100644 --- a/src/console/console-frame.js +++ b/src/console/console-frame.js @@ -45,8 +45,4 @@ export default class ConsoleFrame { isErrorShown() { return this.element.style.display === 'block' && this.errorShown; } - - setCompletions(completions) { - return browser.runtime.sendMessage(consoleActions.setCompletions(completions)); - } } diff --git a/src/console/console.js b/src/console/console.js index 35d98e0..d79e154 100644 --- a/src/console/console.js +++ b/src/console/console.js @@ -1,4 +1,5 @@ import './console.scss'; +import * as backgroundActions from '../actions/background'; import Completion from './completion'; import consoleReducer from '../reducers/console'; @@ -21,13 +22,6 @@ const keydownMessage = (input) => { }; }; -const keyupMessage = (input) => { - return { - type: 'vimvixen.command.change', - value: input.value - }; -}; - const handleBlur = () => { return browser.runtime.sendMessage(blurMessage()); }; @@ -88,7 +82,9 @@ const handleKeyup = (e) => { return; } prevValue = e.target.value; - return browser.runtime.sendMessage(keyupMessage(e.target)); + return browser.runtime.sendMessage( + backgroundActions.requestCompletions(e.target.value) + ); }; window.addEventListener('load', () => { diff --git a/src/content/index.js b/src/content/index.js index deb3506..1a7fa55 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -68,23 +68,6 @@ window.addEventListener("keypress", (e) => { }); }); -const doCompletion = (line) => { - if (line.startsWith('buffer ')) { - let keyword = line.replace('buffer ', ''); - - browser.runtime.sendMessage({ - type: 'event.cmd.tabs.completion', - text: keyword - }).then((completions) => { - vvConsole.setCompletions([completions]); - }).catch((err) => { - console.error("Vim Vixen:", err); - vvConsole.showError(err.message); - }); - } - return Promise.resolve(); -}; - browser.runtime.onMessage.addListener((action) => { switch (action.type) { case 'vimvixen.command.blur': @@ -100,8 +83,6 @@ browser.runtime.onMessage.addListener((action) => { console.error("Vim Vixen:", err); vvConsole.showError(err.message); }); - case 'vimvixen.command.change': - return doCompletion(action.value); default: return Promise.resolve(); } diff --git a/src/reducers/background.js b/src/reducers/background.js new file mode 100644 index 0000000..eccc8ca --- /dev/null +++ b/src/reducers/background.js @@ -0,0 +1,38 @@ +import * as tabs from '../background/tabs'; +import * as consoleActions from '../actions/console'; +import actions from '../actions'; + +const doCompletion = (command, keywords, sendto) => { + if (command === 'buffer') { + return tabs.getCompletions(keywords).then((tabs) => { + let items = tabs.map((tab) => { + return { + caption: tab.title, + content: tab.title, + url: tab.url, + icon: tab.favIconUrl + } + }); + let completions = { + name: "Buffers", + items: items + }; + return browser.tabs.sendMessage( + sendto, + consoleActions.setCompletions([completions])); + }); + } + return Promise.resolve(); +}; + + + +export default function reducer(state, action = {}, sendto) { + // TODO hide sendto object + switch (action.type) { + case actions.BACKGROUND_REQUEST_COMPLETIONS: + return doCompletion(action.command, action.keywords, sendto); + default: + return Promise.resolve(); + } +} diff --git a/test/actions/background.test.js b/test/actions/background.test.js new file mode 100644 index 0000000..a3203ee --- /dev/null +++ b/test/actions/background.test.js @@ -0,0 +1,14 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as backgroundActions from '../../src/actions/background'; + +describe("background actions", () => { + describe("requestCompletions", () => { + it('create BACKGROUND_REQUEST_COMPLETIONS action', () => { + let action = backgroundActions.requestCompletions('buffer hoge fuga'); + expect(action.type).to.equal(actions.BACKGROUND_REQUEST_COMPLETIONS); + expect(action.command).to.equal('buffer'); + expect(action.keywords).to.equal('hoge fuga'); + }); + }); +}); -- cgit v1.2.3 From 14d13e2c3abdb090431f59970681cdaf95f0a24a Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 10 Sep 2017 22:23:17 +0900 Subject: add tests for input action/reducer --- test/actions/input.test.js | 17 +++++++++++++++++ test/reducers/input.test.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 test/actions/input.test.js create mode 100644 test/reducers/input.test.js (limited to 'test/actions') diff --git a/test/actions/input.test.js b/test/actions/input.test.js new file mode 100644 index 0000000..a49a5bc --- /dev/null +++ b/test/actions/input.test.js @@ -0,0 +1,17 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as inputActions from '../../src/actions/input'; + +describe("input actions", () => { + describe("keyPress", () => { + let action = inputActions.keyPress(123, true); + expect(action.type).to.equal(actions.INPUT_KEY_PRESS); + expect(action.code).to.equal(123); + expect(action.ctrl).to.be.true; + }); + + describe("clearKeys", () => { + let action = inputActions.clearKeys(); + expect(action.type).to.equal(actions.INPUT_CLEAR_KEYS); + }); +}); diff --git a/test/reducers/input.test.js b/test/reducers/input.test.js new file mode 100644 index 0000000..d7a0855 --- /dev/null +++ b/test/reducers/input.test.js @@ -0,0 +1,34 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +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', []); + }); + + it('return next state for INPUT_KEY_PRESS', () => { + let action = { type: actions.INPUT_KEY_PRESS, code: 123, ctrl: true }; + let state = inputReducer(undefined, action); + expect(state).to.have.deep.property('keys', [{ code: 123, ctrl: true }]); + + action = { type: actions.INPUT_KEY_PRESS, code: 456, ctrl: false }; + state = inputReducer(state, action); + expect(state).to.have.deep.property('keys', [ + { code: 123, ctrl: true }, + { code: 456, ctrl: false } + ]); + }); + + 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', []); + }); +}); -- cgit v1.2.3 From 2190a525b40a102851121c40654dcde2bb5ac6b3 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 11 Sep 2017 21:37:32 +0900 Subject: add command actions test --- src/actions/command.js | 2 +- test/actions/command.test.js | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 test/actions/command.test.js (limited to 'test/actions') diff --git a/src/actions/command.js b/src/actions/command.js index 982255c..c983278 100644 --- a/src/actions/command.js +++ b/src/actions/command.js @@ -22,7 +22,7 @@ export function exec(line) { case 'tabopen': return { type: actions.COMMAND_TABOPEN_URL, - url: remaining + url: normalizeUrl(remaining) }; case 'b': case 'buffer': diff --git a/test/actions/command.test.js b/test/actions/command.test.js new file mode 100644 index 0000000..01a67f2 --- /dev/null +++ b/test/actions/command.test.js @@ -0,0 +1,51 @@ +import { expect } from "chai"; +import actions from '../../src/actions'; +import * as commandActions from '../../src/actions/command'; + +describe("command actions", () => { + describe("exec", () => { + context("open command", () => { + it('create COMMAND_OPEN_URL acion with a full url', () => { + let action = commandActions.exec("open https://github.com/") + expect(action.type).to.equal(actions.COMMAND_OPEN_URL); + expect(action.url).to.equal('https://github.com/'); + }); + + it('create COMMAND_OPEN_URL acion with a domain name', () => { + let action = commandActions.exec("open github.com") + expect(action.type).to.equal(actions.COMMAND_OPEN_URL); + expect(action.url).to.equal('http://github.com'); + }); + }); + + context("tabopen command", () => { + it('create COMMAND_TABOPEN_URL acion with a full url', () => { + let action = commandActions.exec("tabopen https://github.com/") + expect(action.type).to.equal(actions.COMMAND_TABOPEN_URL); + expect(action.url).to.equal('https://github.com/'); + }); + + it('create COMMAND_TABOPEN_URL acion with a domain name', () => { + let action = commandActions.exec("tabopen github.com") + expect(action.type).to.equal(actions.COMMAND_TABOPEN_URL); + expect(action.url).to.equal('http://github.com'); + }); + }); + + context("buffer command", () => { + it('create COMMAND_BUFFER acion with a keywords', () => { + let action = commandActions.exec("buffer foo bar") + expect(action.type).to.equal(actions.COMMAND_BUFFER); + expect(action.keywords).to.equal('foo bar'); + }); + }); + + context("b command", () => { + it('create COMMAND_BUFFER acion with a keywords', () => { + let action = commandActions.exec("b foo bar") + expect(action.type).to.equal(actions.COMMAND_BUFFER); + expect(action.keywords).to.equal('foo bar'); + }); + }); + }); +}); -- cgit v1.2.3 From 7bc569eac745b97137e1db8b9271493b3e5c8a20 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 11 Sep 2017 21:37:51 +0900 Subject: fix input actions test --- test/actions/input.test.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'test/actions') diff --git a/test/actions/input.test.js b/test/actions/input.test.js index a49a5bc..9ec6de4 100644 --- a/test/actions/input.test.js +++ b/test/actions/input.test.js @@ -4,14 +4,18 @@ import * as inputActions from '../../src/actions/input'; describe("input actions", () => { describe("keyPress", () => { - let action = inputActions.keyPress(123, true); - expect(action.type).to.equal(actions.INPUT_KEY_PRESS); - expect(action.code).to.equal(123); - expect(action.ctrl).to.be.true; + it('create INPUT_KEY_PRESS action', () => { + let action = inputActions.keyPress(123, true); + expect(action.type).to.equal(actions.INPUT_KEY_PRESS); + expect(action.code).to.equal(123); + expect(action.ctrl).to.be.true; + }); }); describe("clearKeys", () => { - let action = inputActions.clearKeys(); - expect(action.type).to.equal(actions.INPUT_CLEAR_KEYS); + it('create INPUT_CLEAR_KEYSaction', () => { + let action = inputActions.clearKeys(); + expect(action.type).to.equal(actions.INPUT_CLEAR_KEYS); + }); }); }); -- cgit v1.2.3