| {% trans %}User{% endtrans %} | diff --git a/club/tests/base.py b/club/tests/base.py index 47f50264..8ae8f3f4 100644 --- a/club/tests/base.py +++ b/club/tests/base.py @@ -6,8 +6,10 @@ from django.test import TestCase from django.urls import reverse from django.utils.timezone import now from model_bakery import baker +from model_bakery.recipe import Recipe from club.models import Club, Membership +from core.baker_recipes import old_subscriber_user, subscriber_user from core.models import User @@ -17,8 +19,9 @@ class TestClub(TestCase): The generated dataset is the one created by the populate command, plus the following modifications : - - `self.club` is a dummy club recreated for each test - - `self.club` has two board members : skia (role 3) and comptable (role 10) + - `self.club` is a dummy club + - `self.club` has two board members : + simple_board_member (role 3) and president (role 10) - `self.club` has one regular member : richard - `self.club` has one former member : sli (who had role 2) - None of the `self.club` members are in the AE club. @@ -27,44 +30,30 @@ class TestClub(TestCase): @classmethod def setUpTestData(cls): # subscribed users - initial members - cls.skia = User.objects.get(username="skia") - # by default, Skia is in the AE, which creates side effect - cls.skia.memberships.all().delete() + cls.president, cls.simple_board_member = subscriber_user.make(_quantity=2) cls.richard = User.objects.get(username="rbatsbak") - cls.comptable = User.objects.get(username="comptable") cls.sli = User.objects.get(username="sli") - cls.root = User.objects.get(username="root") + cls.root = baker.make(User, is_superuser=True) + cls.old_subscriber = old_subscriber_user.make() + cls.public = baker.make(User) - # subscribed users - not initial members + # subscribed users - not initial member cls.krophil = User.objects.get(username="krophil") - cls.subscriber = User.objects.get(username="subscriber") - - # old subscriber - cls.old_subscriber = User.objects.get(username="old_subscriber") - - # not subscribed - cls.public = User.objects.get(username="public") + cls.subscriber = subscriber_user.make() cls.ae = Club.objects.get(pk=settings.SITH_MAIN_CLUB_ID) cls.club = baker.make(Club) cls.members_url = reverse("club:club_members", kwargs={"club_id": cls.club.id}) a_month_ago = now() - timedelta(days=30) yesterday = now() - timedelta(days=1) - Membership.objects.create( - club=cls.club, user=cls.skia, start_date=a_month_ago, role=3 + membership_recipe = Recipe(Membership, club=cls.club) + membership_recipe.make( + user=cls.simple_board_member, start_date=a_month_ago, role=3 ) - Membership.objects.create(club=cls.club, user=cls.richard, role=1) - Membership.objects.create( - club=cls.club, user=cls.comptable, start_date=a_month_ago, role=10 - ) - - # sli was a member but isn't anymore - Membership.objects.create( - club=cls.club, - user=cls.sli, - start_date=a_month_ago, - end_date=yesterday, - role=2, + membership_recipe.make(user=cls.richard, role=1) + membership_recipe.make(user=cls.president, start_date=a_month_ago, role=10) + membership_recipe.make( # sli was a member but isn't anymore + user=cls.sli, start_date=a_month_ago, end_date=yesterday, role=2 ) def setUp(self): diff --git a/club/tests/test_mailing.py b/club/tests/test_mailing.py index 7076ac0c..e8ea3a9b 100644 --- a/club/tests/test_mailing.py +++ b/club/tests/test_mailing.py @@ -38,7 +38,7 @@ class TestMailingForm(TestCase): self.assertRedirects(response, self.mail_url) response = self.client.get(self.mail_url) assert response.status_code == 200 - assert "Liste de diffusion foyer@utbm.fr" in response.content.decode() + assert "Liste de diffusion foyer@utbm.fr" in response.text # Test with Root self.client.force_login(self.root) @@ -48,7 +48,7 @@ class TestMailingForm(TestCase): ) response = self.client.get(self.mail_url) assert response.status_code == 200 - assert "Liste de diffusion mde@utbm.fr" in response.content.decode() + assert "Liste de diffusion mde@utbm.fr" in response.text def test_mailing_list_add_moderation(self): self.client.force_login(self.rbatsbak) @@ -58,7 +58,7 @@ class TestMailingForm(TestCase): ) response = self.client.get(self.mail_url) assert response.status_code == 200 - content = response.content.decode() + content = response.text assert "Liste de diffusion mde@utbm.fr" not in content assert "
| Utilisateur | Rôle | Description | " - "Depuis | Marquer comme ancien | " - "
| ' - f"{user.get_display_name()} | " - f"{settings.SITH_CLUB_ROLES[membership.role]} | " - f"{membership.description} | " - f"{membership.start_date} | " - ) - if membership.role <= 3: # 3 is the role of skia - expected_html += ( - '' - ) - input_id += 1 - expected_html += " |
Votre nom d\'utilisateur ' "et votre mot de passe ne correspondent pas. Merci de réessayer.
" - ) in str(response.content.decode()) + ) in response.text assert response.wsgi_request.user.is_anonymous def test_login_success(self, client, user): @@ -246,7 +247,7 @@ class TestPageHandling(TestCase): response = self.client.get(reverse("core:page", kwargs={"page_name": "guy"})) assert response.status_code == 200 - html = response.content.decode() + html = response.text assert '' in html assert '' in html assert '' in html @@ -256,12 +257,12 @@ class TestPageHandling(TestCase): parent = baker.prepare(Page) parent.save(force_lock=True) response = self.client.get( - reverse("core:page_new") + f"?page={parent._full_name}/new" + reverse("core:page_new", query={"page": f"{parent._full_name}/new"}) ) assert response.status_code == 200 # The name and parent inputs should be already filled - soup = BeautifulSoup(response.content.decode(), "lxml") + soup = BeautifulSoup(response.text, "lxml") assert soup.find("input", {"name": "name"})["value"] == "new" select = soup.find("autocomplete-select", {"name": "parent"}) assert select.find("option", {"selected": True})["value"] == str(parent.id) @@ -278,7 +279,7 @@ class TestPageHandling(TestCase): assertRedirects(response, new_url, fetch_redirect_response=False) response = self.client.get(new_url) assert response.status_code == 200 - assert f'' in response.content.decode() + assert f'' in response.text def test_access_child_page_ok(self): """Should display a page correctly.""" @@ -290,14 +291,14 @@ class TestPageHandling(TestCase): reverse("core:page", kwargs={"page_name": "guy/bibou"}) ) assert response.status_code == 200 - html = response.content.decode() + html = response.text self.assertIn('', html) def test_access_page_not_found(self): """Should not display a page correctly.""" response = self.client.get(reverse("core:page", kwargs={"page_name": "swagg"})) assert response.status_code == 200 - html = response.content.decode() + html = response.text self.assertIn('', html) def test_create_page_markdown_safe(self): @@ -331,7 +332,7 @@ http://git.an<guy>Bibou</guy>
<script>alert('Guy');</script>
""" - assertInHTML(expected, response.content.decode()) + assertInHTML(expected, response.text) @pytest.mark.django_db @@ -340,7 +341,9 @@ class TestUserTools: """An anonymous user shouldn't have access to the tools page.""" url = reverse("core:user_tools") response = client.get(url) - assertRedirects(response, expected_url=reverse("core:login") + f"?next={url}") + assertRedirects( + response, expected_url=reverse("core:login", query={"next": url}) + ) @pytest.mark.parametrize("username", ["guy", "root", "skia", "comunity"]) def test_page_is_working(self, client, username): diff --git a/core/tests/test_files.py b/core/tests/test_files.py index 4afc4583..70a01c7a 100644 --- a/core/tests/test_files.py +++ b/core/tests/test_files.py @@ -147,8 +147,8 @@ class TestUserProfilePicture: reverse( "core:file_delete", kwargs={"file_id": user.profile_pict.pk, "popup": ""}, - ) - + f"?next={user.get_absolute_url()}" + query={"next": user.get_absolute_url()}, + ), ) @pytest.mark.parametrize( diff --git a/core/tests/test_user.py b/core/tests/test_user.py index d14bfc3c..b15c7bbe 100644 --- a/core/tests/test_user.py +++ b/core/tests/test_user.py @@ -72,7 +72,9 @@ class TestSearchUsersAPI(TestSearchUsers): expected = [u.id for u in self.users[::-1]] for term in ["first", "First", "FIRST"]: - response = self.client.get(reverse("api:search_users") + f"?search={term}") + response = self.client.get( + reverse("api:search_users", query={"search": term}) + ) assert response.status_code == 200 assert response.json()["count"] == 11 assert [r["id"] for r in response.json()["results"]] == expected diff --git a/counter/templates/counter/refound_account.jinja b/counter/templates/counter/refound_account.jinja index 9e726a24..2f43b0a9 100644 --- a/counter/templates/counter/refound_account.jinja +++ b/counter/templates/counter/refound_account.jinja @@ -5,12 +5,12 @@ {% endblock %} {% block content %} -