DGNum/gestioCOF
15
2
Fork 2
Code Issues 79 Pull requests 21 Projects Releases 12 Packages Wiki Activity

Fix tests and simplify checkout data

Browse source
This commit is contained in:
Ludovic Stephan 2021-02-28 23:14:18 +01:00
parent b7ebd77afb
commit f4def6d51b
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kfet/tests/test_forms.py
View file

@ -28,9 +28,7 @@ class KPsulCheckoutFormTests(TestCase):
def test_checkout(self): def test_checkout(self):
checkout_f = self.form.fields["checkout"] checkout_f = self.form.fields["checkout"]
self.assertListEqual( self.assertListEqual(list(checkout_f.choices), [(self.c1.pk, "C1")])
list(checkout_f.choices), [("", "---------"), (self.c1.pk, "C1")]
)
@mock.patch("django.utils.timezone.now") @mock.patch("django.utils.timezone.now")
def test_checkout_valid(self, mock_now): def test_checkout_valid(self, mock_now):
@ -44,4 +42,4 @@ class KPsulCheckoutFormTests(TestCase):
form = KPsulCheckoutForm() form = KPsulCheckoutForm()
checkout_f = form.fields["checkout"] checkout_f = form.fields["checkout"]
self.assertListEqual(list(checkout_f.choices), [("", "---------")]) self.assertListEqual(list(checkout_f.choices), [])

21
kfet/tests/test_views.py
View file

@ -1683,11 +1683,19 @@ class KPsulCheckoutDataViewTests(ViewTestCaseMixin, TestCase):
url_name = "kfet.kpsul.checkout_data" url_name = "kfet.kpsul.checkout_data"
url_expected = "/k-fet/k-psul/checkout_data" url_expected = "/k-fet/k-psul/checkout_data"
http_methods = ["POST"] http_methods = ["GET"]
auth_user = "team" auth_user = "team"
auth_forbidden = [None, "user"] auth_forbidden = [None, "user"]
@property
def url_kwargs(self):
return {"pk": self.checkout.pk}
@property
def url_expected(self):
return "/k-fet/k-psul/checkout_data/{}".format(self.checkout.pk)
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.checkout = Checkout.objects.create( self.checkout = Checkout.objects.create(
@ -1704,7 +1712,7 @@ class KPsulCheckoutDataViewTests(ViewTestCaseMixin, TestCase):
content = json.loads(r.content.decode("utf-8")) content = json.loads(r.content.decode("utf-8"))
expected = {"name": "Checkout", "balance": "10.00"} expected = {"balance": "10.00"}
self.assertDictContainsSubset(expected, content) self.assertDictContainsSubset(expected, content)
@ -1714,14 +1722,7 @@ class KPsulCheckoutDataViewTests(ViewTestCaseMixin, TestCase):
[ [
"balance", "balance",
"id", "id",
"name", "last_statement",
"valid_from",
"valid_to",
"last_statement_at",
"last_statement_balance",
"last_statement_by_first_name",
"last_statement_by_last_name",
"last_statement_by_trigramme",
] ]
), ),
) )

5
kfet/views.py
View file

@ -942,8 +942,6 @@ def kpsul_checkout_data(request, pk):
.values( .values(
"id", "id",
"balance", "balance",
"valid_from",
"valid_to",
"last_statement_balance", "last_statement_balance",
"last_statement_at", "last_statement_at",
"last_statement_by", "last_statement_by",
@ -955,9 +953,10 @@ def kpsul_checkout_data(request, pk):
prefix = "last_statement_" prefix = "last_statement_"
ls_dict = {} ls_dict = {}
for (key, value) in data.items(): for (key, value) in list(data.items()):
if key.startswith(prefix): if key.startswith(prefix):
ls_dict[key[len(prefix) :]] = value ls_dict[key[len(prefix) :]] = value
del data[key]
data["last_statement"] = ls_dict data["last_statement"] = ls_dict
return JsonResponse(data) return JsonResponse(data)