From 335249e55ff1b925b41bc64a8b16661b04c6448c Mon Sep 17 00:00:00 2001 From: Maciej Urbanski Date: Fri, 21 Jun 2024 18:28:32 +0200 Subject: [PATCH] migrate old tests to pytest-apiver --- tests/unit/api/test_metrics.py | 13 +++++++++++++ tests/{v0 => unit/api}/test_metrics_manager.py | 10 ++++------ tests/v0/__init__.py | 0 tests/v0/test_metrics.py | 15 --------------- 4 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 tests/unit/api/test_metrics.py rename tests/{v0 => unit/api}/test_metrics_manager.py (78%) delete mode 100644 tests/v0/__init__.py delete mode 100644 tests/v0/test_metrics.py diff --git a/tests/unit/api/test_metrics.py b/tests/unit/api/test_metrics.py new file mode 100644 index 0000000..8f9d45f --- /dev/null +++ b/tests/unit/api/test_metrics.py @@ -0,0 +1,13 @@ +import pytest + + +@pytest.mark.django_db +def test_users_n_active_users(apiver_module, user_model): + assert apiver_module.users() == 0 + assert apiver_module.active_users() == 0 + user_model.objects.create(username="test") + assert apiver_module.users() == 1 + assert apiver_module.active_users() == 1 + user_model.objects.create(username="test2", is_active=False) + assert apiver_module.users() == 2 + assert apiver_module.active_users() == 1 diff --git a/tests/v0/test_metrics_manager.py b/tests/unit/api/test_metrics_manager.py similarity index 78% rename from tests/v0/test_metrics_manager.py rename to tests/unit/api/test_metrics_manager.py index 7d55650..dc61ad2 100644 --- a/tests/v0/test_metrics_manager.py +++ b/tests/unit/api/test_metrics_manager.py @@ -1,16 +1,14 @@ import pytest -from django_business_metrics.v0 import BusinessMetricsManager, users - @pytest.fixture -def metrics_manager(): - return BusinessMetricsManager() +def metrics_manager(apiver_module): + return apiver_module.BusinessMetricsManager() @pytest.fixture -def user_metric(metrics_manager): - return metrics_manager.add(users) +def user_metric(apiver_module, metrics_manager): + return metrics_manager.add(apiver_module.users) @pytest.mark.django_db diff --git a/tests/v0/__init__.py b/tests/v0/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/v0/test_metrics.py b/tests/v0/test_metrics.py deleted file mode 100644 index a2461b6..0000000 --- a/tests/v0/test_metrics.py +++ /dev/null @@ -1,15 +0,0 @@ -import pytest - -from django_business_metrics.v0 import active_users, users - - -@pytest.mark.django_db -def test_users_n_active_users(user_model): - assert users() == 0 - assert active_users() == 0 - user_model.objects.create(username="test") - assert users() == 1 - assert active_users() == 1 - user_model.objects.create(username="test2", is_active=False) - assert users() == 2 - assert active_users() == 1