fix tests

Author: pcrespov

services/web/server/src/simcore_service_webserver/login/_2fa_api.py

@@ -1,4 +1,4 @@
-""" two-factor-authentication utils
+"""two-factor-authentication utils
 
 Currently includes two parts:
 
@@ -10,14 +10,14 @@
 import asyncio
 import logging
 
+import twilio.rest
 from aiohttp import web
 from models_library.users import UserID
 from pydantic import BaseModel, Field
 from servicelib.logging_utils import log_decorator
 from servicelib.utils_secrets import generate_passcode
 from settings_library.twilio import TwilioSettings
 from twilio.base.exceptions import TwilioException  # type: ignore[import-untyped]
-from twilio.rest import Client  # type: ignore[import-untyped]
 
 from ..login.errors import SendingVerificationEmailError, SendingVerificationSmsError
 from ..products.models import Product
@@ -118,7 +118,8 @@ def _sender():
             #
             # SEE https://www.twilio.com/docs/sms/quickstart/python
             #
-            client = Client(
+            # NOTE: this is mocked
+            client = twilio.rest.Client(
                 twilio_auth.TWILIO_ACCOUNT_SID, twilio_auth.TWILIO_AUTH_TOKEN
             )
             message = client.messages.create(**create_kwargs)

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

@@ -36,6 +36,7 @@
 )
 from simcore_service_webserver.login.storage import AsyncpgStorage
 from simcore_service_webserver.products import products_web
+from simcore_service_webserver.products.errors import UnknownProductError
 from simcore_service_webserver.products.models import Product
 from simcore_service_webserver.users import preferences_api as user_preferences_api
 from twilio.base.exceptions import TwilioRestException
@@ -370,7 +371,7 @@ async def test_send_email_code(
 ):
     request = make_mocked_request("GET", "/dummy", app=client.app)
 
-    with pytest.raises(KeyError):
+    with pytest.raises(UnknownProductError):
         # NOTE: this is a fake request and did not go through middlewares
         products_web.get_current_product(request)
 
@@ -418,9 +419,9 @@ async def test_2fa_sms_failure_during_login(
 ):
     assert client.app
 
-    # Mocks error in graylog https://monitoring.osparc.io/graylog/search/649e7619ce6e0838a96e9bf1?q=%222FA%22&rangetype=relative&from=172800
     mocker.patch(
-        "simcore_service_webserver.login._2fa_api.TwilioSettings.is_alphanumeric_supported",
+        # MD: Emulates error in graylog https://monitoring.osparc.io/graylog/search/649e7619ce6e0838a96e9bf1?q=%222FA%22&rangetype=relative&from=172800
+        "simcore_service_webserver.login._2fa_api.twilio.rest.Client",
         autospec=True,
         side_effect=TwilioRestException(
             status=400,

services/web/server/tests/unit/with_dbs/04/products/test_products_service.py

@@ -7,13 +7,19 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import TestServer
+from models_library.groups import GroupID
 from models_library.products import ProductName
-from simcore_service_webserver.products import products_service
+from pydantic import ValidationError
+from servicelib.exceptions import InvalidConfig
+from simcore_postgres_database.utils_products_prices import ProductPriceInfo
+from simcore_service_webserver.products import _service, products_service
 from simcore_service_webserver.products._repository import ProductRepository
 from simcore_service_webserver.products.errors import (
     MissingStripeConfigError,
     ProductPriceNotDefinedError,
+    ProductTemplateNotFoundError,
 )
+from simcore_service_webserver.products.models import Product
 
 
 @pytest.fixture
@@ -25,6 +31,27 @@ def app(
     return web_server.app
 
 
+async def test_load_products(app: web.Application):
+    products = await _service.load_products(app)
+    assert isinstance(products, list)
+    assert all(isinstance(product, Product) for product in products)
+
+
+async def test_load_products_validation_error(app: web.Application, mocker):
+    mock_repo = mocker.patch(
+        "simcore_service_webserver.products._service.ProductRepository.create_from_app"
+    )
+    mock_repo.return_value.list_products.side_effect = ValidationError("Invalid data")
+
+    with pytest.raises(InvalidConfig, match="Invalid product configuration in db"):
+        await _service.load_products(app)
+
+
+async def test_get_default_product_name(app: web.Application):
+    default_product_name = await _service.get_default_product_name(app)
+    assert isinstance(default_product_name, ProductName)
+
+
 async def test_get_product(app: web.Application, default_product_name: ProductName):
 
     product = products_service.get_product(app, product_name=default_product_name)
@@ -65,3 +92,31 @@ async def test_get_credit_amount(
         await products_service.get_credit_amount(
             app, dollar_amount=1, product_name=default_product_name
         )
+
+
+async def test_list_products_names(app: web.Application):
+    product_names = await products_service.list_products_names(app)
+    assert isinstance(product_names, list)
+    assert all(isinstance(name, ProductName) for name in product_names)
+
+
+async def test_get_credit_price_info(
+    app: web.Application, default_product_name: ProductName
+):
+    price_info = await _service.get_credit_price_info(
+        app, product_name=default_product_name
+    )
+    assert price_info is None or isinstance(price_info, ProductPriceInfo)
+
+
+async def test_get_template_content(app: web.Application):
+    template_name = "some_template"
+    with pytest.raises(ProductTemplateNotFoundError):
+        await _service.get_template_content(app, template_name=template_name)
+
+
+async def test_auto_create_products_groups(app: web.Application):
+    groups = await _service.auto_create_products_groups(app)
+    assert isinstance(groups, dict)
+    assert all(isinstance(name, ProductName) for name in groups.keys())
+    assert all(isinstance(group_id, GroupID) for group_id in groups.values())