Unit test fixes

This commit is contained in:
Oliver Walters 2021-04-21 17:16:07 +10:00
parent 59341397ba
commit c0ab2d1da9
18 changed files with 2671 additions and 2123 deletions

View File

@ -15,7 +15,7 @@ from datetime import datetime, timedelta
from .models import Build from .models import Build
from stock.models import StockItem from stock.models import StockItem
from InvenTree.status_codes import BuildStatus from InvenTree.status_codes import BuildStatus, StockStatus
class BuildTestSimple(TestCase): class BuildTestSimple(TestCase):
@ -335,6 +335,7 @@ class TestBuildViews(TestCase):
'confirm_incomplete': 1, 'confirm_incomplete': 1,
'location': 1, 'location': 1,
'output': self.output.pk, 'output': self.output.pk,
'stock_status': StockStatus.DAMAGED
}, },
HTTP_X_REQUESTED_WITH='XMLHttpRequest' HTTP_X_REQUESTED_WITH='XMLHttpRequest'
) )
@ -342,6 +343,7 @@ class TestBuildViews(TestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
data = json.loads(response.content) data = json.loads(response.content)
self.assertTrue(data['form_valid']) self.assertTrue(data['form_valid'])
# Now the build should be able to be completed # Now the build should be able to be completed

View File

@ -449,6 +449,9 @@ class BuildOutputComplete(AjaxUpdateView):
return form return form
def validate(self, build, form, **kwargs): def validate(self, build, form, **kwargs):
"""
Custom validation steps for the BuildOutputComplete" form
"""
data = form.cleaned_data data = form.cleaned_data
@ -456,8 +459,14 @@ class BuildOutputComplete(AjaxUpdateView):
stock_status = data.get('stock_status', StockStatus.OK) stock_status = data.get('stock_status', StockStatus.OK)
# Any "invalid" stock status defaults to OK
try:
stock_status = int(stock_status)
except (ValueError):
stock_status = StockStatus.OK
if int(stock_status) not in StockStatus.keys(): if int(stock_status) not in StockStatus.keys():
form.add_error('status', _('Invalid stock status value selected')) form.add_error('stock_status', _('Invalid stock status value selected'))
if output: if output:
@ -552,6 +561,12 @@ class BuildOutputComplete(AjaxUpdateView):
output = data.get('output', None) output = data.get('output', None)
stock_status = data.get('stock_status', StockStatus.OK) stock_status = data.get('stock_status', StockStatus.OK)
# Any "invalid" stock status defaults to OK
try:
stock_status = int(stock_status)
except (ValueError):
stock_status = StockStatus.OK
# Complete the build output # Complete the build output
build.completeBuildOutput( build.completeBuildOutput(
output, output,

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff