Migrate new_cookie fixture to conftest.py

Author: smkent

tests/conftest.py

@@ -1,11 +1,32 @@
+import json
 import os
+import sys
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Iterator
 from unittest.mock import patch
 
 import pytest
 
+from cookie_python.new import main as new_cookie_main
+
+AUTHOR_NAME = "Ness"
+AUTHOR_EMAIL = "ness@onett.example"
+PROJECT_NAME = "unit-test-1"
+
+
+@pytest.fixture
+def project_environment() -> Iterator[None]:
+    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, add_values):
+        yield
+
 
 @pytest.fixture(scope="session", autouse=True)
 def subprocess_environment() -> Iterator[None]:
@@ -36,3 +57,33 @@ def opt_update_expected_outputs(request: pytest.FixtureRequest) -> bool:
 def temp_dir() -> Iterator[Path]:
     with TemporaryDirectory(prefix="cookie-python.unittest.") as td:
         yield Path(td)
+
+
+@pytest.fixture(params=["@"])
+def new_cookie(
+    request: pytest.FixtureRequest, project_environment: None, temp_dir: Path
+) -> Iterator[Path]:
+    testargs = [
+        "new-cookie",
+        "--local",
+        str(temp_dir),
+        "--",
+        "-d",
+        "-y",
+        "--extra-context",
+        json.dumps(
+            {
+                "author_email": AUTHOR_EMAIL,
+                "author_name": AUTHOR_NAME,
+                "github_user": "ness.unittest.example",
+                "project_description": "Unit test project",
+                "project_name": PROJECT_NAME,
+                "enable_container_publish": "yes",
+            }
+        ),
+        "-c",
+        request.param,
+    ]
+    with patch.object(sys, "argv", testargs):
+        new_cookie_main()
+    yield temp_dir / PROJECT_NAME

tests/test_manage_cookie.py

@@ -1,5 +1,3 @@
-import json
-import os
 import subprocess
 import sys
 from pathlib import Path
@@ -11,53 +9,8 @@
 import pytest
 
 from cookie_python.manage.main import main as manage_cookie_main
-from cookie_python.new import main as new_cookie_main
 
-AUTHOR_NAME = "Ness"
-AUTHOR_EMAIL = "ness@onett.example"
-PROJECT_NAME = "unit-test-1"
-
-
-@pytest.fixture
-def environ() -> Iterator[None]:
-    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, add_values):
-        yield
-
-
-@pytest.fixture(params=["@"])
-def new_cookie(
-    request: pytest.FixtureRequest, environ: None, temp_dir: Path
-) -> Iterator[Path]:
-    testargs = [
-        "new-cookie",
-        "--local",
-        str(temp_dir),
-        "--",
-        "-d",
-        "-y",
-        "--extra-context",
-        json.dumps(
-            {
-                "author_email": AUTHOR_EMAIL,
-                "author_name": AUTHOR_NAME,
-                "github_user": "ness.unittest.example",
-                "project_description": "Unit test project",
-                "project_name": PROJECT_NAME,
-            }
-        ),
-        "-c",
-        request.param,
-    ]
-    with patch.object(sys, "argv", testargs):
-        new_cookie_main()
-    yield temp_dir / PROJECT_NAME
+from .conftest import AUTHOR_NAME, PROJECT_NAME
 
 
 @pytest.fixture(autouse=True)

tests/test_new_cookie.py

@@ -1,58 +1,31 @@
-import json
 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: Path) -> None:
-    testargs = [
-        "new-cookie",
-        "--local",
-        str(temp_dir),
-        "--",
-        "-d",
-        "-y",
-        "--extra-context",
-        json.dumps(
-            {
-                "author_email": "ness@onett.example",
-                "author_name": "Ness",
-                "github_user": "ness.unittest.example",
-                "project_description": "Unit test project",
-                "project_name": "unit-test-1",
-                "enable_container_publish": "yes",
-            }
-        ),
-    ]
-    with mock.patch.object(sys, "argv", testargs):
-        main()
-    project_dir = temp_dir / "unit-test-1"
-    assert os.path.isdir(project_dir)
+def test_new_cookie_create(new_cookie: Path, temp_dir: Path) -> None:
+    assert os.path.isdir(new_cookie)
     assert not (
         subprocess.check_output(
-            ["git", "status", "--porcelain=v1"], cwd=project_dir
+            ["git", "status", "--porcelain=v1"], cwd=new_cookie
         )
         .decode("utf-8")
         .strip()
     ), "Untracked files present in template-rendered project"
 
     # Verify cruft is up to date
     subprocess.check_call(
-        ["poetry", "run", "pip", "install", "toml"], cwd=project_dir
+        ["poetry", "run", "pip", "install", "toml"], cwd=new_cookie
     )
     subprocess.check_call(
-        ["poetry", "run", "cruft", "diff", "--exit-code"], cwd=project_dir
+        ["poetry", "run", "cruft", "diff", "--exit-code"], cwd=new_cookie
     )
 
     # Install rendered project
-    subprocess.check_call(["poetry", "sync"], cwd=project_dir)
+    subprocess.check_call(["poetry", "sync"], cwd=new_cookie)
     # Run rendered project's tests
-    subprocess.check_call(["poetry", "run", "poe", "test"], cwd=project_dir)
+    subprocess.check_call(["poetry", "run", "poe", "test"], cwd=new_cookie)
     # Build container for rendered project
     subprocess.check_call(
-        ["docker", "build", ".", "--no-cache"], cwd=project_dir
+        ["docker", "build", ".", "--no-cache"], cwd=new_cookie
     )