From 03f7baf87f34a31be5a2b07be918abbd3c68eb4f Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Fri, 22 Jan 2021 09:50:30 +1100 Subject: [PATCH] Unit test fixes --- InvenTree/InvenTree/helpers.py | 2 +- InvenTree/InvenTree/tests.py | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/InvenTree/InvenTree/helpers.py b/InvenTree/InvenTree/helpers.py index 61172cfc62..99dc255dac 100644 --- a/InvenTree/InvenTree/helpers.py +++ b/InvenTree/InvenTree/helpers.py @@ -267,7 +267,7 @@ def WrapWithQuotes(text, quote='"'): return text -def MakeBarcode(object_name, object_pk, object_data, **kwargs): +def MakeBarcode(object_name, object_pk, object_data={}, **kwargs): """ Generate a string for a barcode. Adds some global InvenTree parameters. Args: diff --git a/InvenTree/InvenTree/tests.py b/InvenTree/InvenTree/tests.py index 6630c0b0af..96f32e7f57 100644 --- a/InvenTree/InvenTree/tests.py +++ b/InvenTree/InvenTree/tests.py @@ -1,4 +1,6 @@ +import json + from django.test import TestCase import django.core.exceptions as django_exceptions from django.core.exceptions import ValidationError @@ -134,7 +136,7 @@ class TestIncrement(TestCase): class TestMakeBarcode(TestCase): """ Tests for barcode string creation """ - def test_barcode(self): + def test_barcode_extended(self): bc = helpers.MakeBarcode( "part", @@ -142,13 +144,30 @@ class TestMakeBarcode(TestCase): { "id": 3, "url": "www.google.com", - } + }, + brief=False ) self.assertIn('part', bc) self.assertIn('tool', bc) self.assertIn('"tool": "InvenTree"', bc) + data = json.loads(bc) + + self.assertEqual(data['part']['id'], 3) + self.assertEqual(data['part']['url'], 'www.google.com') + + def test_barcode_brief(self): + + bc = helpers.MakeBarcode( + "stockitem", + 7, + ) + + data = json.loads(bc) + self.assertEqual(len(data), 1) + self.assertEqual(data['stockitem'], 7) + class TestDownloadFile(TestCase):