Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test: use real account services in controller fixtures (#43223)

Asuka Minatof2755a79c71c
diff --git a/api/tests/unit_tests/controllers/console/auth/test_account_activation.py b/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
index b7c3081bb4e..2c6aa801010 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
@@ -1,9 +1,12 @@
"""Transport-boundary tests for account invitation activation."""
-from unittest.mock import Mock, patch
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
+from pytest_mock import MockerFixture
+from sqlalchemy.orm import Session, sessionmaker
from werkzeug.exceptions import UnprocessableEntity
from controllers.console.auth.activate import ActivateApi, ActivateCheckApi
@@ -15,6 +18,9 @@ from controllers.console.error import (
from controllers.console.error import (
EmailDomainSuspendedError as EmailDomainSuspendedHTTPError,
)
+from enums import DeploymentEdition
+from extensions.ext_application_services import build_application_services
+from extensions.ext_redis import RedisClientWrapper
from libs.login import AccountWithTenant
from models.account import Account
from services.account_activation_service import AccountActivationService
@@ -36,25 +42,31 @@ def app() -> Flask:
@pytest.fixture
-def activation_service() -> Mock:
- return Mock(spec=AccountActivationService)
-
-
-def _services(service: Mock) -> Mock:
- from extensions.application_services.account import AccountServices
- from extensions.ext_application_services import ApplicationServices
-
- services = Mock(spec=ApplicationServices)
- services.accounts = Mock(spec=AccountServices)
- services.accounts.activation = service
- return services
+def activation_service(
+ sqlite_session_factory: sessionmaker[Session],
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
+ mocker: MockerFixture,
+) -> AccountActivationService:
+ service = build_application_services(
+ database_client=sqlite_session_factory,
+ deployment_edition=DeploymentEdition.COMMUNITY,
+ initialization_password="",
+ redis=redis_transport[0],
+ ).accounts.activation
+ mocker.patch.object(service, "check")
+ mocker.patch.object(service, "activate")
+ return service
+
+
+def _services(service: AccountActivationService) -> SimpleNamespace:
+ return SimpleNamespace(accounts=SimpleNamespace(activation=service))
class TestActivateCheckApi:
def test_serializes_valid_invitation(
self,
app: Flask,
- activation_service: Mock,
+ activation_service: AccountActivationService,
) -> None:
activation_service.check.return_value = ActivationCheckResult(
is_valid=True,
@@ -95,7 +107,7 @@ class TestActivateCheckApi:
),
)
- def test_omits_data_for_invalid_invitation(self, app: Flask, activation_service: Mock) -> None:
+ def test_omits_data_for_invalid_invitation(self, app: Flask, activation_service: AccountActivationService) -> None:
activation_service.check.return_value = ActivationCheckResult(is_valid=False)
with (
@@ -109,7 +121,7 @@ class TestActivateCheckApi:
assert response == {"is_valid": False}
- def test_rejects_request_without_token(self, app: Flask, activation_service: Mock) -> None:
+ def test_rejects_request_without_token(self, app: Flask, activation_service: AccountActivationService) -> None:
"""`token` is required, so a tokenless query must not reach the application service."""
with (
app.test_request_context("/activate/check?workspace_id=workspace-123"),
@@ -128,7 +140,7 @@ class TestActivateApi:
def test_passes_parsed_command_to_application_service(
self,
app: Flask,
- activation_service: Mock,
+ activation_service: AccountActivationService,
) -> None:
payload = {
"workspace_id": "workspace-123",
@@ -175,7 +187,7 @@ class TestActivateApi:
def test_passes_no_authenticated_account_for_token_only_activation(
self,
app: Flask,
- activation_service: Mock,
+ activation_service: AccountActivationService,
) -> None:
with (
app.test_request_context("/activate", method="POST", json={"token": "valid-token"}),
@@ -207,7 +219,7 @@ class TestActivateApi:
def test_translates_application_errors(
self,
app: Flask,
- activation_service: Mock,
+ activation_service: AccountActivationService,
service_error: Exception,
http_error: type[Exception],
) -> None:
@@ -224,7 +236,7 @@ class TestActivateApi:
):
ActivateApi().post()
- def test_rejects_request_without_token(self, app: Flask, activation_service: Mock) -> None:
+ def test_rejects_request_without_token(self, app: Flask, activation_service: AccountActivationService) -> None:
"""`token` is required, so a tokenless payload must not resolve the session or reach the service."""
with (
app.test_request_context("/activate", method="POST", json={"workspace_id": "workspace-123"}),
diff --git a/api/tests/unit_tests/controllers/console/auth/test_email_register.py b/api/tests/unit_tests/controllers/console/auth/test_email_register.py
index 6bd87d28615..06c515843e7 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_email_register.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_email_register.py
@@ -5,11 +5,13 @@ from __future__ import annotations
from collections.abc import Callable, Generator
from contextlib import contextmanager
from types import SimpleNamespace
-from unittest.mock import Mock, patch
+from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
from pydantic import ValidationError
+from pytest_mock import MockerFixture
+from sqlalchemy.orm import Session, sessionmaker
from controllers.console import bp as console_bp
from controllers.console.auth.email_register import (
@@ -35,6 +37,8 @@ from controllers.console.error import (
SeatsLimitExceeded,
)
from enums import DeploymentEdition
+from extensions.ext_application_services import build_application_services
+from extensions.ext_redis import RedisClientWrapper
from services.account.email_registration_service import AccountEmailRegistrationService
from services.account_errors import (
AccountEmailAlreadyInUseError,
@@ -61,7 +65,7 @@ def _cloud_edition(config_overrides: Callable[..., None]) -> None:
@contextmanager
def _request(
app: Flask,
- service: Mock,
+ service: AccountEmailRegistrationService,
*,
path: str,
payload: dict[str, str],
@@ -83,8 +87,22 @@ def _request(
yield
-def _service() -> Mock:
- return Mock(spec=AccountEmailRegistrationService)
+def service(
+ sqlite_session_factory: sessionmaker[Session],
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
+ mocker: MockerFixture,
+) -> AccountEmailRegistrationService:
+ service = build_application_services(
+ database_client=sqlite_session_factory,
+ deployment_edition=DeploymentEdition.COMMUNITY,
+ initialization_password="",
+ redis=redis_transport[0],
+ ).accounts.email_registration
+ mocker.patch.object(service, "send_code")
+ mocker.patch.object(service, "verify_code")
+ mocker.patch.object(service, "register")
+ return service
def test_normalized_email_conflict_exposes_a_distinct_error_code() -> None:
@@ -95,8 +113,7 @@ def test_normalized_email_conflict_exposes_a_distinct_error_code() -> None:
assert error.data["code"] == "normalized_email_already_in_use"
-def test_send_email_delegates_with_remote_ip(app: Flask) -> None:
- service = _service()
+def test_send_email_delegates_with_remote_ip(app: Flask, service: AccountEmailRegistrationService) -> None:
service.send_code.return_value = "token-123"
with _request(
@@ -126,10 +143,10 @@ def test_send_email_delegates_with_remote_ip(app: Flask) -> None:
)
def test_send_email_translates_application_errors(
app: Flask,
+ service: AccountEmailRegistrationService,
service_error: Exception,
http_error: type[Exception],
) -> None:
- service = _service()
service.send_code.side_effect = service_error
with _request(
@@ -142,8 +159,7 @@ def test_send_email_translates_application_errors(
EmailRegisterSendEmailApi().post()
-def test_verify_email_code_serializes_application_result(app: Flask) -> None:
- service = _service()
+def test_verify_email_code_serializes_application_result(app: Flask, service: AccountEmailRegistrationService) -> None:
service.verify_code.return_value = AccountEmailRegistrationVerification(
token="verified-token",
@@ -176,10 +192,10 @@ def test_verify_email_code_serializes_application_result(app: Flask) -> None:
)
def test_verify_email_code_translates_application_errors(
app: Flask,
+ service: AccountEmailRegistrationService,
service_error: Exception,
http_error: type[Exception],
) -> None:
- service = _service()
service.verify_code.side_effect = service_error
with _request(
@@ -192,8 +208,7 @@ def test_verify_email_code_translates_application_errors(
EmailRegisterCheckApi().post()
-def test_register_delegates_and_serializes_tokens(app: Flask) -> None:
- service = _service()
+def test_register_delegates_and_serializes_tokens(app: Flask, service: AccountEmailRegistrationService) -> None:
service.register.return_value = AccountSessionTokens(
access_token="access",
refresh_token="refresh",
@@ -246,10 +261,10 @@ def test_register_delegates_and_serializes_tokens(app: Flask) -> None:
)
def test_register_translates_application_errors(
app: Flask,
+ service: AccountEmailRegistrationService,
service_error: Exception,
http_error: type[Exception],
) -> None:
- service = _service()
service.register.side_effect = service_error
with _request(