building test

Author: pcrespov

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

@@ -13,9 +13,11 @@
 
 import pytest
 import yaml
+from models_library.products import ProductName
 from pytest_mock import MockFixture, MockType
 from pytest_simcore.helpers.webserver_projects import empty_project_data
 from simcore_service_webserver.application_settings_utils import AppConfigDict
+from simcore_service_webserver.constants import FRONTEND_APP_DEFAULT
 
 CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
 
@@ -86,3 +88,8 @@ def disabled_setup_garbage_collector(mocker: MockFixture) -> MockType:
         autospec=True,
         return_value=False,
     )
+
+
+@pytest.fixture(scope="session")
+def product_name() -> ProductName:
+    return ProductName(FRONTEND_APP_DEFAULT)

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

@@ -13,16 +13,10 @@
 from models_library.products import ProductName
 from pytest_simcore.helpers.faker_factories import random_product
 from simcore_postgres_database.models.products import products as products_table
-from simcore_service_webserver.constants import FRONTEND_APP_DEFAULT
 from sqlalchemy import String
 from sqlalchemy.dialects import postgresql
 
 
-@pytest.fixture(scope="session")
-def product_name() -> ProductName:
-    return ProductName(FRONTEND_APP_DEFAULT)
-
-
 @pytest.fixture
 def product_db_server_defaults() -> dict[str, Any]:
     server_defaults = {}

services/web/server/tests/unit/with_dbs/03/login/test_login_controller_confirmation_rest.py

@@ -10,16 +10,20 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from common_library.users_enums import UserStatus
+from models_library.products import ProductName
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from servicelib.aiohttp import status
 from simcore_service_webserver.login._login_repository_legacy import (
     ActionLiteralStr,
     AsyncpgStorage,
     ConfirmationTokenDict,
 )
+from simcore_service_webserver.users import _users_service
+from simcore_service_webserver.wallets import _api as _wallets_service
+from simcore_service_webserver.wallets import _db as _wallets_repository
 
 CreateTokenCallable: TypeAlias = Callable[
-    [int, ActionLiteralStr], Coroutine[Any, Any, ConfirmationTokenDict]
+    [int, ActionLiteralStr, str | None], Coroutine[Any, Any, ConfirmationTokenDict]
 ]
 
 
@@ -28,9 +32,9 @@ async def create_valid_confirmation_token(db: AsyncpgStorage) -> CreateTokenCall
     """Fixture to create a valid confirmation token for a given action."""
 
     async def _create_token(
-        user_id: int, action: ActionLiteralStr
+        user_id: int, action: ActionLiteralStr, data: str | None = None
     ) -> ConfirmationTokenDict:
-        return await db.create_confirmation(user_id=user_id, action=action)
+        return await db.create_confirmation(user_id=user_id, action=action, data=data)
 
     return _create_token
 
@@ -39,10 +43,13 @@ async def test_confirm_registration(
     client: TestClient,
     create_valid_confirmation_token: CreateTokenCallable,
     unconfirmed_user: UserInfoDict,
+    product_name: ProductName,
 ):
     assert unconfirmed_user["status"] == UserStatus.CONFIRMATION_PENDING
     target_user_id = unconfirmed_user["id"]
-    confirmation = await create_valid_confirmation_token(target_user_id, "REGISTRATION")
+    confirmation = await create_valid_confirmation_token(
+        target_user_id, "REGISTRATION", None
+    )
     code = confirmation["code"]
 
     # clicks link to confirm registration
@@ -54,6 +61,24 @@ async def test_confirm_registration(
     assert response.history[0].status == status.HTTP_302_FOUND
     assert response.history[0].headers["Location"].endswith("/#?registered=true")
 
+    # checks _handle_confirm_registration updated status
+    assert client.app
+    user = await _users_service.get_user(client.app, user_id=unconfirmed_user["id"])
+    assert user["status"] == UserStatus.ACTIVE
+
+    # checks that the user has one wallet created (via SIGNAL_ON_USER_CONFIRMATION)
+    wallets = await _wallets_service.list_wallets_for_user(
+        client.app, user_id=unconfirmed_user["id"], product_name=product_name
+    )
+    assert len(wallets) == 1
+
+    # delete to allow teardown
+    await _wallets_repository.delete_wallet(
+        client.app,
+        wallet_id=wallets[0].wallet_id,
+        product_name=product_name,
+    )
+
 
 async def test_confirm_change_email(
     client: TestClient,
@@ -63,17 +88,19 @@ async def test_confirm_change_email(
     assert registered_user["status"] == UserStatus.ACTIVE
 
     user_id = registered_user["id"]
-    confirmation = await create_valid_confirmation_token(user_id, "CHANGE_EMAIL")
+    confirmation = await create_valid_confirmation_token(
+        user_id, "CHANGE_EMAIL", "new_" + registered_user["email"]
+    )
     code = confirmation["code"]
 
     # clicks link to confirm registration
     response = await client.get(f"/v0/auth/confirmation/{code}")
     assert response.status == status.HTTP_200_OK
 
-    # checks redirection to front-end, which will prompt and then finalize change-email
-    assert len(response.history) == 1
-    assert response.history[0].status == status.HTTP_302_FOUND
-    assert response.history[0].headers["Location"].endswith("/#?registered=true")
+    # checks _handle_confirm_registration updated status
+    assert client.app
+    user = await _users_service.get_user(client.app, user_id=registered_user["id"])
+    assert user["email"] == "new_" + registered_user["email"]
 
 
 async def test_confirm_reset_password(
@@ -82,12 +109,22 @@ async def test_confirm_reset_password(
     registered_user: UserInfoDict,
 ):
     user_id = registered_user["id"]
-    confirmation = await create_valid_confirmation_token(user_id, "RESET_PASSWORD")
+    confirmation = await create_valid_confirmation_token(
+        user_id, "RESET_PASSWORD", None
+    )
     code = confirmation["code"]
 
     response = await client.get(f"/v0/auth/confirmation/{code}")
-    assert response.status == status.HTTP_302_FOUND
-    assert response.headers["Location"].endswith(f"reset-password?code={code}")
+    assert response.status == status.HTTP_200_OK
+
+    # checks redirection
+    assert len(response.history) == 1
+    assert response.history[0].status == status.HTTP_302_FOUND
+    assert (
+        response.history[0]
+        .headers["Location"]
+        .endswith(f"/#reset-password?code={code}")
+    )
 
 
 async def test_handler_exception_logging(
@@ -96,7 +133,7 @@ async def test_handler_exception_logging(
     registered_user: UserInfoDict,
 ):
     user_id = registered_user["id"]
-    confirmation = await create_valid_confirmation_token(user_id, "REGISTRATION")
+    confirmation = await create_valid_confirmation_token(user_id, "REGISTRATION", None)
     code = confirmation["code"]
 
     with patch(
@@ -107,12 +144,12 @@ async def test_handler_exception_logging(
         "simcore_service_webserver.login._controller.confirmation_rest._logger.exception"
     ) as mock_logger:
         response = await client.get(f"/v0/auth/confirmation/{code}")
-        assert response.status == 503
+        assert response.status == status.HTTP_200_OK
+
+        # checks redirection
+        assert len(response.history) == 1
+        assert response.history[0].status == status.HTTP_302_FOUND
+        assert "/#/error?message=" in response.history[0].headers["Location"]
+
         mock_handler.assert_called_once()
-        mock_logger.assert_called_once_with(
-            user_error_msg="Sorry, we cannot confirm your REGISTRATION."
-            "Please try again in a few moments.",
-            error=mock_handler.side_effect,
-            error_code=mock_handler.side_effect,
-            tip="Failed during email_confirmation",
-        )
+        mock_logger.assert_called_once()

services/web/server/tests/unit/with_dbs/03/tags/test_tags.py

@@ -423,20 +423,17 @@ async def test_cannot_share_tag_with_everyone(
     assert error
 
 
-@pytest.fixture
-def product_name() -> str:
-    return "osparc"
-
-
 @pytest.mark.parametrize(
     "user_role,expected_status",
     [
         (
             role,
             # granted only to:
-            status.HTTP_403_FORBIDDEN
-            if role < UserRole.TESTER
-            else status.HTTP_201_CREATED,
+            (
+                status.HTTP_403_FORBIDDEN
+                if role < UserRole.TESTER
+                else status.HTTP_201_CREATED
+            ),
         )
         for role in UserRole
         if role >= UserRole.USER

services/web/server/tests/unit/with_dbs/04/folders/test_folders_repository.py

@@ -18,11 +18,6 @@ def user_role():
     return UserRole.USER
 
 
-@pytest.fixture
-def product_name():
-    return "osparc"
-
-
 async def test_batch_get_trashed_by_primary_gid(
     client: TestClient,
     logged_user: dict[str, Any],