diff --git a/umap/tests/conftest.py b/umap/tests/conftest.py index e3d237e3..0f3bd6ce 100644 --- a/umap/tests/conftest.py +++ b/umap/tests/conftest.py @@ -2,6 +2,7 @@ import shutil import tempfile import pytest +from django.core.cache import cache from django.core.signing import get_cookie_signer from .base import DataLayerFactory, MapFactory, UserFactory @@ -12,6 +13,7 @@ TMP_ROOT = tempfile.mkdtemp() def pytest_configure(config): from django.conf import settings + settings.MEDIA_ROOT = TMP_ROOT @@ -19,11 +21,20 @@ def pytest_unconfigure(config): shutil.rmtree(TMP_ROOT, ignore_errors=True) +def pytest_runtest_teardown(): + cache.clear() + + @pytest.fixture def user(): return UserFactory(password="123123") +@pytest.fixture +def user2(): + return UserFactory(username="Averell", password="456456") + + @pytest.fixture def licence(): # Should be created by the migrations. diff --git a/umap/tests/test_views.py b/umap/tests/test_views.py index 228d4dd5..d1f025a7 100644 --- a/umap/tests/test_views.py +++ b/umap/tests/test_views.py @@ -1,6 +1,6 @@ import json import socket -from datetime import date +from datetime import date, timedelta import pytest from django.conf import settings @@ -150,13 +150,15 @@ def test_stats_empty(client): @pytest.mark.django_db -def test_stats_basic(client, map, datalayer): +def test_stats_basic(client, map, datalayer, user2): map.owner.last_login = date.today() map.owner.save() + user2.last_login = date.today() - timedelta(days=8) + user2.save() response = client.get(reverse("stats")) assert json.loads(response.content.decode()) == { "maps_active_last_week_count": 1, "maps_count": 1, "users_active_last_week_count": 1, - "users_count": 1, + "users_count": 2, }