refactor

Author: majsan

tests/conftest.py

@@ -1,15 +1,16 @@
 """Pytest entry point."""
-import pytest  # noqa: I001
+import pytest
 
 from starlette.config import environ
 
 environ["TESTING"] = "True"
 environ["ELASTICSEARCH_HOST"] = "http://localhost:9202"
 environ["CONSOLE_LOG_LEVEL"] = "DEBUG"
+environ["AUTH_JWT_PUBKEY_PATH"] = "assets/testing/pubkey.pem"
 
-from . import common_data, utils  # nopep8  # noqa: E402, F401
+from . import common_data, utils
 
 
 @pytest.fixture
-def json_schema_config():  # noqa: ANN201
+def json_schema_config():
     return common_data.CONFIG_PLACES

tests/e2e/conftest.py

@@ -33,30 +33,13 @@ def as_header(self) -> typing.Dict[str, str]:
 
 
 @pytest.fixture(scope="session")
-def setup_environment() -> None:
-    os.environ["AUTH_JWT_PUBKEY_PATH"] = "assets/testing/pubkey.pem"
-
-
-@pytest.fixture(scope="session")
-def apply_migrations(setup_environment: None):  # noqa: ANN201
+def apply_migrations():
     from karp.main.migrations import use_cases
 
     use_cases.run_migrations_up()
     yield
 
 
-@pytest.fixture(scope="session", name="runner")
-def fixture_runner() -> CliRunner:
-    return CliRunner()
-
-
-@pytest.fixture(scope="session", name="cliapp")
-def fixture_cliapp() -> Typer:
-    from karp.cliapp.main import create_app
-
-    return create_app()
-
-
 @pytest.fixture(name="app", scope="session")
 def fixture_app(
     apply_migrations: None, init_search_service: None
@@ -129,8 +112,8 @@ def fixture_fa_data_client(  # noqa: ANN201
 
 
 def create_bearer_token(
-    user: str,
-    scope: Optional[typing.Dict] = None,
+    scope: typing.Dict,
+    user: Optional[str] = "abc123",
 ) -> AccessToken:
     levels = auth_levels
     return AccessToken(
@@ -165,7 +148,6 @@ def user2_token() -> AccessToken:
 @pytest.fixture(scope="session")
 def user4_token() -> AccessToken:
     return create_bearer_token(
-        user="user4",
         scope={
             "lexica": {
                 "places": auth_levels[auth.PermissionLevel.admin],
@@ -177,7 +159,6 @@ def user4_token() -> AccessToken:
 @pytest.fixture(scope="session")
 def admin_token() -> AccessToken:
     return create_bearer_token(
-        user="[email protected]",
         scope={
             "lexica": {
                 "places": auth_levels[auth.PermissionLevel.admin],
@@ -191,7 +172,6 @@ def admin_token() -> AccessToken:
 @pytest.fixture(scope="session")
 def read_token() -> AccessToken:
     return create_bearer_token(
-        user="[email protected]",
         scope={
             "lexica": {
                 "places": auth_levels[auth.PermissionLevel.read],
@@ -205,7 +185,6 @@ def read_token() -> AccessToken:
 @pytest.fixture(scope="session")
 def write_token() -> AccessToken:
     return create_bearer_token(
-        user="[email protected]",
         scope={
             "lexica": {
                 "places": auth_levels[auth.PermissionLevel.write],
@@ -219,7 +198,6 @@ def write_token() -> AccessToken:
 @pytest.fixture(scope="session")
 def no_municipalities_token() -> AccessToken:
     return create_bearer_token(
-        user="[email protected]",
         scope={"lexica": {}},
     )
 

tests/e2e/test_cliapp_main.py

@@ -1,10 +1,13 @@
 from karp.main import config
-from typer import Typer
 from typer.testing import CliRunner
+from karp.cliapp.main import create_app
+
+runner = CliRunner()
+cliapp = create_app()
 
 
 class TestCli:
-    def test_version(self, runner: CliRunner, cliapp: Typer):  # noqa: ANN201
+    def test_version(self):
         result = runner.invoke(cliapp, ["--version"])
         assert result.exit_code == 0
         assert f"{config.PROJECT_NAME} CLI {config.VERSION}\n" == result.stdout

tests/e2e/test_cliapp_resources.py

@@ -1,22 +1,20 @@
-import pytest  # noqa: I001
-
-from typer import Typer
 from typer.testing import CliRunner
-from karp import lex
 from karp.lex.application import ResourceQueries
 
 from karp.main import AppContext
+from karp.cliapp.main import create_app
+
+runner = CliRunner()
+cliapp = create_app()
 
 
 class TestCliResourceLifetime:
-    def test_help(self, runner: CliRunner, cliapp: Typer):  # noqa: ANN201
+    def test_help(self):
         result = runner.invoke(cliapp, ["resource", "--help"])
         assert result.exit_code == 0
 
-    def test_create_and_publish_repo(  # noqa: ANN201
+    def test_create_and_publish_repo(
         self,
-        runner: CliRunner,
-        cliapp: Typer,
         app_context: AppContext,
     ):
         result = runner.invoke(
@@ -27,11 +25,11 @@ def test_create_and_publish_repo(  # noqa: ANN201
                 "assets/testing/config/lexlex.json",
             ],
         )
-        # print(f"{result.stdout=}")
+
         if isinstance(result.exception, Exception):
             raise result.exception
         else:
             assert result.exit_code == 0
 
-        resource_queries = app_context.injector.get(ResourceQueries)  # type: ignore [misc]
+        resource_queries = app_context.injector.get(ResourceQueries)
         assert resource_queries.by_resource_id_optional("lexlex") is not None