refactor(test_cli, get_{teamocil,tmuxinator}_dir): To pathlib

Author: tony

src/tmuxp/cli/import_config.py

@@ -11,41 +11,41 @@
 from .utils import prompt, prompt_choices, prompt_yes_no, tmuxp_echo
 
 
-def get_tmuxinator_dir() -> str:
+def get_tmuxinator_dir() -> pathlib.Path:
     """
     Return tmuxinator configuration directory.
 
     Checks for ``TMUXINATOR_CONFIG`` environmental variable.
 
     Returns
     -------
-    str :
+    pathlib.Path :
         absolute path to tmuxinator config directory
 
     See Also
     --------
     :meth:`tmuxp.workspace.importers.tmuxinator.import_tmuxinator`
     """
     if "TMUXINATOR_CONFIG" in os.environ:
-        return os.path.expanduser(os.environ["TMUXINATOR_CONFIG"])
+        return pathlib.Path(os.environ["TMUXINATOR_CONFIG"]).expanduser()
 
-    return os.path.expanduser("~/.tmuxinator/")
+    return pathlib.Path("~/.tmuxinator/").expanduser()
 
 
-def get_teamocil_dir() -> str:
+def get_teamocil_dir() -> pathlib.Path:
     """
     Return teamocil configuration directory.
 
     Returns
     -------
-    str :
+    pathlib.Path :
         absolute path to teamocil config directory
 
     See Also
     --------
     :meth:`tmuxp.workspace.importers.teamocil.import_teamocil`
     """
-    return os.path.expanduser("~/.teamocil/")
+    return pathlib.Path("~/.teamocil/").expanduser()
 
 
 def _resolve_path_no_overwrite(workspace_file: str) -> str:

tests/cli/test_cli.py

@@ -1,6 +1,5 @@
 import argparse
 import contextlib
-import os
 import pathlib
 import typing as t
 
@@ -27,7 +26,7 @@ def test_creates_config_dir_not_exists(tmp_path: pathlib.Path) -> None:
     """cli.startup() creates config dir if not exists."""
 
     cli.startup(tmp_path)
-    assert os.path.exists(tmp_path)
+    assert tmp_path.exists()
 
 
 @pytest.mark.parametrize(
@@ -56,26 +55,28 @@ def test_resolve_behavior(
 ) -> None:
     expect = tmp_path
     monkeypatch.chdir(tmp_path)
-    assert pathlib.Path("../").resolve() == pathlib.Path(os.path.dirname(expect))
+    assert pathlib.Path("../").resolve() == expect.parent
     assert pathlib.Path().resolve() == expect
     assert pathlib.Path("./").resolve() == expect
     assert pathlib.Path(expect).resolve() == expect
 
 
 def test_get_tmuxinator_dir(monkeypatch: pytest.MonkeyPatch) -> None:
-    assert get_tmuxinator_dir() == os.path.expanduser("~/.tmuxinator/")
+    assert get_tmuxinator_dir() == pathlib.Path("~/.tmuxinator").expanduser()
 
     monkeypatch.setenv("HOME", "/moo")
-    assert get_tmuxinator_dir() == "/moo/.tmuxinator/"
-    assert get_tmuxinator_dir() == os.path.expanduser("~/.tmuxinator/")
+    assert get_tmuxinator_dir() == pathlib.Path("/moo/.tmuxinator/")
+    assert str(get_tmuxinator_dir()) == "/moo/.tmuxinator"
+    assert get_tmuxinator_dir() == pathlib.Path("~/.tmuxinator/").expanduser()
 
 
 def test_get_teamocil_dir(monkeypatch: pytest.MonkeyPatch) -> None:
-    assert get_teamocil_dir() == os.path.expanduser("~/.teamocil/")
+    assert get_teamocil_dir() == pathlib.Path("~/.teamocil/").expanduser()
 
     monkeypatch.setenv("HOME", "/moo")
-    assert get_teamocil_dir() == "/moo/.teamocil/"
-    assert get_teamocil_dir() == os.path.expanduser("~/.teamocil/")
+    assert get_teamocil_dir() == pathlib.Path("/moo/.teamocil/")
+    assert str(get_teamocil_dir()) == "/moo/.teamocil"
+    assert get_teamocil_dir() == pathlib.Path("~/.teamocil/").expanduser()
 
 
 def test_pass_config_dir_ClickPath(