mirror of
https://framagit.org/la-chariotte/la-chariotte.git
synced 2025-05-02 20:01:51 +02:00
add test for deadline nug resolution
This commit is contained in:
parent
1aa5f985db
commit
5664be5074
2 changed files with 26 additions and 2 deletions
|
@ -64,7 +64,6 @@ class GroupedOrderForm(forms.ModelForm):
|
||||||
self.instance.deadline = to_current_timezone(self.instance.deadline)
|
self.instance.deadline = to_current_timezone(self.instance.deadline)
|
||||||
self.initial["deadline_date"] = self.instance.deadline.date()
|
self.initial["deadline_date"] = self.instance.deadline.date()
|
||||||
self.initial["deadline_time"] = self.instance.deadline.time()
|
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):
|
def save(self, commit=True):
|
||||||
self.instance.orga = get_user_model().objects.get(id=self.user.pk)
|
self.instance.orga = get_user_model().objects.get(id=self.user.pk)
|
||||||
|
|
|
@ -4,6 +4,7 @@ from io import StringIO
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from django.contrib import auth
|
from django.contrib import auth
|
||||||
|
from django.forms.utils import to_current_timezone
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
|
@ -830,7 +831,31 @@ class TestGroupedOrderCreateView:
|
||||||
|
|
||||||
|
|
||||||
class TestGroupedOrderUpdateView:
|
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.
|
The grouped order orga updates a grouped order updates an incoming grouped order.
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue