diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-03-12 23:33:49 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2017-03-12 23:33:49 +0100 |
| commit | 05e11547f5875a4b5b3c109db8a1db477d1986ad (patch) | |
| tree | 5c6c5acb7fedeee2e62fc5266d0d9211421fdfa5 /web/src/js/__tests__/ducks/flowsSpec.js | |
| parent | 0f4b523868856fccaf373c9108c9220a3aafb30b (diff) | |
| parent | 7d5ab70ce3a6deb70aa3e30e755fdee0f3b2fdeb (diff) | |
| download | mitmproxy-05e11547f5875a4b5b3c109db8a1db477d1986ad.tar.gz mitmproxy-05e11547f5875a4b5b3c109db8a1db477d1986ad.tar.bz2 mitmproxy-05e11547f5875a4b5b3c109db8a1db477d1986ad.zip | |
Merge remote-tracking branch 'origin/master' into pr-2120
Conflicts:
test/mitmproxy/addons/test_replace.py
Diffstat (limited to 'web/src/js/__tests__/ducks/flowsSpec.js')
| -rw-r--r-- | web/src/js/__tests__/ducks/flowsSpec.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/src/js/__tests__/ducks/flowsSpec.js b/web/src/js/__tests__/ducks/flowsSpec.js index 2b261cb1..acfa3083 100644 --- a/web/src/js/__tests__/ducks/flowsSpec.js +++ b/web/src/js/__tests__/ducks/flowsSpec.js @@ -1,13 +1,14 @@ jest.unmock('../../ducks/flows'); import reduceFlows, * as flowActions from '../../ducks/flows' +import * as storeActions from '../../ducks/utils/store' describe('select flow', () => { let state = reduceFlows(undefined, {}) for (let i of [1, 2, 3, 4]) { - state = reduceFlows(state, flowActions.addFlow({ id: i })) + state = reduceFlows(state, storeActions.add({ id: i })) } it('should be possible to select a single flow', () => { |