Refactor in preparation of additional testing

Author: ArBridgeman

test/integration/project-template/conftest.py

@@ -1,16 +1,17 @@
 import subprocess
+from pathlib import Path
 
 import pytest
 
 from noxconfig import Config
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="session", autouse=True)
 def cwd(tmp_path_factory):
     return tmp_path_factory.mktemp("project_template_test")
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="session", autouse=True)
 def new_project(cwd):
     project_name = "project"
     repo_name = "repo"
@@ -23,3 +24,48 @@ def new_project(cwd):
          ], capture_output=True, check=True)
 
     return cwd / repo_name
+
+@pytest.fixture(scope="session", autouse=True)
+def poetry_install(run_command, poetry_path):
+    run_command([poetry_path, "install"])
+
+
+@pytest.fixture(scope="session")
+def git_path() -> str:
+    result = subprocess.run(["which", "git"], capture_output=True, text=True)
+    git_path = result.stdout.strip()
+    return git_path
+
+
+@pytest.fixture(scope="session")
+def poetry_path() -> str:
+    result = subprocess.run(["which", "poetry"], capture_output=True, text=True)
+    poetry_path = result.stdout.strip()
+    return poetry_path
+
+
+@pytest.fixture(scope="session")
+def run_command(poetry_path, git_path, new_project):
+    """
+    Run subprocess command with captured output and a limited environment (env).
+
+    We restrict the environment as different systems & tools (i.e. PyCharm) include
+    environment variables which may supersede the ones provided here. In such cases,
+    this can lead to a breaking alteration in the PTB poetry environment. Thus,
+    we provide the minimum information needed to execute the pre-commit command.
+    """
+
+    def _run_command_fixture(command, **kwargs):
+        defaults = {
+            "capture_output": True,
+            "check": True,
+            "cwd": new_project,
+            "env": {"PATH": f"{Path(git_path).parent}:{Path(poetry_path).parent}"},
+            "text": True,
+
+        }
+        config = {**defaults, **kwargs}
+
+        return subprocess.run(command, **config)
+
+    return _run_command_fixture

test/integration/project-template/pre_commit_test.py

@@ -1,54 +1,9 @@
-import subprocess
-from pathlib import Path
-
 import pytest
 
 
-@pytest.fixture(scope="module")
-def poetry_path() -> str:
-    result = subprocess.run(["which", "poetry"], capture_output=True, text=True)
-    poetry_path = result.stdout.strip()
-    return poetry_path
-
-
-@pytest.fixture(scope="module")
-def git_path() -> str:
-    result = subprocess.run(["which", "git"], capture_output=True, text=True)
-    git_path = result.stdout.strip()
-    return git_path
-
-
-@pytest.fixture(scope="module")
-def run_command(poetry_path, git_path, new_project):
-    """
-    Run subprocess command with captured output and a limited environment (env).
-
-    We restrict the environment as different systems & tools (i.e. PyCharm) include
-    environment variables which may supersede the ones provided here. In such cases,
-    this can lead to a breaking alteration in the PTB poetry environment. Thus,
-    we provide the minimum information needed to execute the pre-commit command.
-    """
-
-    def _run_command_fixture(command, **kwargs):
-        defaults = {
-            "capture_output": True,
-            "check": True,
-            "cwd": new_project,
-            "env": {"PATH": f"{Path(git_path).parent}:{Path(poetry_path).parent}"},
-            "text": True,
-
-        }
-        config = {**defaults, **kwargs}
-
-        return subprocess.run(command, **config)
-
-    return _run_command_fixture
-
-
 @pytest.fixture(scope="module")
 def pre_commit(run_command, new_project, poetry_path):
-    run_command(command=["git", "init"])
-    run_command([poetry_path, "install"])
+    run_command(["git", "init"])
     run_command([poetry_path, "run", "--", "pre-commit", "install"])
 
 
@@ -61,15 +16,15 @@ def _command(poetry_path: str, stage: str) -> list[str]:
 
     def test_stage_pre_commit(self, pre_commit, poetry_path, run_command):
         command = self._command(poetry_path, "pre-commit")
-        output = run_command(command=command, check=False)
+        output = run_command(command, check=False)
 
         assert "Failed" not in output.stdout
         assert "Passed" in output.stdout
         assert output.returncode == 0
 
     def test_stage_pre_push(self, pre_commit, poetry_path, run_command):
         command = self._command(poetry_path, "pre-push")
-        output = run_command(command=command, check=False)
+        output = run_command(command, check=False)
 
         assert "Failed" not in output.stdout
         assert "Passed" in output.stdout