fix tests

Author: rmorshea

docs/source/exts/widget_example.py

@@ -37,24 +37,6 @@ def run(self):
             self.state_machine,
         ).run()
 
-        example_tab = TabbedDirective(
-            "WidgetExample",
-            ["Live Example"],
-            {},
-            StringList(
-                [
-                    "",
-                    f"    .. interactive-widget:: {example_name}",
-                    "",
-                ]
-            ),
-            self.lineno - 1,
-            self.content_offset,
-            "",
-            self.state,
-            self.state_machine,
-        ).run()
-
         if (examples / f"{example_name}.js").exists():
             js_code_tab = TabbedDirective(
                 "WidgetExample",
@@ -77,7 +59,25 @@ def run(self):
         else:
             js_code_tab = []
 
-        return py_code_tab + example_tab + js_code_tab
+        example_tab = TabbedDirective(
+            "WidgetExample",
+            ["Live Example"],
+            {},
+            StringList(
+                [
+                    "",
+                    f"    .. interactive-widget:: {example_name}",
+                    "",
+                ]
+            ),
+            self.lineno - 1,
+            self.content_offset,
+            "",
+            self.state,
+            self.state_machine,
+        ).run()
+
+        return py_code_tab + js_code_tab + example_tab
 
 
 def setup(app: Sphinx) -> None:

idom/client/manage.py

@@ -43,7 +43,7 @@ def register_web_module(name: str, source: Union[str, Path]) -> str:
     if web_module_exists(name):
         raise ValueError(f"Web module {name} already exists")
     if not source_path.is_file():
-        raise ValueError(f"Web modules source {source} does not exist or is not a file")
+        raise ValueError(f"Web module source {source} does not exist or is not a file")
     STATIC_SHIMS[f"web_modules/{name}.js"] = source_path
     return web_module_url(name)
 
@@ -140,6 +140,7 @@ class Cache:
     __slots__ = "_file", "package_list", "export_list"
 
     def __init__(self, path: Path) -> None:
+        path.mkdir(parents=True, exist_ok=True)
         self._file = path / ".idom-cache.json"
         if not self._file.exists():
             self.package_list: List[str] = []

tests/conftest.py

@@ -16,6 +16,7 @@
 import pyalect.builtins.pytest  # noqa
 
 import idom
+from idom.client.manage import restore as restore_client
 from idom.core import ElementConstructor, AbstractElement
 from idom.server import hotswap_server, AbstractRenderServer, find_available_port
 from idom.server.sanic import PerClientStateServer
@@ -274,8 +275,8 @@ def fresh_client(pytestconfig: Config) -> Iterator[None]:
     after testing and may effect usage of IDOM beyond the scope of the tests.
     """
     if not pytestconfig.option.dirty_client:
-        idom.client.restore()
+        restore_client()
         yield
-        idom.client.restore()
+        restore_client()
     else:
         yield

tests/test_widgets/my-chart.js tests/test_client/my-chart.jstests/test_widgets/my-chart.js renamed to tests/test_client/my-chart.js

@@ -2,7 +2,7 @@
 
 import pytest
 import idom
-from idom.client.manage import install, delete_web_modules
+from idom.client.manage import install, delete_web_modules, installed
 from idom import Module, client
 
 
@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def victory():
-    if "victory" not in client.installed():
+    if "victory" not in installed():
         install(["victory"], [])
     return Module("victory")
 
@@ -44,15 +44,15 @@ def test_reference_pre_installed_module(victory):
 def test_custom_module(driver, display, victory):
     my_chart = Module("my/chart", source_file=HERE / "my-chart.js")
 
-    assert client.web_module_exists("my/chart")
-    assert client.web_module_url("my/chart") == "../web_modules/my/chart.js"
+    assert client.current.web_module_exists("my/chart")
+    assert client.current.web_module_url("my/chart") == "../web_modules/my/chart.js"
 
     display(my_chart.Import("Chart"))
 
     driver.find_element_by_class_name("VictoryContainer")
 
     delete_web_modules("my/chart")
-    assert not client.web_module_exists("my/chart")
+    assert not client.current.web_module_exists("my/chart")
 
 
 def test_module_from_url():
@@ -63,4 +63,22 @@ def test_module_from_url():
 
 
 def test_module_uses_current_client_implementation():
-    assert False
+    class MmockClientImplementation:
+        exists_return = True
+
+        def register_web_module(self, name, source):
+            self.saved_module = (name, source)
+
+        def web_module_exists(self, name):
+            return name == "fake-name"
+
+        def web_module_url(self, name):
+            return f"./mock/url/to/module-{name}.js"
+
+    client.current = MmockClientImplementation()
+
+    assert Module("fake-name").url == "./mock/url/to/module-fake-name.js"
+
+    Module("some-other-name", source_file="fake/path/to/module.js")
+
+    assert client.current.saved_module == ("some-other-name", "fake/path/to/module.js")

tests/test_client/test_module.py

@@ -2,37 +2,38 @@
 
 from idom.__main__ import main
 from idom import client
+from idom.client.manage import delete_web_modules, installed
 
 from tests.general_utils import assert_same_items
 
 
 @pytest.mark.slow
 def test_simple_install(capsys):
-    client.delete_web_modules("jquery", skip_missing=True)
+    delete_web_modules("jquery", skip_missing=True)
 
     main("install", "jquery")
-    assert client.web_module_exists("jquery")
+    assert client.current.web_module_exists("jquery")
     main("installed")
     captured = capsys.readouterr()
     assert "- jquery" in captured.out
 
     main("uninstall", "jquery")
-    assert not client.web_module_exists("jquery")
+    assert not client.current.web_module_exists("jquery")
 
 
 @pytest.mark.slow
 def test_install_with_exports(capsys):
-    client.delete_web_modules(["preact", "preact/hooks"], skip_missing=True)
+    delete_web_modules(["preact", "preact/hooks"], skip_missing=True)
 
     main("install", "preact", "--exports", "preact/hooks")
-    assert client.web_module_exists("preact/hooks")
+    assert client.current.web_module_exists("preact/hooks")
     main("installed")
     captured = capsys.readouterr()
     assert "- preact" in captured.out
     assert "- preact/hooks" in captured.out
 
     main("uninstall", "preact")
-    assert not client.web_module_exists("preact/hooks")
+    assert not client.current.web_module_exists("preact/hooks")
     main("installed")
     captured = capsys.readouterr()
     assert "- preact" not in captured.out
@@ -42,9 +43,7 @@ def test_install_with_exports(capsys):
 @pytest.mark.slow
 def test_restore(capsys):
     main("restore")
-    assert_same_items(
-        client.installed(), ["fast-json-patch", "htm", "react", "react-dom"]
-    )
+    assert_same_items(installed(), ["fast-json-patch", "htm", "react", "react-dom"])
 
 
 @pytest.mark.parametrize(