post-rebase fix

Este commit está contenido en:
imperosol
2024-12-19 10:53:11 +01:00
padre 871ef60cf6
commit a7b1406e06
Se han modificado 3 ficheros con 184 adiciones y 234 borrados
+3 -5
Ver fichero
@@ -13,7 +13,7 @@ from PIL import Image
from pytest_django.asserts import assertNumQueries
from core.baker_recipes import board_user, subscriber_user
from core.models import RealGroup, User
from core.models import Group, User
from counter.models import Product, ProductType
@@ -51,16 +51,14 @@ def test_resize_product_icon(model):
(
lambda: baker.make(
User,
groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
groups=[Group.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
),
200,
),
(
lambda: baker.make(
User,
groups=[
RealGroup.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
],
groups=[Group.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)],
),
200,
),
+3 -5
Ver fichero
@@ -6,7 +6,7 @@ from model_bakery import baker, seq
from ninja_extra.testing import TestClient
from core.baker_recipes import board_user, subscriber_user
from core.models import RealGroup, User
from core.models import Group, User
from counter.api import ProductTypeController
from counter.models import ProductType
@@ -70,16 +70,14 @@ def test_move_above_product_type(product_types: list[ProductType]):
(
lambda: baker.make(
User,
groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
groups=[Group.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
),
200,
),
(
lambda: baker.make(
User,
groups=[
RealGroup.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
],
groups=[Group.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)],
),
200,
),
La diferencia del archivo ha sido suprimido porque es demasiado grande Cargar Diff