aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/__tests__/ducks/utils
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-08-09 19:49:36 +0200
committerClemens <cle1000.cb@gmail.com>2016-08-09 19:49:36 +0200
commitb27e456ce2150d638b4eef73703da8a30722d392 (patch)
tree2ba82b15f1bdf22f12b7d97e726dcbd19374e9cf /web/src/js/__tests__/ducks/utils
parent78bd99f97c36ba24bbab389350eb8e80ba16738f (diff)
parentdcfa7027aed5a8d4aa80aff67fc299298659fb1b (diff)
downloadmitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.gz
mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.bz2
mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.zip
merge with master
Diffstat (limited to 'web/src/js/__tests__/ducks/utils')
-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
2 files changed, 4 insertions, 2 deletions
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)
})