diff options
-rw-r--r-- | src/content/actions/mark.js | 3 | ||||
-rw-r--r-- | src/content/reducers/mark.js | 2 | ||||
-rw-r--r-- | test/content/actions/mark.test.js | 3 | ||||
-rw-r--r-- | test/content/reducers/mark.test.js | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/content/actions/mark.js b/src/content/actions/mark.js index baf5825..1f5174e 100644 --- a/src/content/actions/mark.js +++ b/src/content/actions/mark.js @@ -12,10 +12,11 @@ const cancel = () => { return { type: actions.MARK_CANCEL }; }; -const setLocal = (key, y) => { +const setLocal = (key, x, y) => { return { type: actions.MARK_SET_LOCAL, key, + x, y, }; }; diff --git a/src/content/reducers/mark.js b/src/content/reducers/mark.js index b6137f3..2c96cc5 100644 --- a/src/content/reducers/mark.js +++ b/src/content/reducers/mark.js @@ -16,7 +16,7 @@ export default function reducer(state = defaultState, action = {}) { return { ...state, setMode: false, jumpMode: false }; case actions.MARK_SET_LOCAL: { let marks = { ...state.marks }; - marks[action.key] = { y: action.y }; + marks[action.key] = { x: action.x, y: action.y }; return { ...state, setMode: false, marks }; } default: diff --git a/test/content/actions/mark.test.js b/test/content/actions/mark.test.js index 47d31cd..adbf06b 100644 --- a/test/content/actions/mark.test.js +++ b/test/content/actions/mark.test.js @@ -25,9 +25,10 @@ describe('mark actions', () => { describe('setLocal', () => { it('create setLocal action', () => { - let action = markActions.setLocal('a', 30); + let action = markActions.setLocal('a', 20, 30); expect(action.type).to.equal(actions.MARK_SET_LOCAL); expect(action.key).to.equal('a'); + expect(action.x).to.equal(20); expect(action.y).to.equal(30); }); }); diff --git a/test/content/reducers/mark.test.js b/test/content/reducers/mark.test.js index 6358bf1..76efbf7 100644 --- a/test/content/reducers/mark.test.js +++ b/test/content/reducers/mark.test.js @@ -31,9 +31,11 @@ describe("mark reducer", () => { }); it('stores local mark', () => { - let action = { type: actions.MARK_SET_LOCAL, key: 'a', y: 10 }; - let state = reducer(undefined, action); + let action = { type: actions.MARK_SET_LOCAL, key: 'a', x: 20, y: 30}; + let state = reducer({ setMode: true }, action); + expect(state.setMode).to.be.false; expect(state.marks['a']).to.be.an('object') - expect(state.marks['a'].y).to.equal(10) + expect(state.marks['a'].x).to.equal(20) + expect(state.marks['a'].y).to.equal(30) }); }); |