Merge remote-tracking branch 'origin/master' into websocket

Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx

2 files changed, 39 insertions, 4 deletions

diff --git a/web/src/js/__tests__/ducks/ui.js b/web/src/js/__tests__/ducks/ui.js
new file mode 100644
index 00000000..81ae852c
--- /dev/null
+++ b/web/src/js/__tests__/ducks/ui.js
@@ -0,0 +1,35 @@
+jest.unmock("../../ducks/ui");
+jest.unmock("../../ducks/flows");
+
+import reducer, {setActiveMenu} from '../../ducks/ui';
+import {SELECT_FLOW} from '../../ducks/flows';
+
+describe("ui reducer", () => {
+    it("should return the initial state", () => {
+        expect(reducer(undefined, {})).toEqual({ activeMenu: 'Start'})
+    }),
+    it("should return the state for view", () => {
+        expect(reducer(undefined, setActiveMenu('View'))).toEqual({ activeMenu: 'View'})
+    }),
+    it("should change the state to Start when deselecting a flow and we a currently at the flow tab", () => {
+        expect(reducer({activeMenu: 'Flow'},
+            { type: SELECT_FLOW,
+              currentSelection: '1',
+              flowId : undefined
+            })).toEqual({ activeMenu: 'Start'})
+    }),
+    it("should change the state to Flow when we selected a flow and no flow was selected before", () => {
+        expect(reducer({activeMenu: 'Start'},
+            { type: SELECT_FLOW,
+              currentSelection: undefined,
+              flowId : '1'
+            })).toEqual({ activeMenu: 'Flow'})
+    }),
+    it("should not change the state to Flow when OPTIONS tab is selected and we selected a flow and a flow as selected before", () => {
+        expect(reducer({activeMenu: 'Options'},
+            { type: SELECT_FLOW,
+              currentSelection: '1',
+              flowId : '2'
+            })).toEqual({ activeMenu: 'Options'})
+    })
+});
diff --git a/web/src/js/__tests__/utils.js b/web/src/js/__tests__/utils.js
index eda740a1..b216d7d4 100644
--- a/web/src/js/__tests__/utils.js
+++ b/web/src/js/__tests__/utils.js
@@ -1,9 +1,9 @@
-jest.unmock("../utils.js");
+jest.unmock("../utils");
 
-import {formatSize} from "../utils.js"
+import {formatSize} from "../utils"
 
-describe("utils", function () {
-    it("formatSize", function(){
+describe("utils", () => {
+    it("formatSize", () => {
         expect(formatSize(1024)).toEqual("1kb");
         expect(formatSize(0)).toEqual("0");
         expect(formatSize(10)).toEqual("10b");