diff options
author | Maximilian Hils <git@maximilianhils.com> | 2017-06-12 13:34:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-12 13:34:56 +0200 |
commit | 33252cb6bb21c57c20edb4ec42963291ec40e096 (patch) | |
tree | cbad39f2dc45a54dfc17bc8ad46360ee8d75fb21 /web/src/js/__tests__ | |
parent | 2ceefe9582bd72778648d4f5a154e4d492716b80 (diff) | |
parent | c4804b5fe10e9ca13380cd5b9815e71ffc0d64d3 (diff) | |
download | mitmproxy-33252cb6bb21c57c20edb4ec42963291ec40e096.tar.gz mitmproxy-33252cb6bb21c57c20edb4ec42963291ec40e096.tar.bz2 mitmproxy-33252cb6bb21c57c20edb4ec42963291ec40e096.zip |
Merge pull request #2392 from mhils/web-fixes
[web] Update dependencies, minor fixes
Diffstat (limited to 'web/src/js/__tests__')
-rw-r--r-- | web/src/js/__tests__/components/FlowView/ToggleEditSpec.js | 3 | ||||
-rw-r--r-- | web/src/js/__tests__/ducks/ui/flowSpec.js | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/web/src/js/__tests__/components/FlowView/ToggleEditSpec.js b/web/src/js/__tests__/components/FlowView/ToggleEditSpec.js index 4578fdc8..ec3a8462 100644 --- a/web/src/js/__tests__/components/FlowView/ToggleEditSpec.js +++ b/web/src/js/__tests__/components/FlowView/ToggleEditSpec.js @@ -6,6 +6,7 @@ import { Provider } from 'react-redux' import { startEdit, stopEdit } from '../../../ducks/ui/flow' import { TFlow, TStore } from '../../ducks/tutils' +global.fetch = jest.fn() let tflow = new TFlow() describe('ToggleEdit Component', () => { @@ -24,7 +25,7 @@ describe('ToggleEdit Component', () => { it('should handle click on stopEdit', () => { tree.children[0].props.onClick() - expect(store.getActions()).toEqual([stopEdit(tflow, true)]) + expect(fetch).toBeCalled() }) it('should handle click on startEdit', () => { diff --git a/web/src/js/__tests__/ducks/ui/flowSpec.js b/web/src/js/__tests__/ducks/ui/flowSpec.js index cd6ffa2f..11ca021e 100644 --- a/web/src/js/__tests__/ducks/ui/flowSpec.js +++ b/web/src/js/__tests__/ducks/ui/flowSpec.js @@ -11,7 +11,7 @@ import reducer, { displayLarge } from '../../../ducks/ui/flow' -import { select, updateFlow } from '../../../ducks/flows' +import * as flowActions from '../../../ducks/flows' describe('flow reducer', () => { it('should return initial state', () => { @@ -61,11 +61,11 @@ describe('flow reducer', () => { }) it('should not change the contentview mode', () => { - expect(reducer({contentView: 'foo'}, select(1)).contentView).toEqual('foo') + expect(reducer({contentView: 'foo'}, flowActions.select(1)).contentView).toEqual('foo') }) it('should change the contentview mode to auto after editing when a new flow will be selected', () => { - expect(reducer({contentView: 'foo', modifiedFlow : 'test_flow'}, select(1)).contentView).toEqual('Auto') + expect(reducer({contentView: 'foo', modifiedFlow : 'test_flow'}, flowActions.select(1)).contentView).toEqual('Auto') }) it('should set update and merge the modifiedflow with the update values', () => { @@ -84,7 +84,11 @@ describe('flow reducer', () => { it('should stop editing when the selected flow is updated', () => { let modifiedFlow = {id: 1} let updatedFlow = {id: 1} - expect(reducer({modifiedFlow}, stopEdit(updatedFlow, modifiedFlow)).modifiedFlow).toBeFalsy() + expect(reducer( + { modifiedFlow }, + {type: flowActions.UPDATE, data: modifiedFlow} + ).modifiedFlow + ).toBeFalsy() }) it('should set content view', () => { |