inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-01 04:56:45 +00:00
Code

unit testing fixes

Browse Source
This commit is contained in:
Oliver 2021-12-04 17:30:13 +11:00
parent 31398b4c10
commit 9e35c52b1d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/order/models.py
View File

@ -657,7 +657,7 @@ class SalesOrder(Order):
""" """
if not self.can_complete(): if not self.can_complete():
return return False
self.status = SalesOrderStatus.SHIPPED self.status = SalesOrderStatus.SHIPPED
self.shipped_by = user self.shipped_by = user
@ -665,6 +665,8 @@ class SalesOrder(Order):
self.save() self.save()
return True
def can_cancel(self): def can_cancel(self):
""" """
Return True if this order can be cancelled Return True if this order can be cancelled

16
InvenTree/order/test_sales_order.py
View File

@ -132,9 +132,12 @@ class SalesOrderTest(TestCase):
self.assertEqual(SalesOrderAllocation.objects.count(), 0) self.assertEqual(SalesOrderAllocation.objects.count(), 0)
self.assertEqual(self.order.status, status.SalesOrderStatus.CANCELLED) self.assertEqual(self.order.status, status.SalesOrderStatus.CANCELLED)
# Now try to ship it - should fail
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):
self.order.complete_order(None) self.order.can_complete(raise_error=True)
# Now try to ship it - should fail
result = self.order.complete_order(None)
self.assertFalse(result)
def test_complete_order(self): def test_complete_order(self):
# Allocate line items, then ship the order # Allocate line items, then ship the order
@ -149,8 +152,9 @@ class SalesOrderTest(TestCase):
self.assertEqual(SalesOrderAllocation.objects.count(), 2) self.assertEqual(SalesOrderAllocation.objects.count(), 2)
# Attempt to complete the order (but shipments are not completed!) # Attempt to complete the order (but shipments are not completed!)
with self.assertRaises(ValidationError): result = self.order.complete_order(None)
self.order.complete_order(None)
self.assertFalse(result)
self.assertIsNone(self.shipment.shipment_date) self.assertIsNone(self.shipment.shipment_date)
self.assertFalse(self.shipment.is_complete()) self.assertFalse(self.shipment.is_complete())
@ -160,7 +164,9 @@ class SalesOrderTest(TestCase):
self.assertTrue(self.shipment.is_complete()) self.assertTrue(self.shipment.is_complete())
# Now, should be OK to ship # Now, should be OK to ship
self.order.complete_order(None) result = self.order.complete_order(None)
self.assertTrue(result)
self.assertEqual(self.order.status, status.SalesOrderStatus.SHIPPED) self.assertEqual(self.order.status, status.SalesOrderStatus.SHIPPED)
self.assertIsNotNone(self.order.shipment_date) self.assertIsNotNone(self.order.shipment_date)