Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions zds/tutorialv2/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ def __init__(self, **kwargs):
class TutorialTestMixin:
overridden_zds_app = overridden_zds_app

def assertLastMessageLevel(self, req_result, level):
msgs = req_result.context["messages"]
self.assertNotEqual(len(msgs), 0)
self.assertEqual(list(msgs)[-1].level, level)

def clean_media_dir(self):
shutil.rmtree(self.overridden_zds_app["content"]["repo_private_path"], ignore_errors=True)
shutil.rmtree(self.overridden_zds_app["content"]["repo_public_path"], ignore_errors=True)
Expand Down
9 changes: 9 additions & 0 deletions zds/tutorialv2/tests/tests_views/tests_addcontributor.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from unittest.mock import patch

from django.conf import settings
from django.contrib import messages
from django.test import TestCase
from django.urls import reverse
from django.utils.html import escape
Expand Down Expand Up @@ -197,3 +198,11 @@ def test_invalid_role(self, contributors_management):
)
self.assertEqual(list(ContentContribution.objects.all()), [])
self.check_signal(contributors_management, emitted=False)

@patch("zds.tutorialv2.signals.contributors_management")
def test_too_long_comment(self, contributors_management):
form_data = {"username": self.contributor, "contribution_role": self.role.pk, "comment": "a" * 1024}
response = self.client.post(self.form_url, form_data, follow=True)
self.assertLastMessageLevel(response, messages.ERROR)
self.assertEqual(list(ContentContribution.objects.all()), [])
self.check_signal(contributors_management, emitted=False)
68 changes: 10 additions & 58 deletions zds/tutorialv2/tests/tests_views/tests_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -1281,11 +1281,7 @@ def test_import_with_bad_title(self):
},
)
self.assertEqual(200, answer.status_code)
msgs = answer.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.ERROR)
self.assertLastMessageLevel(answer, messages.ERROR)

def test_import_image_with_archive(self):
"""ensure that import archive work, and link are changed"""
Expand Down Expand Up @@ -2339,12 +2335,7 @@ def test_warn_typo(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.ERROR)
self.assertLastMessageLevel(result, messages.ERROR)

# login with normal user
self.client.logout()
Expand Down Expand Up @@ -2374,12 +2365,7 @@ def test_warn_typo(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.SUCCESS)
self.assertLastMessageLevel(result, messages.SUCCESS)

# check PM :
sent_pm = PrivateTopic.objects.filter(author=self.user_guest.pk).last()
Expand All @@ -2394,12 +2380,8 @@ def test_warn_typo(self):
follow=True,
)
self.assertEqual(result.status_code, 200)
self.assertLastMessageLevel(result, messages.SUCCESS)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.SUCCESS)
self.chapter1.parent.parent = versioned
# check PM :
sent_pm = PrivateTopic.objects.filter(author=self.user_guest.pk).last()
Expand Down Expand Up @@ -2459,12 +2441,7 @@ def test_warn_typo(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.SUCCESS)
self.assertLastMessageLevel(result, messages.SUCCESS)

# check PM :
sent_pm = PrivateTopic.objects.filter(author=self.user_guest.pk).last()
Expand All @@ -2484,12 +2461,7 @@ def test_warn_typo(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.SUCCESS)
self.assertLastMessageLevel(result, messages.SUCCESS)

# check PM :
sent_pm = PrivateTopic.objects.filter(author=self.user_guest.pk).last()
Expand Down Expand Up @@ -2526,12 +2498,7 @@ def test_concurent_edition(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.ERROR)
self.assertLastMessageLevel(result, messages.ERROR)

tuto = PublishableContent.objects.get(pk=tuto.pk)
chapter_version = tuto.load_version().children[0]
Expand Down Expand Up @@ -2591,12 +2558,7 @@ def test_concurent_edition(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.ERROR)
self.assertLastMessageLevel(result, messages.ERROR)

versioned = PublishableContent.objects.get(pk=tuto.pk).load_version()
extract = versioned.children[0].children[0]
Expand Down Expand Up @@ -2969,12 +2931,7 @@ def test_no_form_not_allowed(self):

result = self.client.get(reverse("content:create-extract", args=[tuto.pk, tuto.slug]), follow=True)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.ERROR) # get an error message
self.assertLastMessageLevel(result, messages.ERROR)

# create a container while there is already an extract:
versioned = tuto.load_version()
Expand All @@ -2996,12 +2953,7 @@ def test_no_form_not_allowed(self):
follow=True,
)
self.assertEqual(result.status_code, 200)

msgs = result.context["messages"]
last = None
for msg in msgs:
last = msg
self.assertEqual(last.level, messages.ERROR)
self.assertLastMessageLevel(result, messages.ERROR)

def test_gallery_not_deleted_if_linked_to_content(self):
"""Ensure that a gallery cannot be deleted if linked to a content"""
Expand Down
1 change: 1 addition & 0 deletions zds/tutorialv2/views/contributors.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class ContributionForm(forms.Form):
comment = forms.CharField(
label=_("Commentaire"),
required=False,
max_length=ContentContribution._meta.get_field("comment").max_length,
widget=forms.Textarea(attrs={"placeholder": _("Commentaire sur ce contributeur."), "rows": "3"}),
)

Expand Down