diff --git a/la_chariotte/order/tests/test_models.py b/la_chariotte/order/tests/test_models.py index e4db427..06ca6d8 100644 --- a/la_chariotte/order/tests/test_models.py +++ b/la_chariotte/order/tests/test_models.py @@ -1,48 +1,25 @@ import datetime from django.utils import timezone -<<<<<<< HEAD - from la_chariotte.order.models import GroupedOrder class TestGroupedOrdersModel: """Tests for Grouped orders model""" - -======= -from la_chariotte.order.models import Grouped_order - - -class TestGroupedOrdersModel: - """Tests for Grouped orders model""" -<<<<<<< HEAD ->>>>>>> 9cc7783 (install pytest) -======= - ->>>>>>> f6ec481 (install black and format files) def test_is_ongoing_with_ongoing_grouped_order(self): """ is_ongoing() returns True if the deadline is not crossed """ deadline = timezone.now() + datetime.timedelta(days=10) -<<<<<<< HEAD + ongoing_gr_order = GroupedOrder(deadline=deadline) assert ongoing_gr_order.is_ongoing() -======= - ongoing_gr_order = Grouped_order(deadline=deadline) -<<<<<<< HEAD - assert ongoing_gr_order.is_ongoing() == True ->>>>>>> 9cc7783 (install pytest) -======= - assert ongoing_gr_order.is_ongoing() ->>>>>>> 7882cae (install flake8 and check files) def test_is_ongoing_with_old_grouped_order(self): """ is_ongoing() returns False if the deadline is crossed """ deadline = timezone.now() - datetime.timedelta(hours=1) -<<<<<<< HEAD old_gr_order = GroupedOrder(deadline=deadline) assert not old_gr_order.is_ongoing() @@ -70,10 +47,3 @@ class TestGroupedOrdersModel: del_date = timezone.now().date() + datetime.timedelta(days=1) old_gr_order = GroupedOrder(deadline=deadline, delivery_date=del_date) assert old_gr_order.is_to_be_delivered() -======= - ongoing_gr_order = Grouped_order(deadline=deadline) - assert not ongoing_gr_order.is_ongoing() -<<<<<<< HEAD ->>>>>>> 9cc7783 (install pytest) -======= ->>>>>>> f6ec481 (install black and format files) diff --git a/la_chariotte/order/tests/test_views.py b/la_chariotte/order/tests/test_views.py index d56052a..a9e0a59 100644 --- a/la_chariotte/order/tests/test_views.py +++ b/la_chariotte/order/tests/test_views.py @@ -1,7 +1,6 @@ import datetime import pytest -<<<<<<< HEAD from django.urls import reverse from django.utils import timezone @@ -10,29 +9,12 @@ from la_chariotte.order.models import GroupedOrder, Item, Order pytestmark = pytest.mark.django_db -def create_grouped_order(days_before_delivery_date, days_before_deadline, name): -======= - -from django.urls import reverse -from django.utils import timezone -from la_chariotte.order.models import Grouped_order - -pytestmark = pytest.mark.django_db - -<<<<<<< HEAD def create_grouped_order(days_before_delivery_date,days_before_deadline,name): ->>>>>>> 9cc7783 (install pytest) -======= - -def create_grouped_order(days_before_delivery_date, days_before_deadline, name): ->>>>>>> f6ec481 (install black and format files) """ Creates a grouped order. """ date = timezone.now().date() + datetime.timedelta(days=days_before_delivery_date) deadline = timezone.now() + datetime.timedelta(days=days_before_deadline) -<<<<<<< HEAD -<<<<<<< HEAD return GroupedOrder.objects.create( name=name, orga="test orga", delivery_date=date, deadline=deadline ) @@ -75,14 +57,6 @@ class TestGroupedOrderIndexView: days_before_delivery_date=-1, days_before_deadline=-3, name="old" ) response = client.get(reverse("order:index")) -======= - return Grouped_order.objects.create(name=name, orga="test orga",delivery_date=date,deadline=deadline) -======= - return Grouped_order.objects.create( - name=name, orga="test orga", delivery_date=date, deadline=deadline - ) - ->>>>>>> f6ec481 (install black and format files) class TestGroupedOrderIndexView: def test_no_grouped_orders(self, client): @@ -105,33 +79,15 @@ class TestGroupedOrderIndexView: """ According to their delivery date and deadline, grouped orders are placed in the correct section : several gr orders """ -<<<<<<< HEAD future_grouped_order = create_grouped_order(days_before_delivery_date=5,days_before_deadline=2,name="future") crossed_deadline_gr_order = create_grouped_order(days_before_delivery_date=2, days_before_deadline=-1,name="crossed deadline") old_gr_order = create_grouped_order(days_before_delivery_date=-1, days_before_deadline=-3,name="old") response = client.get(reverse('order:index')) ->>>>>>> 9cc7783 (install pytest) -======= - future_grouped_order = create_grouped_order( - days_before_delivery_date=5, days_before_deadline=2, name="future" - ) - crossed_deadline_gr_order = create_grouped_order( - days_before_delivery_date=2, - days_before_deadline=-1, - name="crossed deadline", - ) - old_gr_order = create_grouped_order( - days_before_delivery_date=-1, days_before_deadline=-3, name="old" - ) - response = client.get(reverse("order:index")) ->>>>>>> f6ec481 (install black and format files) assert response.status_code == 200 assert "Pas de commande groupée pour l'instant" not in response.content.decode() assert "Commandes groupées à venir" in response.content.decode() assert "Livraison à venir" in response.content.decode() assert "Livraison passée" in response.content.decode() -<<<<<<< HEAD -<<<<<<< HEAD assert len(response.context["grouped_order_list"]["old_grouped_orders"]) == 1 assert ( len( @@ -139,11 +95,6 @@ class TestGroupedOrderIndexView: "crossed_deadline_grouped_orders" ] ) -======= - assert len(response.context["grouped_order_list"]["old_grouped_orders"]) == 1 - assert ( - len(response.context["grouped_order_list"]["orders_over_grouped_orders"]) ->>>>>>> f6ec481 (install black and format files) == 1 ) assert ( @@ -154,18 +105,13 @@ class TestGroupedOrderIndexView: == old_gr_order ) assert ( -<<<<<<< HEAD response.context["grouped_order_list"]["crossed_deadline_grouped_orders"][0] -======= - response.context["grouped_order_list"]["orders_over_grouped_orders"][0] ->>>>>>> f6ec481 (install black and format files) == crossed_deadline_gr_order ) assert ( response.context["grouped_order_list"]["incoming_grouped_orders"][0] == future_grouped_order ) -<<<<<<< HEAD def test_grouped_orders_in_right_section__with_only_old(self, client): """ @@ -175,37 +121,18 @@ class TestGroupedOrderIndexView: days_before_delivery_date=-1, days_before_deadline=-3, name="passée" ) response = client.get(reverse("order:index")) -======= - assert len(response.context['grouped_order_list']['old_grouped_orders']) == 1 - assert len(response.context['grouped_order_list']['orders_over_grouped_orders']) == 1 - assert len(response.context['grouped_order_list']['incoming_grouped_orders']) == 1 - assert response.context['grouped_order_list']['old_grouped_orders'][0] == old_gr_order - assert response.context['grouped_order_list']['orders_over_grouped_orders'][0] == crossed_deadline_gr_order - assert response.context['grouped_order_list']['incoming_grouped_orders'][0] == future_grouped_order -======= ->>>>>>> f6ec481 (install black and format files) def test_grouped_orders_in_right_section__with_only_old(self, client): """ According to their delivery date and deadline, grouped orders are placed in correct section : only old gr order """ -<<<<<<< HEAD old_gr_order = create_grouped_order(days_before_delivery_date=-1, days_before_deadline=-3,name="passée") response = client.get(reverse('order:index')) ->>>>>>> 9cc7783 (install pytest) -======= - old_gr_order = create_grouped_order( - days_before_delivery_date=-1, days_before_deadline=-3, name="passée" - ) - response = client.get(reverse("order:index")) ->>>>>>> f6ec481 (install black and format files) assert response.status_code == 200 assert "Pas de commande groupée pour l'instant" not in response.content.decode() assert "Commandes groupées à venir" not in response.content.decode() assert "Livraison à venir" not in response.content.decode() assert "Livraison passée" in response.content.decode() -<<<<<<< HEAD -<<<<<<< HEAD assert len(response.context["grouped_order_list"]["old_grouped_orders"]) == 1 assert ( len( @@ -213,11 +140,6 @@ class TestGroupedOrderIndexView: "crossed_deadline_grouped_orders" ] ) -======= - assert len(response.context["grouped_order_list"]["old_grouped_orders"]) == 1 - assert ( - len(response.context["grouped_order_list"]["orders_over_grouped_orders"]) ->>>>>>> f6ec481 (install black and format files) == 0 ) assert ( @@ -227,7 +149,6 @@ class TestGroupedOrderIndexView: response.context["grouped_order_list"]["old_grouped_orders"][0] == old_gr_order ) -<<<<<<< HEAD def test_grouped_orders_in_right_section__with_only_future(self, client): """ @@ -237,35 +158,18 @@ class TestGroupedOrderIndexView: days_before_delivery_date=5, days_before_deadline=2, name="future" ) response = client.get(reverse("order:index")) -======= - assert len(response.context['grouped_order_list']['old_grouped_orders']) == 1 - assert len(response.context['grouped_order_list']['orders_over_grouped_orders']) == 0 - assert len(response.context['grouped_order_list']['incoming_grouped_orders']) == 0 - assert response.context['grouped_order_list']['old_grouped_orders'][0] == old_gr_order -======= ->>>>>>> f6ec481 (install black and format files) def test_grouped_orders_in_right_section__with_only_future(self, client): """ According to their delivery date and deadline, grouped orders are placed in correct section : only incoming gr order """ -<<<<<<< HEAD future_grouped_order = create_grouped_order(days_before_delivery_date=5,days_before_deadline=2,name="future") response = client.get(reverse('order:index')) ->>>>>>> 9cc7783 (install pytest) -======= - future_grouped_order = create_grouped_order( - days_before_delivery_date=5, days_before_deadline=2, name="future" - ) - response = client.get(reverse("order:index")) ->>>>>>> f6ec481 (install black and format files) assert response.status_code == 200 assert "Pas de commande groupée pour l'instant" not in response.content.decode() assert "Commandes groupées à venir" in response.content.decode() assert "Livraison à venir" not in response.content.decode() assert "Livraison passée" not in response.content.decode() -<<<<<<< HEAD -<<<<<<< HEAD assert len(response.context["grouped_order_list"]["old_grouped_orders"]) == 0 assert ( len( @@ -273,11 +177,6 @@ class TestGroupedOrderIndexView: "crossed_deadline_grouped_orders" ] ) -======= - assert len(response.context["grouped_order_list"]["old_grouped_orders"]) == 0 - assert ( - len(response.context["grouped_order_list"]["orders_over_grouped_orders"]) ->>>>>>> f6ec481 (install black and format files) == 0 ) assert ( @@ -287,7 +186,6 @@ class TestGroupedOrderIndexView: response.context["grouped_order_list"]["incoming_grouped_orders"][0] == future_grouped_order ) -<<<<<<< HEAD class TestGroupedOrderDetailView: @@ -333,11 +231,3 @@ class TestGroupedOrderDetailView: assert item.ordered_nb == 1 order = Order.objects.first() assert order.ordered_items.count() == 1 -======= - assert len(response.context['grouped_order_list']['old_grouped_orders']) == 0 - assert len(response.context['grouped_order_list']['orders_over_grouped_orders']) == 0 - assert len(response.context['grouped_order_list']['incoming_grouped_orders']) == 1 - assert response.context['grouped_order_list']['incoming_grouped_orders'][0] == future_grouped_order ->>>>>>> 9cc7783 (install pytest) -======= ->>>>>>> f6ec481 (install black and format files) diff --git a/pyproject.toml b/pyproject.toml index 3a5c94b..68763da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,9 +35,6 @@ isort_ignore = ["*migrations/*.py"] [tool.isort] skip_glob = ["*migrations/*.py"] -[tool.pytest.ini_options] -DJANGO_SETTINGS_MODULE = "la_chariotte.settings" - [tool.black] line-length = 88 exclude = '''