aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/content/actions/find.js10
-rw-r--r--src/content/actions/index.js2
-rw-r--r--src/content/reducers/find.js9
-rw-r--r--test/content/actions/find.test.js19
-rw-r--r--test/content/reducers/find.test.js33
5 files changed, 11 insertions, 62 deletions
diff --git a/src/content/actions/find.js b/src/content/actions/find.js
index ac1b842..80d6210 100644
--- a/src/content/actions/find.js
+++ b/src/content/actions/find.js
@@ -14,14 +14,6 @@ const postPatternNotFound = (pattern) => {
'Pattern not found: ' + pattern);
};
-const show = () => {
- return { type: actions.FIND_SHOW };
-};
-
-const hide = () => {
- return { type: actions.FIND_HIDE };
-};
-
const find = (string, backwards) => {
let caseSensitive = false;
let wrapScan = true;
@@ -60,4 +52,4 @@ const prev = (keyword, reset) => {
return findNext(keyword, reset, true);
};
-export { show, hide, next, prev };
+export { next, prev };
diff --git a/src/content/actions/index.js b/src/content/actions/index.js
index a727e13..7e32e12 100644
--- a/src/content/actions/index.js
+++ b/src/content/actions/index.js
@@ -23,7 +23,5 @@ export default {
FOLLOW_CONTROLLER_BACKSPACE: 'follow.controller.backspace',
// Find
- FIND_SHOW: 'find.show',
- FIND_HIDE: 'find.hide',
FIND_SET_KEYWORD: 'find.set.keyword',
};
diff --git a/src/content/reducers/find.js b/src/content/reducers/find.js
index f0bfbeb..eb43c37 100644
--- a/src/content/reducers/find.js
+++ b/src/content/reducers/find.js
@@ -1,21 +1,12 @@
import actions from 'content/actions';
const defaultState = {
- enabled: false,
keyword: '',
found: false,
};
export default function reducer(state = defaultState, action = {}) {
switch (action.type) {
- case actions.FIND_SHOW:
- return Object.assign({}, state, {
- enabled: true,
- });
- case actions.FIND_HIDE:
- return Object.assign({}, state, {
- enabled: false,
- });
case actions.FIND_SET_KEYWORD:
return Object.assign({}, state, {
keyword: action.keyword,
diff --git a/test/content/actions/find.test.js b/test/content/actions/find.test.js
deleted file mode 100644
index 676e105..0000000
--- a/test/content/actions/find.test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { expect } from "chai";
-import actions from 'content/actions';
-import * as findActions from 'content/actions/find';
-
-describe("find actions", () => {
- describe("show", () => {
- it('create FIND_SHOW action', () => {
- let action = findActions.show();
- expect(action.type).to.equal(actions.FIND_SHOW);
- });
- });
-
- describe("hide", () => {
- it('create FIND_HIDE action', () => {
- let action = findActions.hide();
- expect(action.type).to.equal(actions.FIND_HIDE);
- });
- });
-});
diff --git a/test/content/reducers/find.test.js b/test/content/reducers/find.test.js
index 3aacbd9..93625da 100644
--- a/test/content/reducers/find.test.js
+++ b/test/content/reducers/find.test.js
@@ -5,32 +5,19 @@ import findReducer from 'content/reducers/find';
describe("find reducer", () => {
it('return the initial state', () => {
let state = findReducer(undefined, {});
- expect(state).to.have.property('enabled', false);
expect(state).to.have.property('keyword', '');
- });
-
- it('return next state for FIND_SHOW', () => {
- let action = { type: actions.FIND_SHOW };
- let prev = { enabled: false };
- let state = findReducer(prev, action);
-
- expect(state.enabled).is.equal(true);
- });
-
- it('return next state for FIND_HIDE', () => {
- let action = { type: actions.FIND_HIDE };
- let prev = { enabled: true };
- let state = findReducer(prev, action);
-
- expect(state.enabled).is.equal(false);
+ expect(state).to.have.property('found', false);
});
it('return next state for FIND_SET_KEYWORD', () => {
- let action = { type: actions.FIND_SET_KEYWORD, keyword: 'my-search' };
- let state = { enabled: true, keyword: '' };
-
- state = findReducer(state, action);
-
- expect(state.keyword).is.equal('my-search');
+ let action = {
+ type: actions.FIND_SET_KEYWORD,
+ keyword: 'xyz',
+ found: true,
+ };
+ let state = findReducer({}, action);
+
+ expect(state.keyword).is.equal('xyz');
+ expect(state.found).to.be.true;
});
});