From a3f64c573a75d2217305b82ace222468d8c0b8cc Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Tue, 18 Aug 2020 08:24:40 +0200 Subject: [PATCH] Reduce test setup --- articles/models.py | 7 +++++++ articles/tests/test_articles.py | 28 ++++++---------------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/articles/models.py b/articles/models.py index 157fcd9..a19c67b 100644 --- a/articles/models.py +++ b/articles/models.py @@ -87,3 +87,10 @@ class Page(Article): class Meta: ordering = ["position", "-published_at"] + + +# class Comment(models.Model): +# username = models.CharField(max_length=255) +# email = models.EmailField(blank=True, null=True) +# content = models.TextField() +# article = models.ForeignKey(Article, on_delete=models.CASCADE) diff --git a/articles/tests/test_articles.py b/articles/tests/test_articles.py index e666925..eea0152 100644 --- a/articles/tests/test_articles.py +++ b/articles/tests/test_articles.py @@ -1,28 +1,14 @@ import pytest from django.test import Client -from django.utils import timezone +from model_bakery import baker from articles.models import Article, Page, User @pytest.mark.django_db def test_can_access_list(client: Client, author: User): - article = Article.objects.create( - author=author, - title="Sample published", - status=Article.PUBLISHED, - published_at=timezone.now(), - slug="sample-published", - content="Some content lorem ipsum", - ) - page = Page.objects.create( - author=author, - title="Sample page published", - status=Article.PUBLISHED, - published_at=timezone.now(), - slug="sample-page-published", - content="Some page content lorem ipsum", - ) + article = baker.make(Article, author=author, status=Article.PUBLISHED) + page = baker.make(Page, author=author, status=Article.PUBLISHED) res = client.get("/") assert res.status_code == 200 content = res.content.decode("utf-8") @@ -36,12 +22,10 @@ def test_can_access_list(client: Client, author: User): def test_abstract_shown_on_list(client: Client, author: User): abstract = "Some abstract" after = "Some content after abstract" - article = Article.objects.create( - author=author, - title="Sample published", + baker.make( + Article, status=Article.PUBLISHED, - published_at=timezone.now(), - slug="sample-published", + author=author, content=f"{abstract}\n\n{after}", ) res = client.get("/")