From 770d8cbaad125a1760f1eda7ec27c87a164fad02 Mon Sep 17 00:00:00 2001 From: Demetris Stavrou Date: Wed, 3 Apr 2019 00:13:42 +0300 Subject: [PATCH] Skip User app tests if URLs are not enabled --- .../users/tests/test_forms.py | 4 ++++ .../users/tests/test_models.py | 3 +++ .../users/tests/test_urls.py | 12 ++++++++++++ .../users/tests/test_views.py | 6 ++++++ 4 files changed, 25 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py index dfa5da52e..1bfbd7ca1 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py @@ -1,4 +1,5 @@ import pytest +from django.conf import settings from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory @@ -6,6 +7,9 @@ from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory pytestmark = pytest.mark.django_db +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) class TestUserCreationForm: def test_clean_username(self): # A user with proto_user params does not exist yet. diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py index 548636323..07ead8eef 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py @@ -4,5 +4,8 @@ from django.conf import settings pytestmark = pytest.mark.django_db +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) def test_user_get_absolute_url(user: settings.AUTH_USER_MODEL): assert user.get_absolute_url() == f"/users/{user.username}/" diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py index 20bd3dbad..495ac4d8a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py @@ -5,6 +5,9 @@ from django.urls import reverse, resolve pytestmark = pytest.mark.django_db +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) def test_detail(user: settings.AUTH_USER_MODEL): assert ( reverse("users:detail", kwargs={"username": user.username}) @@ -13,16 +16,25 @@ def test_detail(user: settings.AUTH_USER_MODEL): assert resolve(f"/users/{user.username}/").view_name == "users:detail" +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) def test_list(): assert reverse("users:list") == "/users/" assert resolve("/users/").view_name == "users:list" +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) def test_update(): assert reverse("users:update") == "/users/~update/" assert resolve("/users/~update/").view_name == "users:update" +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) def test_redirect(): assert reverse("users:redirect") == "/users/~redirect/" assert resolve("/users/~redirect/").view_name == "users:redirect" diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 76cb80aa8..f782c4fb5 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -7,6 +7,9 @@ from {{ cookiecutter.project_slug }}.users.views import UserRedirectView, UserUp pytestmark = pytest.mark.django_db +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) class TestUserUpdateView: """ TODO: @@ -39,6 +42,9 @@ class TestUserUpdateView: assert view.get_object() == user +@pytest.mark.skipif( + not settings.USER_APP_URLS_ENABLED, reason="User app is disabled." +) class TestUserRedirectView: def test_get_redirect_url( self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory