Skip to content

Commit fd23ddd

Browse files
committed
No more test_feincms3
1 parent 8de8ba9 commit fd23ddd

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

tests/testapp/test_feincms3.py renamed to tests/testapp/test_pages.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
from django.core.checks import Warning
66
from django.core.exceptions import ValidationError
77
from django.db import IntegrityError, connection, transaction
8-
from django.test import RequestFactory
98
from django.test.utils import CaptureQueriesContext, isolate_apps, override_settings
109
from django.urls import reverse
1110
from pytest_django.asserts import assertContains, assertRedirects
1211

1312
from feincms3 import mixins
1413
from feincms3.pages import AbstractPage
15-
from feincms3.shortcuts import render_list
16-
from testapp.models import Article, Page
14+
from testapp.models import Page
1715

1816

1917
def zero_management_form_data(prefix):
@@ -698,23 +696,6 @@ def test_get_absolute_url():
698696
assert Page(path="/").get_absolute_url() == "/"
699697

700698

701-
@pytest.mark.django_db
702-
def test_render_list():
703-
"""render_list, automatic template selection and pagination"""
704-
for i in range(7):
705-
Article.objects.create(title=f"Article {i}", category="publications")
706-
707-
request = RequestFactory().get("/", data={"page": 2})
708-
response = render_list(
709-
request, list(Article.objects.all()), model=Article, paginate_by=2
710-
)
711-
712-
assert response.template_name == "testapp/article_list.html"
713-
assert len(response.context_data["object_list"]) == 2
714-
assert response.context_data["object_list"].number == 2
715-
assert response.context_data["object_list"].paginator.num_pages == 4
716-
717-
718699
@isolate_apps("testapp")
719700
def test_page_with_missing_ordering():
720701
"""Page subclass without ordering doesn't check out"""

tests/testapp/test_utils.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33

44
import pytest
55
from django.template import Context, Template
6+
from django.test import RequestFactory
67
from django.test.utils import override_settings
78
from pytest_django.asserts import assertHTMLEqual
89

10+
from feincms3.shortcuts import render_list
911
from feincms3.utils import is_first_party_link, upload_to
12+
from testapp.models import Article
1013

1114

1215
@pytest.mark.parametrize(
@@ -81,3 +84,20 @@ def test_upload_to():
8184
assert upload_to(instance, filename) == "/".join(
8285
["image", ordinal[1:3], ordinal[3:6], filename]
8386
)
87+
88+
89+
@pytest.mark.django_db
90+
def test_render_list():
91+
"""render_list, automatic template selection and pagination"""
92+
for i in range(7):
93+
Article.objects.create(title=f"Article {i}", category="publications")
94+
95+
request = RequestFactory().get("/", data={"page": 2})
96+
response = render_list(
97+
request, list(Article.objects.all()), model=Article, paginate_by=2
98+
)
99+
100+
assert response.template_name == "testapp/article_list.html"
101+
assert len(response.context_data["object_list"]) == 2
102+
assert response.context_data["object_list"].number == 2
103+
assert response.context_data["object_list"].paginator.num_pages == 4

0 commit comments

Comments
 (0)