From 5664be5074fbf50bd8dfa5490142088cb87f4f91 Mon Sep 17 00:00:00 2001 From: Laetitia Date: Sun, 10 Dec 2023 19:22:22 +0100 Subject: [PATCH] add test for deadline nug resolution --- la_chariotte/order/forms.py | 1 - .../test_views/test_views_grouped_order.py | 27 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/la_chariotte/order/forms.py b/la_chariotte/order/forms.py index 3f7bb48..bd622d6 100644 --- a/la_chariotte/order/forms.py +++ b/la_chariotte/order/forms.py @@ -64,7 +64,6 @@ class GroupedOrderForm(forms.ModelForm): self.instance.deadline = to_current_timezone(self.instance.deadline) self.initial["deadline_date"] = self.instance.deadline.date() self.initial["deadline_time"] = self.instance.deadline.time() - # TODO: there is a bug here ; the time displayed in form is 2 hours earlier than the actual deadline time def save(self, commit=True): self.instance.orga = get_user_model().objects.get(id=self.user.pk) diff --git a/la_chariotte/order/tests/test_views/test_views_grouped_order.py b/la_chariotte/order/tests/test_views/test_views_grouped_order.py index c702458..9d1b145 100644 --- a/la_chariotte/order/tests/test_views/test_views_grouped_order.py +++ b/la_chariotte/order/tests/test_views/test_views_grouped_order.py @@ -4,6 +4,7 @@ from io import StringIO import pytest from django.contrib import auth +from django.forms.utils import to_current_timezone from django.urls import reverse from django.utils import timezone @@ -830,7 +831,31 @@ class TestGroupedOrderCreateView: class TestGroupedOrderUpdateView: - def test_update_grouped_order(self, client_log): + def test_get_update_grouped_order(self, client_log): + """ + The grouped order orga updates a grouped order updates an incoming grouped order. + """ + grouped_order = create_grouped_order( + days_before_delivery_date=5, + days_before_deadline=2, + name="gr order test", + orga_user=auth.get_user(client_log), + ) + grouped_order.deadline = to_current_timezone(timezone.now()) + grouped_order.save() + assert models.GroupedOrder.objects.count() == 1 + assert models.GroupedOrder.objects.first().name == "gr order test" + assert models.GroupedOrder.objects.first().place == None + + # get the update form + update_grouped_order_url = reverse( + "order:update_grouped_order", kwargs={"code": grouped_order.code} + ) + response = client_log.get(update_grouped_order_url) + assert response.status_code == 200 + assert grouped_order.deadline.strftime("%H:%M") in response.content.decode() + + def test_post_update_grouped_order(self, client_log): """ The grouped order orga updates a grouped order updates an incoming grouped order. """