fix up the tests

rmorshea · rmorshea · commit 76246df70279 · 2020-12-22T00:34:08.000-08:00
diff --git a/docs/source/examples/material_ui_button_no_action.py b/docs/source/examples/material_ui_button_no_action.py
@@ -1,7 +1,7 @@
 import idom
 
 material_ui = idom.install("@material-ui/core")
-MaterialButton = material_ui.use("Button", fallback="loading...")
+MaterialButton = material_ui.define("Button", fallback="loading...")
 
 idom.run(
     idom.element(
diff --git a/docs/source/examples/material_ui_button_on_click.py b/docs/source/examples/material_ui_button_on_click.py
@@ -4,7 +4,7 @@
 
 
 material_ui = idom.install("@material-ui/core")
-MaterialButton = material_ui.use("Button", fallback="loading...")
+MaterialButton = material_ui.define("Button", fallback="loading...")
 
 
 @idom.element
diff --git a/docs/source/examples/material_ui_slider.py b/docs/source/examples/material_ui_slider.py
@@ -4,7 +4,7 @@
 
 
 material_ui = idom.install("@material-ui/core")
-MaterialSlider = material_ui.use("Slider", fallback="loading...")
+MaterialSlider = material_ui.define("Slider", fallback="loading...")
 
 
 @idom.element
diff --git a/docs/source/examples/simple_dashboard.py b/docs/source/examples/simple_dashboard.py
@@ -6,7 +6,7 @@
 from idom.widgets.html import Input
 
 
-VictoryLine = idom.install("victory").use("VictoryLine", fallback="loading...")
+VictoryLine = idom.install("victory").define("VictoryLine", fallback="loading...")
 
 
 @idom.element
diff --git a/docs/source/examples/super_simple_chart.py b/docs/source/examples/super_simple_chart.py
@@ -5,7 +5,7 @@
 
 path_to_source_file = Path(__file__).parent / "super_simple_chart.js"
 super_simple_chart = idom.Module("super-simple-chart", source_file=path_to_source_file)
-SuperSimpleChart = super_simple_chart.use("SuperSimpleChart")
+SuperSimpleChart = super_simple_chart.define("SuperSimpleChart")
 
 
 idom.run(
diff --git a/docs/source/examples/victory_chart.py b/docs/source/examples/victory_chart.py
@@ -1,7 +1,7 @@
 import idom
 
 victory = idom.install("victory")
-VictoryBar = victory.use("VictoryBar", fallback="loading...")
+VictoryBar = victory.define("VictoryBar", fallback="loading...")
 
 idom.run(
     idom.element(
diff --git a/idom/__main__.py b/idom/__main__.py
@@ -1,4 +1,3 @@
-# pragma: no cover
 import sys
 
 from loguru import logger
diff --git a/idom/client/manage.py b/idom/client/manage.py
@@ -3,7 +3,7 @@
 import subprocess
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Optional, List, Set, Union, Sequence
+from typing import List, Set, Union, Sequence
 
 from loguru import logger
 
@@ -24,7 +24,7 @@ def web_module_exports(package_name: str) -> List[str]:
     return find_js_module_exports_in_source(web_module_path(package_name).read_text())
 
 
-def web_module_url(package_name: str) -> Optional[str]:
+def web_module_url(package_name: str) -> str:
     web_module_path(package_name, must_exist=True)
     return f"../web_modules/{package_name}.js"
 
@@ -49,8 +49,6 @@ def add_web_module(package_name: str, source: Union[Path, str]) -> str:
         raise FileNotFoundError(f"Package source file does not exist: {str(source)!r}")
     target = web_module_path(package_name)
     target.parent.mkdir(parents=True, exist_ok=True)
-    if target.exists():
-        target.unlink()
     target.symlink_to(source.absolute())
     return web_module_url(package_name)
 
diff --git a/idom/client/module.py b/idom/client/module.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Optional, Union, List, Sequence, overload
+from typing import Any, Optional, Union, List, Tuple, Dict, overload
 from urllib.parse import urlparse
 
 from idom.core.vdom import VdomDict, ImportSourceDict, make_vdom_constructor
@@ -15,20 +15,22 @@ def install(packages: str) -> "Module":
 
 
 @overload
-def install(packages: Sequence[str]) -> List["Module"]:
+def install(packages: Union[List[str], Tuple[str]]) -> List["Module"]:
     ...
 
 
 def install(
-    packages: Sequence[str], ignore_installed: bool = False
+    packages: Union[str, List[str], Tuple[str]], ignore_installed: bool = False
 ) -> Union["Module", List["Module"]]:
-    return_one = isinstance(packages, str)
-    if return_one:
+    if isinstance(packages, str):
         packages = [packages]
+        return_one = True
+    else:
+        return_one = False
 
     pkg_names = {get_package_name(pkg) for pkg in packages}
 
-    if pkg_names.difference(client.current.web_module_names()):
+    if ignore_installed or pkg_names.difference(client.current.web_module_names()):
         builtin_client.build(packages)
         not_discovered = pkg_names.difference(client.current.web_module_names())
         if not_discovered:
@@ -37,10 +39,7 @@ def install(
                 f"{client.current} failed to discover {list(not_discovered)}."
             )
 
-    if return_one:
-        return Module(pkg_names.pop())
-    else:
-        return list(map(Module, pkg_names))
+    return Module(pkg_names.pop()) if return_one else [Module(pkg) for pkg in pkg_names]
 
 
 class Module:
@@ -77,7 +76,11 @@ def __init__(
         self.fallback = fallback
         self.exports: Optional[List[str]] = None
         if source_file is not None:
-            self.url = client.current.add_web_module(url_or_name, source_file)
+            self.url = (
+                client.current.web_module_url(url_or_name)
+                if client.current.web_module_exists(url_or_name)
+                else client.current.add_web_module(url_or_name, source_file)
+            )
             if check_exports:
                 self.exports = client.current.web_module_exports(url_or_name)
         elif client.current.web_module_exists(url_or_name):
@@ -86,14 +89,10 @@ def __init__(
                 self.exports = client.current.web_module_exports(url_or_name)
         elif _is_url(url_or_name):
             self.url = url_or_name
-            self.installed = False
         else:
-            raise ValueError(
-                f"{url_or_name!r} is not installed or is not a URL - "
-                "only installed modules can omit a file extension."
-            )
+            raise ValueError(f"{url_or_name!r} is not installed or is not a URL")
 
-    def use(
+    def define(
         self,
         name: str,
         has_children: bool = True,
@@ -161,7 +160,7 @@ def __call__(
         return self._constructor(import_source=self._import_source, *args, **kwargs)
 
     def __repr__(self) -> str:
-        info = {"name": self._name, **self._import_source}
+        info: Dict[str, Any] = {"name": self._name, **self._import_source}
         strings = ", ".join(f"{k}={v!r}" for k, v in info.items())
         return f"{type(self).__name__}({strings})"
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -261,6 +261,15 @@ def last_server_error():
     return idom.Ref(default_error)
 
 
+@pytest.fixture
+def client_implementation():
+    original = idom.client.current
+    try:
+        yield idom.client
+    finally:
+        idom.client.current = original
+
+
 @pytest.fixture(autouse=True)
 def _clean_last_server_error(last_server_error) -> Iterator[None]:
     last_server_error.current = default_error
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -0,0 +1,24 @@
+from typer.testing import CliRunner
+
+import idom
+from idom.cli import main
+from idom.client.manage import web_module_exists
+
+
+cli_runner = CliRunner()
+
+
+def test_install():
+    result = cli_runner.invoke(main, ["install", "jquery"])
+    assert result.exit_code == 0
+    assert web_module_exists("jquery")
+
+
+def test_restore():
+    result = cli_runner.invoke(main, ["restore"])
+    assert result.exit_code == 0
+
+
+def test_show_version():
+    result = cli_runner.invoke(main, ["show", "version"])
+    assert idom.__version__ in result.stdout
diff --git a/tests/test_client/conftest.py b/tests/test_client/conftest.py
@@ -4,5 +4,5 @@
 
 
 @pytest.fixture
-def victory_js(install):
+def victory():
     return idom.install("victory@35.4.0")
diff --git a/tests/test_client/test_js_module.js b/tests/test_client/test_js_module.js
@@ -0,0 +1,13 @@
+import React from "./react.js";
+import htm from "./htm.js";
+
+const html = htm.bind(React.createElement);
+
+export function TestButton(props) {
+  return html`<button
+    id=${props.id}
+    onClick=${(event) => props.onClick({ data: props.eventResponseData })}
+  >
+    test button
+  </button>`;
+}
diff --git a/tests/test_client/test_manage.py b/tests/test_client/test_manage.py
@@ -1,36 +1,35 @@
 import pytest
 
-from idom.client.manage import web_module_url, web_module_exports, web_module_exists
+from idom.client.manage import (
+    web_module_url,
+    web_module_exports,
+    web_module_exists,
+    web_module_path,
+    add_web_module,
+)
 
 from tests.general_utils import assert_same_items
 
 
-def test_web_module_url(victory_js):
-    assert (
-        web_module_url("tests", "victory") == "../web_modules/victory-tests-24fa38b.js"
-    )
-
+def test_add_web_module_source_must_exist(tmp_path):
+    with pytest.raises(FileNotFoundError, match="Package source file does not exist"):
+        add_web_module("test", tmp_path / "file-does-not-exist.js")
 
-def test_bad_install(temp_build_config):
-    temp_build_config.update_entries(
-        [{"source_name": "tests", "js_dependencies": ["some-dep"]}]
-    )
-    with pytest.raises(WebModuleError, match="not installed"):
-        web_module_url("tests", "some-dep")
 
+def test_web_module_path_must_exist():
+    with pytest.raises(ValueError, match="does not exist at path"):
+        web_module_path("this-does-not-exist", must_exist=True)
+    assert not web_module_path("this-does-not-exist", must_exist=False).exists()
 
-def test_web_module_exists(temp_build_config, victory_js):
-    assert not web_module_exists("tests", "does/not/exist")
-    assert web_module_exists("tests", "victory")
 
-    with temp_build_config.change_entry("tests") as entry:
-        entry["js_dependencies"].append("module_not_installed_yet")
-    assert not web_module_exists("tests", "module_not_installed_yet")
+def test_web_module_url(victory):
+    assert web_module_exists("victory")
+    assert web_module_url("victory") == "../web_modules/victory.js"
 
 
-def test_web_module_exports(victory_js):
+def test_web_module_exports(victory):
     assert_same_items(
-        web_module_exports("tests", "victory"),
+        web_module_exports("victory"),
         [
             "Area",
             "Axis",
diff --git a/tests/test_client/test_module.py b/tests/test_client/test_module.py
diff --git a/tests/test_client/test_utils.py b/tests/test_client/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# pragma: no cover`
`2`	`1`	`import sys`
`3`	`2`
`4`	`3`	`from loguru import logger`