diff options
author | Maximilian Hils <git@maximilianhils.com> | 2017-10-26 16:34:24 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2017-10-26 16:34:24 +0200 |
commit | 9d514330cad64e589987b5e539809ae95d14e137 (patch) | |
tree | 36a9f99eac2f97adec453356b22e716c24a13d72 /web/src/js | |
parent | c2401e35f4483e68116b8e90bb58b70659ace682 (diff) | |
download | mitmproxy-9d514330cad64e589987b5e539809ae95d14e137.tar.gz mitmproxy-9d514330cad64e589987b5e539809ae95d14e137.tar.bz2 mitmproxy-9d514330cad64e589987b5e539809ae95d14e137.zip |
[web] adjust tests
Diffstat (limited to 'web/src/js')
9 files changed, 36 insertions, 84 deletions
diff --git a/web/src/js/__tests__/components/FlowTableSpec.js b/web/src/js/__tests__/components/FlowTableSpec.js index 4d8de12c..f63b28fc 100644 --- a/web/src/js/__tests__/components/FlowTableSpec.js +++ b/web/src/js/__tests__/components/FlowTableSpec.js @@ -1,6 +1,6 @@ import React from 'react' import renderer from 'react-test-renderer' -import FlowTable from '../../components/FlowTable' +import {PureFlowTable as FlowTable} from '../../components/FlowTable' import TestUtils from 'react-dom/test-utils' import { TFlow, TStore } from '../ducks/tutils' import { Provider } from 'react-redux' diff --git a/web/src/js/__tests__/components/Header/FileMenuSpec.js b/web/src/js/__tests__/components/Header/FileMenuSpec.js index 0d87530b..2f4e746d 100644 --- a/web/src/js/__tests__/components/Header/FileMenuSpec.js +++ b/web/src/js/__tests__/components/Header/FileMenuSpec.js @@ -49,10 +49,4 @@ describe('FileMenu Component', () => { a.props.onClick(mockEvent) expect(saveFn).toBeCalled() }) - - it('should open optionModal', () => { - let a = ul.children[3].children[1] - a.props.onClick(mockEvent) - expect(openModalFn).toBeCalled() - }) }) diff --git a/web/src/js/__tests__/components/Header/__snapshots__/FileMenuSpec.js.snap b/web/src/js/__tests__/components/Header/__snapshots__/FileMenuSpec.js.snap index ef935914..f4018fcd 100644 --- a/web/src/js/__tests__/components/Header/__snapshots__/FileMenuSpec.js.snap +++ b/web/src/js/__tests__/components/Header/__snapshots__/FileMenuSpec.js.snap @@ -63,15 +63,6 @@ exports[`FileMenu Component should render correctly 1`] = ` </li> <li> - <a - href="#" - onClick={[Function]} - > - <i - className="fa fa-fw fa-cog" - /> - Options - </a> <hr className="divider" /> diff --git a/web/src/js/__tests__/components/Header/__snapshots__/FlowMenuSpec.js.snap b/web/src/js/__tests__/components/Header/__snapshots__/FlowMenuSpec.js.snap index b0b28f1b..2ed3600e 100644 --- a/web/src/js/__tests__/components/Header/__snapshots__/FlowMenuSpec.js.snap +++ b/web/src/js/__tests__/components/Header/__snapshots__/FlowMenuSpec.js.snap @@ -33,7 +33,7 @@ exports[`FlowMenu Component should connect to state 1`] = ` <div className="btn btn-default" disabled={true} - onClick={false} + onClick={undefined} title="revert changes to flow [V]" > <i @@ -92,7 +92,7 @@ exports[`FlowMenu Component should connect to state 1`] = ` <div className="btn btn-default" disabled={true} - onClick={false} + onClick={undefined} title="[a]ccept intercepted flow" > <i @@ -103,7 +103,7 @@ exports[`FlowMenu Component should connect to state 1`] = ` <div className="btn btn-default" disabled={true} - onClick={false} + onClick={undefined} title="kill intercepted flow [x]" > <i diff --git a/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap b/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap index 9299e69f..83d9355c 100644 --- a/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap +++ b/web/src/js/__tests__/components/Header/__snapshots__/OptionMenuSpec.js.snap @@ -9,46 +9,24 @@ exports[`OptionMenu Component should render correctly 1`] = ` className="menu-content" > <div - className="menu-entry" - > - <label> - <input - checked={false} - onChange={[Function]} - type="checkbox" - /> - HTTP/2.0 - </label> - </div> - <div - className="menu-entry" - > - <label> - <input - checked={false} - onChange={[Function]} - type="checkbox" - /> - WebSockets - </label> - </div> - <div - className="menu-entry" + className="btn btn-default" + disabled={undefined} + onClick={[Function]} + title="Open Options" > - <label> - <input - checked={false} - onChange={[Function]} - type="checkbox" - /> - Raw TCP - </label> + <i + className="fa fa-fw fa-cogs text-primary" + /> + Edit Options + <sup> + alpha + </sup> </div> </div> <div className="menu-legend" > - Protocol Support + Options Editor </div> </div> <div @@ -66,7 +44,7 @@ exports[`OptionMenu Component should render correctly 1`] = ` onChange={[Function]} type="checkbox" /> - Disable Caching + Strip cache headers <a href="http://docs.mitmproxy.org/en/stable/features/anticache.html" target="_blank" @@ -86,18 +64,26 @@ exports[`OptionMenu Component should render correctly 1`] = ` onChange={[Function]} type="checkbox" /> - Disable Compression - <i - className="fa fa-question-circle" - title="Do not forward Accept-Encoding headers to the server to force an uncompressed response." + Use host header for display + </label> + </div> + <div + className="menu-entry" + > + <label> + <input + checked={false} + onChange={[Function]} + type="checkbox" /> + Verify server certificates </label> </div> </div> <div className="menu-legend" > - HTTP Options + Quick Options </div> </div> <div @@ -111,22 +97,6 @@ exports[`OptionMenu Component should render correctly 1`] = ` > <label> <input - checked={false} - onChange={[Function]} - type="checkbox" - /> - Use Host Header - <i - className="fa fa-question-circle" - title="Use the Host header to construct URLs for display." - /> - </label> - </div> - <div - className="menu-entry" - > - <label> - <input checked={true} onChange={[Function]} type="checkbox" diff --git a/web/src/js/__tests__/components/common/__snapshots__/ButtonSpec.js.snap b/web/src/js/__tests__/components/common/__snapshots__/ButtonSpec.js.snap index 1d403b2d..8b1c9d6d 100644 --- a/web/src/js/__tests__/components/common/__snapshots__/ButtonSpec.js.snap +++ b/web/src/js/__tests__/components/common/__snapshots__/ButtonSpec.js.snap @@ -4,7 +4,7 @@ exports[`Button Component should be able to be disabled 1`] = ` <div className="classname btn btn-default" disabled="true" - onClick={false} + onClick={undefined} title={undefined} > <a> diff --git a/web/src/js/__tests__/ducks/flowsSpec.js b/web/src/js/__tests__/ducks/flowsSpec.js index 5bd866f2..d749d9e1 100644 --- a/web/src/js/__tests__/ducks/flowsSpec.js +++ b/web/src/js/__tests__/ducks/flowsSpec.js @@ -157,7 +157,9 @@ describe('flows actions', () => { file = new window.Blob(['foo'], { type: 'plain/text' }) body.append('file', file) store.dispatch(flowActions.uploadContent(tflow, 'foo', 'foo')) - expect(fetchApi).toBeCalledWith('/flows/1/foo/content', { method: 'POST', body}) + // window.Blob's lastModified is always the current time, + // which causes flaky tests on comparison. + expect(fetchApi).toBeCalledWith('/flows/1/foo/content', { method: 'POST', body: expect.anything()}) }) it('should handle clear action', () => { diff --git a/web/src/js/__tests__/utilsSpec.js b/web/src/js/__tests__/utilsSpec.js index 9a1a0750..d0beca14 100644 --- a/web/src/js/__tests__/utilsSpec.js +++ b/web/src/js/__tests__/utilsSpec.js @@ -83,11 +83,6 @@ describe('pure', () => { expect(utils.pure(tFunc).displayName).toEqual('tFunc') }) - it('should suggest when should component update', () => { - expect(f.shouldComponentUpdate('foo')).toBeTruthy() - expect(f.shouldComponentUpdate('bar')).toBeFalsy() - }) - it('should render properties', () => { expect(f.render()).toEqual(tFunc('bar')) }) diff --git a/web/src/js/components/FlowTable.jsx b/web/src/js/components/FlowTable.jsx index e3e3d505..a6381d0d 100644 --- a/web/src/js/components/FlowTable.jsx +++ b/web/src/js/components/FlowTable.jsx @@ -121,7 +121,7 @@ class FlowTable extends React.Component { } } -FlowTable = AutoScroll(FlowTable) +export const PureFlowTable = AutoScroll(FlowTable) export default connect( state => ({ @@ -132,4 +132,4 @@ export default connect( { selectFlow: flowsActions.select, } -)(FlowTable) +)(PureFlowTable) |