From 8b7949250879d6cef417af6cec7c4a6b5dbd4cc9 Mon Sep 17 00:00:00 2001 From: pauline Date: Sun, 28 Jan 2024 16:12:38 +0100 Subject: [PATCH] correct test unit --- la_chariotte/order/views/grouped_order.py | 2 +- la_chariotte/order/views/order.py | 9 ++++- .../tests/test_order_views_grouped_order.py | 39 +++++++++++++++++-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py index 9e8881e..75e9eb3 100644 --- a/la_chariotte/order/views/grouped_order.py +++ b/la_chariotte/order/views/grouped_order.py @@ -395,7 +395,7 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView): row.append(str(order.price).replace(".", ",")) row.append(order.author.email) row.append(f"'{order.author.phone}") - row.append(f'\'{order.created_date.strftime("%d %B %Y %H:%M:%S")}') + row.append(f'\'{order.created_date.strftime("%d %B %Y %H:%M")}') row.append(f"'{order.note}") writer.writerow(row) diff --git a/la_chariotte/order/views/order.py b/la_chariotte/order/views/order.py index 069a941..4a02b90 100644 --- a/la_chariotte/order/views/order.py +++ b/la_chariotte/order/views/order.py @@ -2,8 +2,8 @@ from django import http from django.contrib.auth.mixins import UserPassesTestMixin from django.shortcuts import get_object_or_404, render from django.urls import reverse, reverse_lazy -from django.views import generic from django.utils import timezone +from django.views import generic from la_chariotte.mail.utils import send_order_confirmation_mail @@ -49,7 +49,12 @@ def place_order(request, code): author = OrderAuthor.objects.create( first_name=first_name, last_name=last_name, email=email, phone=phone ) - order = Order.objects.create(author=author, grouped_order=grouped_order, note=note, created_date=timezone.now()) + order = Order.objects.create( + author=author, + grouped_order=grouped_order, + note=note, + created_date=timezone.now(), + ) # add items to the order error_message = None diff --git a/la_chariotte/tests/test_order_views_grouped_order.py b/la_chariotte/tests/test_order_views_grouped_order.py index 83f5dfd..01de073 100644 --- a/la_chariotte/tests/test_order_views_grouped_order.py +++ b/la_chariotte/tests/test_order_views_grouped_order.py @@ -1631,6 +1631,7 @@ class TestExportGroupedOrderToCSVView: content = response.content.decode("utf-8") csv_reader = csv.reader(StringIO(content)) body = list(csv_reader) + created_date = f'\'{timezone.now().strftime("%d %B %Y %H:%M")}' assert body == [ [ "", @@ -1640,11 +1641,43 @@ class TestExportGroupedOrderToCSVView: "Prix de la commande", "Mail", "Téléphone", + "Date et Heure", + "Note", ], ["", "Prix unitaire TTC (€)", "2,00", "9,00"], ["Nom", "Prénom"], - ["alescargot", "bob", "1", "0", "2,00", "bob2@escargot.fr", "'000"], - ["alescargot", "bobby", "0", "1", "9,00", "bob3@escargot.fr", "'000"], - ["lescargot", "bob", "3", "2", "24,00", "bob@escargot.fr", "'000"], + [ + "alescargot", + "bob", + "1", + "0", + "2,00", + "bob2@escargot.fr", + "'000", + created_date, + "'None", + ], + [ + "alescargot", + "bobby", + "0", + "1", + "9,00", + "bob3@escargot.fr", + "'000", + created_date, + "'None", + ], + [ + "lescargot", + "bob", + "3", + "2", + "24,00", + "bob@escargot.fr", + "'000", + created_date, + "'None", + ], ["", "TOTAL", "4", "3", "35,00"], ]