improving tests

Author: pcrespov

services/web/server/tests/unit/isolated/products/conftest.py

@@ -24,7 +24,7 @@ def product_name() -> ProductName:
 
 
 @pytest.fixture
-def fake_product_from_db(faker: Faker, product_name: ProductName) -> dict[str, Any]:
+def product_db_server_defaults() -> dict[str, Any]:
     server_defaults = {}
     for c in products_table.columns:
         if c.server_default is not None:
@@ -34,8 +34,15 @@ def fake_product_from_db(faker: Faker, product_name: ProductName) -> dict[str, A
                 m = re.match(r"^'(.+)'::jsonb$", c.server_default.arg.text)
                 if m:
                     server_defaults[c.name] = json.loads(m.group(1))
+    return server_defaults
+
+
+@pytest.fixture
+def fake_product_from_db(
+    faker: Faker, product_name: ProductName, product_db_server_defaults: dict[str, Any]
+) -> dict[str, Any]:
     return random_product(
         name=product_name,
         fake=faker,
-        **server_defaults,
+        **product_db_server_defaults,
     )

services/web/server/tests/unit/isolated/products/test_products_middlewares.py

@@ -8,10 +8,10 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import make_mocked_request
+from faker import Faker
+from pytest_simcore.helpers.faker_factories import random_product
 from servicelib.aiohttp import status
 from servicelib.rest_constants import X_PRODUCT_NAME_HEADER
-from simcore_postgres_database.models.products import LOGIN_SETTINGS_DEFAULT
-from simcore_postgres_database.webserver_models import products
 from simcore_service_webserver.products import products_web
 from simcore_service_webserver.products._web_events import _set_app_state
 from simcore_service_webserver.products._web_middlewares import (
@@ -22,51 +22,51 @@
 from yarl import URL
 
 
-@pytest.fixture()
-def mock_postgres_product_table() -> list[dict[str, Any]]:
-    # NOTE: try here your product's host_regex before adding them in the database!
-    column_defaults: dict[str, Any] = {
-        c.name: f"{c.server_default.arg}" for c in products.columns if c.server_default
-    }
-
-    column_defaults["login_settings"] = LOGIN_SETTINGS_DEFAULT
+@pytest.fixture
+def mock_postgres_product_data(
+    faker: Faker, product_db_server_defaults: dict[str, Any]
+) -> list[dict[str, Any]]:
 
     _SUBDOMAIN_PREFIX = r"[\w-]+\."
 
     return [
-        dict(
+        random_product(
             name="osparc",
             host_regex=rf"^({_SUBDOMAIN_PREFIX})*osparc[\.-]",
-            **column_defaults,
+            fake=faker,
+            **product_db_server_defaults,
         ),
-        dict(
+        random_product(
             name="s4l",
             host_regex=rf"^({_SUBDOMAIN_PREFIX})*(s4l|sim4life)[\.-]",
-            **column_defaults,
+            fake=faker,
+            **product_db_server_defaults,
         ),
-        dict(
+        random_product(
             name="tis",
             host_regex=rf"^({_SUBDOMAIN_PREFIX})*(tis|^ti-solutions)[\.-]",
+            fake=faker,
             vendor={
                 "name": "ACME",
                 "address": "sesame street",
                 "copyright": "© ACME correcaminos",
                 "url": "https://acme.com",
                 "forum_url": "https://forum.acme.com",
             },
-            **column_defaults,
+            **product_db_server_defaults,
         ),
     ]
 
 
 @pytest.fixture
-def mock_app(mock_postgres_product_table: list[dict[str, Any]]) -> web.Application:
+def mock_app(mock_postgres_product_data: list[dict[str, Any]]) -> web.Application:
     app = web.Application()
 
     app_products: dict[str, Product] = {
         product_from_db["name"]: Product.model_validate(product_from_db)
-        for product_from_db in mock_postgres_product_table
+        for product_from_db in mock_postgres_product_data
     }
+
     default_product_name = next(iter(app_products.keys()))
     _set_app_state(app, app_products, default_product_name)