pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A task order from EDA should trigger an automatic approval

Browse Source
This commit is contained in:
richard-dds 2018-10-25 16:49:03 -04:00
parent 5c4c361395
commit afa4743eec
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/routes/requests/financial_verification.py
View File

@ -241,7 +241,7 @@ def update_financial_verification(request_id):
extended=is_extended, extended=is_extended,
) )
if updated_request.is_approved: if updated_request.task_order.verified:
workspace = Requests.approve_and_create_workspace(updated_request) workspace = Requests.approve_and_create_workspace(updated_request)
return redirect( return redirect(
url_for( url_for(

38
tests/routes/test_financial_verification.py
View File

@ -57,6 +57,9 @@ def e_fv_data(pdf_upload):
} }
MANUAL_TO_NUMBER = "DCA10096D0051"
TrueValidator = MagicMock() TrueValidator = MagicMock()
TrueValidator.validate = MagicMock(return_value=True) TrueValidator.validate = MagicMock(return_value=True)
@ -94,7 +97,7 @@ def test_update_fv_re_enter_pe_number(fv_data):
def test_update_fv_invalid_task_order_number(fv_data): def test_update_fv_invalid_task_order_number(fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
data = {**fv_data, "task_order-number": "DCA10096D0051"} data = {**fv_data, "task_order-number": MANUAL_TO_NUMBER}
update_fv = UpdateFinancialVerification( update_fv = UpdateFinancialVerification(
TrueValidator, TrueValidator,
TaskOrderNumberValidator(), TaskOrderNumberValidator(),
@ -217,7 +220,7 @@ def test_save_draft_and_then_submit():
def test_updated_request_has_pdf(fv_data, e_fv_data): def test_updated_request_has_pdf(fv_data, e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
data = {**fv_data, **e_fv_data, "task_order-number": "DCA10096D0051"} data = {**fv_data, **e_fv_data, "task_order-number": MANUAL_TO_NUMBER}
updated_request = UpdateFinancialVerification( updated_request = UpdateFinancialVerification(
TrueValidator, TrueValidator, user, request, data, is_extended=True TrueValidator, TrueValidator, user, request, data, is_extended=True
).execute() ).execute()
@ -330,7 +333,7 @@ def test_manual_task_order_triggers_extended_form(
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
data = {**fv_data, **e_fv_data, "task_order-number": "DCA10096D0053"} data = {**fv_data, **e_fv_data, "task_order-number": MANUAL_TO_NUMBER}
UpdateFinancialVerification( UpdateFinancialVerification(
TrueValidator, TrueValidator, user, request, data, is_extended=True TrueValidator, TrueValidator, user, request, data, is_extended=True
@ -348,7 +351,12 @@ def test_manual_task_order_triggers_extended_form(
def test_manual_to_does_not_trigger_approval(client, user_session, fv_data, e_fv_data): def test_manual_to_does_not_trigger_approval(client, user_session, fv_data, e_fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
data = {**fv_data, **e_fv_data, "request-pe_id": "0101228N"} data = {
**fv_data,
**e_fv_data,
"task_order-number": MANUAL_TO_NUMBER,
"request-pe_id": "0101228N",
}
user_session(user) user_session(user)
client.post( client.post(
url_for( url_for(
@ -360,3 +368,25 @@ def test_manual_to_does_not_trigger_approval(client, user_session, fv_data, e_fv
updated_request = RequestsQuery.get(request.id) updated_request = RequestsQuery.get(request.id)
assert updated_request.status != RequestStatus.APPROVED assert updated_request.status != RequestStatus.APPROVED
def test_eda_task_order_does_trigger_approval(client, user_session, fv_data, e_fv_data):
user = UserFactory.create()
request = RequestFactory.create(creator=user)
data = {
**fv_data,
**e_fv_data,
"task_order-number": MockEDAClient.MOCK_CONTRACT_NUMBER,
"request-pe_id": "0101228N",
}
user_session(user)
client.post(
url_for(
"requests.financial_verification", request_id=request.id, extended=True
),
data=data,
follow_redirects=True,
)
updated_request = RequestsQuery.get(request.id)
assert updated_request.status == RequestStatus.APPROVED