From 5df0ddf358367dcd37c934798464ad91f3c7bdf8 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Fri, 19 May 2017 09:49:10 +0800 Subject: [web] Updates test to use the new _tflow.js. --- .../components/FlowTable/FlowColumnsSpec.js | 50 +++++++++++----------- .../__snapshots__/FlowColumnsSpec.js.snap | 16 +++---- web/src/js/__tests__/ducks/tutils.js | 27 ------------ 3 files changed, 30 insertions(+), 63 deletions(-) (limited to 'web/src/js') diff --git a/web/src/js/__tests__/components/FlowTable/FlowColumnsSpec.js b/web/src/js/__tests__/components/FlowTable/FlowColumnsSpec.js index 576838f4..7f30b809 100644 --- a/web/src/js/__tests__/components/FlowTable/FlowColumnsSpec.js +++ b/web/src/js/__tests__/components/FlowTable/FlowColumnsSpec.js @@ -1,101 +1,101 @@ import React from 'react' import renderer from 'react-test-renderer' import * as Columns from '../../../components/FlowTable/FlowColumns' -import { TFlow } from '../../ducks/tutils' +import _tflow from '../../ducks/_tflow' describe('FlowColumns Components', () => { - let tFlow = new TFlow() + let tflow = _tflow() it('should render TLSColumn', () => { - let tlsColumn = renderer.create(), + let tlsColumn = renderer.create(), tree = tlsColumn.toJSON() expect(tree).toMatchSnapshot() }) it('should render IconColumn', () => { - let iconColumn = renderer.create(), + let iconColumn = renderer.create(), tree = iconColumn.toJSON() // plain expect(tree).toMatchSnapshot() // not modified - tFlow.response.status_code = 304 - iconColumn = renderer.create() + tflow.response.status_code = 304 + iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() // redirect - tFlow.response.status_code = 302 - iconColumn = renderer.create() + tflow.response.status_code = 302 + iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() // image - let imageFlow = new TFlow() + let imageFlow = _tflow() imageFlow.response.headers = [['Content-Type', 'image/jpeg']] iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() // javascript - let jsFlow = new TFlow() + let jsFlow = _tflow() jsFlow.response.headers = [['Content-Type', 'application/x-javascript']] iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() // css - let cssFlow = new TFlow() + let cssFlow = _tflow() cssFlow.response.headers = [['Content-Type', 'text/css']] iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() // default - let fooFlow = new TFlow() + let fooFlow = _tflow() fooFlow.response.headers = [['Content-Type', 'foo']] iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() // no response - tFlow.response = null - iconColumn = renderer.create() + tflow.response = null + iconColumn = renderer.create() tree = iconColumn.toJSON() expect(tree).toMatchSnapshot() }) it('should render pathColumn', () => { - let pathColumn = renderer.create(), + let pathColumn = renderer.create(), tree = pathColumn.toJSON() expect(tree).toMatchSnapshot() - tFlow.error.msg = 'Connection killed' - tFlow.intercepted = true - pathColumn = renderer.create() + tflow.error.msg = 'Connection killed' + tflow.intercepted = true + pathColumn = renderer.create() tree = pathColumn.toJSON() expect(tree).toMatchSnapshot() }) it('should render MethodColumn', () => { - let methodColumn =renderer.create(), + let methodColumn =renderer.create(), tree = methodColumn.toJSON() expect(tree).toMatchSnapshot() }) it('should render StatusColumn', () => { - let statusColumn = renderer.create(), + let statusColumn = renderer.create(), tree = statusColumn.toJSON() expect(tree).toMatchSnapshot() }) it('should render SizeColumn', () => { - tFlow = new TFlow() - let sizeColumn = renderer.create(), + tflow = _tflow() + let sizeColumn = renderer.create(), tree = sizeColumn.toJSON() expect(tree).toMatchSnapshot() }) it('should render TimeColumn', () => { - let timeColumn = renderer.create(), + let timeColumn = renderer.create(), tree = timeColumn.toJSON() expect(tree).toMatchSnapshot() - tFlow.response = null - timeColumn = renderer.create(), + tflow.response = null + timeColumn = renderer.create(), tree = timeColumn.toJSON() expect(tree).toMatchSnapshot() }) diff --git a/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowColumnsSpec.js.snap b/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowColumnsSpec.js.snap index ec260e1e..c74f686e 100644 --- a/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowColumnsSpec.js.snap +++ b/web/src/js/__tests__/components/FlowTable/__snapshots__/FlowColumnsSpec.js.snap @@ -5,7 +5,7 @@ exports[`FlowColumns Components should render IconColumn 1`] = ` className="col-icon" >
`; @@ -92,7 +92,7 @@ exports[`FlowColumns Components should render SizeColumn 1`] = ` - 100b + 14b `; @@ -112,7 +112,7 @@ exports[`FlowColumns Components should render TimeColumn 1`] = ` - 2min + 415322h `; @@ -128,13 +128,10 @@ exports[`FlowColumns Components should render pathColumn 1`] = ` - - http://undefined:undefinedundefined + http://address:22/path `; @@ -142,15 +139,12 @@ exports[`FlowColumns Components should render pathColumn 2`] = ` - - http://undefined:undefinedundefined + http://address:22/path `; diff --git a/web/src/js/__tests__/ducks/tutils.js b/web/src/js/__tests__/ducks/tutils.js index f140222d..6ae7f080 100644 --- a/web/src/js/__tests__/ducks/tutils.js +++ b/web/src/js/__tests__/ducks/tutils.js @@ -7,30 +7,3 @@ export function createStore(parts) { applyMiddleware(...[thunk]) ) } - -export function TFlow(intercepted=false, marked=false, modified=false) { - return { - intercepted , - marked, - modified, - id: "foo", - request: { - scheme: 'http', - is_replay: true, - method: 'GET', - contentLength: 100 - }, - response: { - status_code: 200, - headers: [["Content-Type", 'text/html']], - timestamp_end: 200 - }, - error: { - msg: '' - }, - server_conn: { - timestamp_start: 100 - }, - type: 'http' - } -} -- cgit v1.2.3