Convert temp_dir to Path in unit tests

Author: smkent

tests/conftest.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Iterator
 from unittest.mock import patch
@@ -32,6 +33,6 @@ def opt_update_expected_outputs(request: pytest.FixtureRequest) -> bool:
 
 
 @pytest.fixture
-def temp_dir() -> Iterator[str]:
+def temp_dir() -> Iterator[Path]:
     with TemporaryDirectory(prefix="cookie-python.unittest.") as td:
-        yield os.path.join(td)
+        yield Path(td)

tests/test_manage_cookie.py

@@ -20,28 +20,25 @@
 
 @pytest.fixture
 def environ() -> Iterator[None]:
-    env = os.environ.copy()
-    env.update(
-        dict(
-            GIT_AUTHOR_NAME=AUTHOR_NAME,
-            GIT_AUTHOR_EMAIL=AUTHOR_EMAIL,
-            GIT_COMMITTER_NAME=AUTHOR_NAME,
-            GIT_COMMITTER_EMAIL=AUTHOR_EMAIL,
-            GITHUB_API_TOKEN="unittest_token",
-        )
+    add_values = dict(
+        GIT_AUTHOR_NAME=AUTHOR_NAME,
+        GIT_AUTHOR_EMAIL=AUTHOR_EMAIL,
+        GIT_COMMITTER_NAME=AUTHOR_NAME,
+        GIT_COMMITTER_EMAIL=AUTHOR_EMAIL,
+        GITHUB_API_TOKEN="unittest_token",
     )
-    with patch.dict(os.environ, env):
+    with patch.dict(os.environ, add_values):
         yield
 
 
 @pytest.fixture(params=["@"])
 def new_cookie(
-    request: pytest.FixtureRequest, environ: None, temp_dir: str
+    request: pytest.FixtureRequest, environ: None, temp_dir: Path
 ) -> Iterator[Path]:
     testargs = [
         "new-cookie",
         "--local",
-        temp_dir,
+        str(temp_dir),
         "--",
         "-d",
         "-y",
@@ -60,7 +57,7 @@ def new_cookie(
     ]
     with patch.object(sys, "argv", testargs):
         new_cookie_main()
-    yield Path(temp_dir) / PROJECT_NAME
+    yield temp_dir / PROJECT_NAME
 
 
 @pytest.fixture(autouse=True)
@@ -86,7 +83,7 @@ def mock_pygithub(new_cookie: Path) -> Iterator[MagicMock]:
 
 
 @pytest.fixture
-def new_cookie_with_lock(new_cookie: Path, temp_dir: str) -> Iterator[Path]:
+def new_cookie_with_lock(new_cookie: Path, temp_dir: Path) -> Iterator[Path]:
     for cmd in (
         ["poetry", "sync"],
         ["git", "add", "poetry.lock"],

tests/test_new_cookie.py

@@ -2,16 +2,17 @@
 import os
 import subprocess
 import sys
+from pathlib import Path
 from unittest import mock
 
 from cookie_python.new import main
 
 
-def test_new_cookie_create(temp_dir: str) -> None:
+def test_new_cookie_create(temp_dir: Path) -> None:
     testargs = [
         "new-cookie",
         "--local",
-        temp_dir,
+        str(temp_dir),
         "--",
         "-d",
         "-y",
@@ -29,7 +30,7 @@ def test_new_cookie_create(temp_dir: str) -> None:
     ]
     with mock.patch.object(sys, "argv", testargs):
         main()
-    project_dir = os.path.join(temp_dir, "unit-test-1")
+    project_dir = temp_dir / "unit-test-1"
     assert os.path.isdir(project_dir)
     assert not (
         subprocess.check_output(