aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/__tests__
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-27 14:55:08 -0700
committerGitHub <noreply@github.com>2016-07-27 14:55:08 -0700
commit3aad0119884918e7718bc70d650d3ae99a27bbaa (patch)
tree69fd251d88a261108868724690a9c92f6e171616 /web/src/js/__tests__
parent41383b866ee77c0122e14f0df6d435e70b7f59fc (diff)
parent2b9e5dcd1b93792bcfa1df07352cff1ecffbf36d (diff)
downloadmitmproxy-3aad0119884918e7718bc70d650d3ae99a27bbaa.tar.gz
mitmproxy-3aad0119884918e7718bc70d650d3ae99a27bbaa.tar.bz2
mitmproxy-3aad0119884918e7718bc70d650d3ae99a27bbaa.zip
Merge pull request #1406 from gzzhanghao/fix36
[web] Update view with sortedUpdate
Diffstat (limited to 'web/src/js/__tests__')
-rw-r--r--web/src/js/__tests__/ducks/flowViewSpec.js (renamed from web/src/js/__tests__/ducks/flowView.js)0
-rw-r--r--web/src/js/__tests__/ducks/flowsSpec.js (renamed from web/src/js/__tests__/ducks/flows.js)0
-rw-r--r--web/src/js/__tests__/ducks/ui/headerSpec.js (renamed from web/src/js/__tests__/ducks/ui.js)10
-rw-r--r--web/src/js/__tests__/ducks/utils/listSpec.js (renamed from web/src/js/__tests__/ducks/utils/list.js)0
-rw-r--r--web/src/js/__tests__/ducks/utils/viewSpec.js (renamed from web/src/js/__tests__/ducks/utils/view.js)6
5 files changed, 9 insertions, 7 deletions
diff --git a/web/src/js/__tests__/ducks/flowView.js b/web/src/js/__tests__/ducks/flowViewSpec.js
index d5d9a6d9..d5d9a6d9 100644
--- a/web/src/js/__tests__/ducks/flowView.js
+++ b/web/src/js/__tests__/ducks/flowViewSpec.js
diff --git a/web/src/js/__tests__/ducks/flows.js b/web/src/js/__tests__/ducks/flowsSpec.js
index 2b261cb1..2b261cb1 100644
--- a/web/src/js/__tests__/ducks/flows.js
+++ b/web/src/js/__tests__/ducks/flowsSpec.js
diff --git a/web/src/js/__tests__/ducks/ui.js b/web/src/js/__tests__/ducks/ui/headerSpec.js
index d3242815..8968e636 100644
--- a/web/src/js/__tests__/ducks/ui.js
+++ b/web/src/js/__tests__/ducks/ui/headerSpec.js
@@ -1,10 +1,10 @@
-jest.unmock('../../ducks/ui')
-jest.unmock('../../ducks/flows')
+jest.unmock('../../../ducks/ui/header')
+jest.unmock('../../../ducks/flows')
-import reducer, { setActiveMenu } from '../../ducks/ui'
-import * as flowActions from '../../ducks/flows'
+import reducer, { setActiveMenu } from '../../../ducks/ui/header'
+import * as flowActions from '../../../ducks/flows'
-describe('ui reducer', () => {
+describe('header reducer', () => {
it('should return the initial state', () => {
expect(reducer(undefined, {}).activeMenu).toEqual('Start')
})
diff --git a/web/src/js/__tests__/ducks/utils/list.js b/web/src/js/__tests__/ducks/utils/listSpec.js
index 72d162f2..72d162f2 100644
--- a/web/src/js/__tests__/ducks/utils/list.js
+++ b/web/src/js/__tests__/ducks/utils/listSpec.js
diff --git a/web/src/js/__tests__/ducks/utils/view.js b/web/src/js/__tests__/ducks/utils/viewSpec.js
index f0b147da..af3da173 100644
--- a/web/src/js/__tests__/ducks/utils/view.js
+++ b/web/src/js/__tests__/ducks/utils/viewSpec.js
@@ -66,11 +66,13 @@ describe('view reduce', () => {
it('should update item', () => {
const state = createState([
{ id: 1, val: 1 },
- { id: 2, val: 2 }
+ { id: 2, val: 2 },
+ { id: 3, val: 3 }
])
const result = createState([
{ id: 1, val: 1 },
- { id: 2, val: 3 }
+ { id: 2, val: 3 },
+ { id: 3, val: 3 }
])
expect(reduce(state, view.update({ id: 2, val: 3 }))).toEqual(result)
})