From fed8543c3072d7374aa565db1cfaa04017f4a578 Mon Sep 17 00:00:00 2001 From: msramalho <19508417+msramalho@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:40:40 +0000 Subject: [PATCH] fix /user/active tests --- src/endpoints/default.py | 1 - src/tests/endpoints/test_default.py | 27 ++++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/endpoints/default.py b/src/endpoints/default.py index 557d7de..8838d2a 100644 --- a/src/endpoints/default.py +++ b/src/endpoints/default.py @@ -8,7 +8,6 @@ from core.config import VERSION, BREAKING_CHANGES from core.logging import log_error from db import crud from db.schemas import ActiveUser, UsageResponse -from db.database import get_db_dependency from db.user_state import UserState from web.security import get_user_auth, bearer_security, get_user_state from shared.user_groups import GroupPermissions diff --git a/src/tests/endpoints/test_default.py b/src/tests/endpoints/test_default.py index da0385a..d93f35d 100644 --- a/src/tests/endpoints/test_default.py +++ b/src/tests/endpoints/test_default.py @@ -1,4 +1,4 @@ -from unittest.mock import AsyncMock, patch +from unittest.mock import AsyncMock, MagicMock, patch from fastapi.testclient import TestClient import pytest from core.config import VERSION @@ -49,22 +49,27 @@ def test_endpoint_active_no_auth(client, test_no_auth): test_no_auth(client.get, "/user/active") -def test_endpoint_active_true_user(client_with_auth): - r = client_with_auth.get("/user/active") - assert r.status_code == 200 - assert r.json() == {"active": True} +def test_endpoint_active(app): + m_user_state = MagicMock() - -def test_endpoint_active_false_user(app): - from web.security import get_user_auth - - app.dependency_overrides[get_user_auth] = lambda: "morty@not-recognized-group.com" + from web.security import get_user_state + app.dependency_overrides[get_user_state] = lambda: m_user_state + + # inactive user + m_user_state.active = False client = TestClient(app) r = client.get("/user/active") - assert r.status_code == 200 assert r.json() == {"active": False} + # active user + m_user_state.active = True + client = TestClient(app) + r = client.get("/user/active") + assert r.status_code == 200 + assert r.json() == {"active": True} + + def test_no_serve_local_archive_by_default(client_with_auth): r = client_with_auth.get("/app/local_archive_test/temp.txt")