Merge pull request #2397 from cortesi/neverenoughconsole

console: keymap-related improvements

1 files changed, 40 insertions, 0 deletions

diff --git a/test/mitmproxy/tools/console/test_keymap.py b/test/mitmproxy/tools/console/test_keymap.py
index bbca4ac9..00e64991 100644
--- a/test/mitmproxy/tools/console/test_keymap.py
+++ b/test/mitmproxy/tools/console/test_keymap.py
@@ -4,6 +4,11 @@ from unittest import mock
 import pytest
 
 
+def test_binding():
+    b = keymap.Binding("space", "cmd", ["options"], "")
+    assert b.keyspec() == " "
+
+
 def test_bind():
     with taddons.context() as tctx:
         km = keymap.Keymap(tctx.master)
@@ -30,3 +35,38 @@ def test_bind():
         assert km.executor.called
 
         assert len((km.list("global"))) == 1
+
+
+def test_join():
+    with taddons.context() as tctx:
+        km = keymap.Keymap(tctx.master)
+        km.add("key", "str", ["options"], "help1")
+        km.add("key", "str", ["commands"])
+        return
+        assert len(km.bindings) == 1
+        assert len(km.bindings[0].contexts) == 2
+        assert km.bindings[0].help == "help1"
+        km.add("key", "str", ["commands"], "help2")
+        assert len(km.bindings) == 1
+        assert len(km.bindings[0].contexts) == 2
+        assert km.bindings[0].help == "help2"
+
+        assert km.get("commands", "key")
+        km.unbind(km.bindings[0])
+        assert len(km.bindings) == 0
+        assert not km.get("commands", "key")
+
+
+def test_remove():
+    with taddons.context() as tctx:
+        km = keymap.Keymap(tctx.master)
+        km.add("key", "str", ["options", "commands"], "help1")
+        assert len(km.bindings) == 1
+        assert "options" in km.bindings[0].contexts
+
+        km.remove("key", ["options"])
+        assert len(km.bindings) == 1
+        assert "options" not in km.bindings[0].contexts
+
+        km.remove("key", ["commands"])
+        assert len(km.bindings) == 0