3 files changed, 74 insertions, 1 deletions
diff --git a/test/mitmproxy/addons/test_core.py b/test/mitmproxy/addons/test_core.py
index 64d0fa19..302b78ae 100644
--- a/test/mitmproxy/addons/test_core.py
+++ b/test/mitmproxy/addons/test_core.py
@@ -61,3 +61,42 @@ def test_revert():
         assert f.modified()
         sa.revert([f])
         assert not f.modified()
+
+
+def test_flow_set():
+    sa = core.Core()
+    with taddons.context():
+        f = tflow.tflow(resp=True)
+        assert sa.flow_set_options()
+
+        with pytest.raises(exceptions.CommandError):
+            sa.flow_set([f], "flibble", "post")
+
+        assert f.request.method != "post"
+        sa.flow_set([f], "method", "post")
+        assert f.request.method == "POST"
+
+        assert f.request.host != "testhost"
+        sa.flow_set([f], "host", "testhost")
+        assert f.request.host == "testhost"
+
+        assert f.request.path != "/test/path"
+        sa.flow_set([f], "path", "/test/path")
+        assert f.request.path == "/test/path"
+
+        assert f.request.url != "http://foo.com/bar"
+        sa.flow_set([f], "url", "http://foo.com/bar")
+        assert f.request.url == "http://foo.com/bar"
+        with pytest.raises(exceptions.CommandError):
+            sa.flow_set([f], "url", "oink")
+
+        assert f.response.status_code != 404
+        sa.flow_set([f], "status_code", "404")
+        assert f.response.status_code == 404
+        assert f.response.reason == "Not Found"
+        with pytest.raises(exceptions.CommandError):
+            sa.flow_set([f], "status_code", "oink")
+
+        assert f.response.reason != "foo"
+        sa.flow_set([f], "reason", "foo")
+        assert f.response.reason == "foo"
diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py
index 1724da49..eca4b546 100644
--- a/test/mitmproxy/addons/test_view.py
+++ b/test/mitmproxy/addons/test_view.py
@@ -218,7 +218,7 @@ def test_resolve():
             tctx.command(v.resolve, "~")
 
 
-def test_go():
+def test_movement():
     v = view.View()
     with taddons.context():
         v.add([
@@ -240,6 +240,11 @@ def test_go():
         v.go(-999)
         assert v.focus.index == 0
 
+        v.focus_next()
+        assert v.focus.index == 1
+        v.focus_prev()
+        assert v.focus.index == 0
+
 
 def test_duplicate():
     v = view.View()
diff --git a/test/mitmproxy/tools/console/test_keymap.py b/test/mitmproxy/tools/console/test_keymap.py
new file mode 100644
index 00000000..6a75800e
--- /dev/null
+++ b/test/mitmproxy/tools/console/test_keymap.py
@@ -0,0 +1,29 @@
+from mitmproxy.tools.console import keymap
+from mitmproxy.test import taddons
+from unittest import mock
+import pytest
+
+
+def test_bind():
+        with taddons.context() as tctx:
+            km = keymap.Keymap(tctx.master)
+            km.executor = mock.Mock()
+
+            with pytest.raises(ValueError):
+                km.add("foo", "bar", ["unsupported"])
+
+            km.add("key", "str", ["options", "commands"])
+            assert km.get("options", "key")
+            assert km.get("commands", "key")
+            assert not km.get("flowlist", "key")
+
+            km.handle("unknown", "unknown")
+            assert not km.executor.called
+
+            km.handle("options", "key")
+            assert km.executor.called
+
+            km.add("glob", "str", ["global"])
+            km.executor = mock.Mock()
+            km.handle("options", "glob")
+            assert km.executor.called