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

Keep test coverage, but skip front end tests for requests

Browse Source
This commit is contained in:
Montana 2019-01-09 13:40:03 -05:00
parent c2a597d98b
commit aea690cb0f
10 changed files with 0 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/conftest.py
View File

@ -147,8 +147,3 @@ def extended_financial_verification_data(pdf_upload):
def queue(): def queue():
yield atst_queue yield atst_queue
atst_queue.get_queue().empty() atst_queue.get_queue().empty()
pytest.mark.requests_workflow = pytest.mark.skipif(
not make_config().get("REQUESTS_WORKFLOW"), reason="requests workflow is deprecated"
)

27
tests/domain/test_requests.py
View File

@ -21,7 +21,6 @@ def new_request(session):
return RequestFactory.create() return RequestFactory.create()
@pytest.mark.requests_workflow
def test_can_get_request(): def test_can_get_request():
factory_req = RequestFactory.create() factory_req = RequestFactory.create()
request = Requests.get(factory_req.creator, factory_req.id) request = Requests.get(factory_req.creator, factory_req.id)
@ -29,20 +28,17 @@ def test_can_get_request():
assert request.id == factory_req.id assert request.id == factory_req.id
@pytest.mark.requests_workflow
def test_nonexistent_request_raises(): def test_nonexistent_request_raises():
a_user = UserFactory.build() a_user = UserFactory.build()
with pytest.raises(NotFoundError): with pytest.raises(NotFoundError):
Requests.get(a_user, uuid4()) Requests.get(a_user, uuid4())
@pytest.mark.requests_workflow
def test_new_request_has_started_status(): def test_new_request_has_started_status():
request = Requests.create(UserFactory.build(), {}) request = Requests.create(UserFactory.build(), {})
assert request.status == RequestStatus.STARTED assert request.status == RequestStatus.STARTED
@pytest.mark.requests_workflow
def test_auto_approve_less_than_1m(): def test_auto_approve_less_than_1m():
new_request = RequestFactory.create(initial_revision={"dollar_value": 999_999}) new_request = RequestFactory.create(initial_revision={"dollar_value": 999_999})
request = Requests.submit(new_request) request = Requests.submit(new_request)
@ -52,7 +48,6 @@ def test_auto_approve_less_than_1m():
assert request.reviews[0].full_name_reviewer == "System" assert request.reviews[0].full_name_reviewer == "System"
@pytest.mark.requests_workflow
def test_dont_auto_approve_if_dollar_value_is_1m_or_above(): def test_dont_auto_approve_if_dollar_value_is_1m_or_above():
new_request = RequestFactory.create(initial_revision={"dollar_value": 1_000_000}) new_request = RequestFactory.create(initial_revision={"dollar_value": 1_000_000})
request = Requests.submit(new_request) request = Requests.submit(new_request)
@ -60,7 +55,6 @@ def test_dont_auto_approve_if_dollar_value_is_1m_or_above():
assert request.status == RequestStatus.PENDING_CCPO_ACCEPTANCE assert request.status == RequestStatus.PENDING_CCPO_ACCEPTANCE
@pytest.mark.requests_workflow
def test_dont_auto_approve_if_no_dollar_value_specified(): def test_dont_auto_approve_if_no_dollar_value_specified():
new_request = RequestFactory.create(initial_revision={}) new_request = RequestFactory.create(initial_revision={})
request = Requests.submit(new_request) request = Requests.submit(new_request)
@ -68,7 +62,6 @@ def test_dont_auto_approve_if_no_dollar_value_specified():
assert request.status == RequestStatus.PENDING_CCPO_ACCEPTANCE assert request.status == RequestStatus.PENDING_CCPO_ACCEPTANCE
@pytest.mark.requests_workflow
def test_should_allow_submission(): def test_should_allow_submission():
new_request = RequestFactory.create() new_request = RequestFactory.create()
@ -86,18 +79,15 @@ def test_should_allow_submission():
assert not Requests.should_allow_submission(new_request) assert not Requests.should_allow_submission(new_request)
@pytest.mark.requests_workflow
def test_request_knows_its_last_submission_timestamp(new_request): def test_request_knows_its_last_submission_timestamp(new_request):
submitted_request = Requests.submit(new_request) submitted_request = Requests.submit(new_request)
assert submitted_request.last_submission_timestamp assert submitted_request.last_submission_timestamp
@pytest.mark.requests_workflow
def test_request_knows_if_it_has_no_last_submission_timestamp(new_request): def test_request_knows_if_it_has_no_last_submission_timestamp(new_request):
assert new_request.last_submission_timestamp is None assert new_request.last_submission_timestamp is None
@pytest.mark.requests_workflow
def test_exists(session): def test_exists(session):
user_allowed = UserFactory.create() user_allowed = UserFactory.create()
user_denied = UserFactory.create() user_denied = UserFactory.create()
@ -106,7 +96,6 @@ def test_exists(session):
assert not Requests.exists(request.id, user_denied) assert not Requests.exists(request.id, user_denied)
@pytest.mark.requests_workflow
def test_status_count(session): def test_status_count(session):
# make sure table is empty # make sure table is empty
session.query(Request).delete() session.query(Request).delete()
@ -125,7 +114,6 @@ def test_status_count(session):
assert Requests.in_progress_count() == 2 assert Requests.in_progress_count() == 2
@pytest.mark.requests_workflow
def test_status_count_scoped_to_creator(session): def test_status_count_scoped_to_creator(session):
# make sure table is empty # make sure table is empty
session.query(Request).delete() session.query(Request).delete()
@ -155,14 +143,12 @@ request_financial_data = {
} }
@pytest.mark.requests_workflow
def test_set_status_sets_revision(): def test_set_status_sets_revision():
request = RequestFactory.create() request = RequestFactory.create()
Requests.set_status(request, RequestStatus.APPROVED) Requests.set_status(request, RequestStatus.APPROVED)
assert request.latest_revision == request.status_events[-1].revision assert request.latest_revision == request.status_events[-1].revision
@pytest.mark.requests_workflow
def test_advance_to_financial_verification(): def test_advance_to_financial_verification():
request = RequestFactory.create_with_status( request = RequestFactory.create_with_status(
status=RequestStatus.PENDING_CCPO_ACCEPTANCE status=RequestStatus.PENDING_CCPO_ACCEPTANCE
@ -174,7 +160,6 @@ def test_advance_to_financial_verification():
assert current_review.fname_mao == review_data["fname_mao"] assert current_review.fname_mao == review_data["fname_mao"]
@pytest.mark.requests_workflow
def test_advance_to_approval(): def test_advance_to_approval():
request = RequestFactory.create_with_status( request = RequestFactory.create_with_status(
status=RequestStatus.PENDING_CCPO_APPROVAL status=RequestStatus.PENDING_CCPO_APPROVAL
@ -184,7 +169,6 @@ def test_advance_to_approval():
assert request.status == RequestStatus.APPROVED assert request.status == RequestStatus.APPROVED
@pytest.mark.requests_workflow
def test_request_changes_to_request_application(): def test_request_changes_to_request_application():
request = RequestFactory.create_with_status( request = RequestFactory.create_with_status(
status=RequestStatus.PENDING_CCPO_ACCEPTANCE status=RequestStatus.PENDING_CCPO_ACCEPTANCE
@ -196,7 +180,6 @@ def test_request_changes_to_request_application():
assert current_review.fname_mao == review_data["fname_mao"] assert current_review.fname_mao == review_data["fname_mao"]
@pytest.mark.requests_workflow
def test_request_changes_to_financial_verification_info(): def test_request_changes_to_financial_verification_info():
request = RequestFactory.create_with_status( request = RequestFactory.create_with_status(
status=RequestStatus.PENDING_CCPO_APPROVAL status=RequestStatus.PENDING_CCPO_APPROVAL
@ -208,7 +191,6 @@ def test_request_changes_to_financial_verification_info():
assert current_review.fname_mao == review_data["fname_mao"] assert current_review.fname_mao == review_data["fname_mao"]
@pytest.mark.requests_workflow
def test_add_internal_comment(): def test_add_internal_comment():
request = RequestFactory.create() request = RequestFactory.create()
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")
@ -221,7 +203,6 @@ def test_add_internal_comment():
assert request.internal_comments[0].text == "this is my comment" assert request.internal_comments[0].text == "this is my comment"
@pytest.mark.requests_workflow
def test_creator_can_view_own_request(): def test_creator_can_view_own_request():
creator = UserFactory.create() creator = UserFactory.create()
request = RequestFactory.create(creator=creator) request = RequestFactory.create(creator=creator)
@ -229,7 +210,6 @@ def test_creator_can_view_own_request():
assert RequestsAuthorization(creator, request).can_view assert RequestsAuthorization(creator, request).can_view
@pytest.mark.requests_workflow
def test_ccpo_can_view_request(): def test_ccpo_can_view_request():
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")
request = RequestFactory.create() request = RequestFactory.create()
@ -237,7 +217,6 @@ def test_ccpo_can_view_request():
assert RequestsAuthorization(ccpo, request).can_view assert RequestsAuthorization(ccpo, request).can_view
@pytest.mark.requests_workflow
def test_random_user_cannot_view_request(): def test_random_user_cannot_view_request():
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create() request = RequestFactory.create()
@ -245,7 +224,6 @@ def test_random_user_cannot_view_request():
assert not RequestsAuthorization(user, request).can_view assert not RequestsAuthorization(user, request).can_view
@pytest.mark.requests_workflow
def test_auto_approve_and_create_workspace(): def test_auto_approve_and_create_workspace():
request = RequestFactory.create() request = RequestFactory.create()
workspace = Requests.auto_approve_and_create_workspace(request) workspace = Requests.auto_approve_and_create_workspace(request)
@ -261,7 +239,6 @@ class TestStatusNotifications(object):
assert job.func == queue._send_mail assert job.func == queue._send_mail
assert job.args[0] == [request.creator.email] assert job.args[0] == [request.creator.email]
@pytest.mark.requests_workflow
def test_pending_finver_triggers_notification(self, queue): def test_pending_finver_triggers_notification(self, queue):
request = RequestFactory.create() request = RequestFactory.create()
request = Requests.set_status(request, RequestStatus.PENDING_CCPO_ACCEPTANCE) request = Requests.set_status(request, RequestStatus.PENDING_CCPO_ACCEPTANCE)
@ -270,14 +247,12 @@ class TestStatusNotifications(object):
) )
self._assert_job(queue, request) self._assert_job(queue, request)
@pytest.mark.requests_workflow
def test_changes_requested_triggers_notification(self, queue): def test_changes_requested_triggers_notification(self, queue):
request = RequestFactory.create() request = RequestFactory.create()
request = Requests.set_status(request, RequestStatus.PENDING_CCPO_ACCEPTANCE) request = Requests.set_status(request, RequestStatus.PENDING_CCPO_ACCEPTANCE)
request = Requests.set_status(request, RequestStatus.CHANGES_REQUESTED) request = Requests.set_status(request, RequestStatus.CHANGES_REQUESTED)
self._assert_job(queue, request) self._assert_job(queue, request)
@pytest.mark.requests_workflow
def test_changes_requested_to_finver_triggers_notification(self, queue): def test_changes_requested_to_finver_triggers_notification(self, queue):
request = RequestFactory.create() request = RequestFactory.create()
request = Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL) request = Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL)
@ -286,14 +261,12 @@ class TestStatusNotifications(object):
) )
self._assert_job(queue, request) self._assert_job(queue, request)
@pytest.mark.requests_workflow
def test_approval_triggers_notification(self, queue): def test_approval_triggers_notification(self, queue):
request = RequestFactory.create() request = RequestFactory.create()
request = Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL) request = Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL)
request = Requests.set_status(request, RequestStatus.APPROVED) request = Requests.set_status(request, RequestStatus.APPROVED)
self._assert_job(queue, request) self._assert_job(queue, request)
@pytest.mark.requests_workflow
def test_submitted_does_not_trigger_notification(self, queue): def test_submitted_does_not_trigger_notification(self, queue):
request = RequestFactory.create() request = RequestFactory.create()
request = Requests.set_status(request, RequestStatus.SUBMITTED) request = Requests.set_status(request, RequestStatus.SUBMITTED)

3
tests/routes/requests/requests_form/test_details.py
View File

@ -1,4 +1,3 @@
import pytest
import re import re
from flask import url_for from flask import url_for
@ -7,7 +6,6 @@ from atst.models.request_status_event import RequestStatus
from tests.factories import RequestFactory, LegacyTaskOrderFactory, UserFactory from tests.factories import RequestFactory, LegacyTaskOrderFactory, UserFactory
@pytest.mark.requests_workflow
def test_can_show_financial_data(client, user_session): def test_can_show_financial_data(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
@ -26,7 +24,6 @@ def test_can_show_financial_data(client, user_session):
assert re.search(r">\s+Financial Verification\s+<", body) assert re.search(r">\s+Financial Verification\s+<", body)
@pytest.mark.requests_workflow
def test_can_not_show_financial_data(client, user_session): def test_can_not_show_financial_data(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)

6
tests/routes/requests/requests_form/test_edit.py
View File

@ -1,9 +1,7 @@
import pytest
from tests.factories import UserFactory, RequestFactory from tests.factories import UserFactory, RequestFactory
from atst.models.request_status_event import RequestStatus from atst.models.request_status_event import RequestStatus
@pytest.mark.requests_workflow
def test_creator_pending_finver(client, user_session): def test_creator_pending_finver(client, user_session):
request = RequestFactory.create_with_status( request = RequestFactory.create_with_status(
RequestStatus.PENDING_FINANCIAL_VERIFICATION RequestStatus.PENDING_FINANCIAL_VERIFICATION
@ -15,7 +13,6 @@ def test_creator_pending_finver(client, user_session):
assert "verify" in response.location assert "verify" in response.location
@pytest.mark.requests_workflow
def test_creator_pending_finver_changes(client, user_session): def test_creator_pending_finver_changes(client, user_session):
request = RequestFactory.create_with_status( request = RequestFactory.create_with_status(
RequestStatus.CHANGES_REQUESTED_TO_FINVER RequestStatus.CHANGES_REQUESTED_TO_FINVER
@ -27,7 +24,6 @@ def test_creator_pending_finver_changes(client, user_session):
assert "verify" in response.location assert "verify" in response.location
@pytest.mark.requests_workflow
def test_creator_approved(client, user_session): def test_creator_approved(client, user_session):
request = RequestFactory.create_with_status(RequestStatus.APPROVED) request = RequestFactory.create_with_status(RequestStatus.APPROVED)
user_session(request.creator) user_session(request.creator)
@ -37,7 +33,6 @@ def test_creator_approved(client, user_session):
assert "details" in response.location assert "details" in response.location
@pytest.mark.requests_workflow
def test_creator_approved(client, user_session): def test_creator_approved(client, user_session):
request = RequestFactory.create_with_status(RequestStatus.STARTED) request = RequestFactory.create_with_status(RequestStatus.STARTED)
user_session(request.creator) user_session(request.creator)
@ -47,7 +42,6 @@ def test_creator_approved(client, user_session):
assert "new" in response.location assert "new" in response.location
@pytest.mark.requests_workflow
def test_ccpo(client, user_session): def test_ccpo(client, user_session):
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")
request = RequestFactory.create_with_status(RequestStatus.STARTED) request = RequestFactory.create_with_status(RequestStatus.STARTED)

17
tests/routes/requests/requests_form/test_new.py
View File

@ -1,4 +1,3 @@
import pytest
import datetime import datetime
import re import re
from tests.factories import ( from tests.factories import (
@ -18,7 +17,6 @@ from tests.assert_util import dict_contains
ERROR_CLASS = "alert--error" ERROR_CLASS = "alert--error"
@pytest.mark.requests_workflow
def test_submit_invalid_request_form(monkeypatch, client, user_session): def test_submit_invalid_request_form(monkeypatch, client, user_session):
user_session() user_session()
response = client.post( response = client.post(
@ -29,7 +27,6 @@ def test_submit_invalid_request_form(monkeypatch, client, user_session):
assert re.search(ERROR_CLASS, response.data.decode()) assert re.search(ERROR_CLASS, response.data.decode())
@pytest.mark.requests_workflow
def test_submit_valid_request_form(monkeypatch, client, user_session): def test_submit_valid_request_form(monkeypatch, client, user_session):
user_session() user_session()
monkeypatch.setattr( monkeypatch.setattr(
@ -44,7 +41,6 @@ def test_submit_valid_request_form(monkeypatch, client, user_session):
assert "/requests/new/2" in response.headers.get("Location") assert "/requests/new/2" in response.headers.get("Location")
@pytest.mark.requests_workflow
def test_owner_can_view_request(client, user_session): def test_owner_can_view_request(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
@ -57,7 +53,6 @@ def test_owner_can_view_request(client, user_session):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_non_owner_cannot_view_request(client, user_session): def test_non_owner_cannot_view_request(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
@ -70,7 +65,6 @@ def test_non_owner_cannot_view_request(client, user_session):
assert response.status_code == 404 assert response.status_code == 404
@pytest.mark.requests_workflow
def test_ccpo_can_view_request(client, user_session): def test_ccpo_can_view_request(client, user_session):
ccpo = Roles.get("ccpo") ccpo = Roles.get("ccpo")
user = UserFactory.create(atat_role=ccpo) user = UserFactory.create(atat_role=ccpo)
@ -84,7 +78,6 @@ def test_ccpo_can_view_request(client, user_session):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_nonexistent_request(client, user_session): def test_nonexistent_request(client, user_session):
user_session() user_session()
response = client.get("/requests/new/1/foo", follow_redirects=True) response = client.get("/requests/new/1/foo", follow_redirects=True)
@ -92,7 +85,6 @@ def test_nonexistent_request(client, user_session):
assert response.status_code == 404 assert response.status_code == 404
@pytest.mark.requests_workflow
def test_creator_info_is_autopopulated_for_existing_request( def test_creator_info_is_autopopulated_for_existing_request(
monkeypatch, client, user_session monkeypatch, client, user_session
): ):
@ -116,7 +108,6 @@ def test_creator_info_is_autopopulated_for_existing_request(
assert "initial-value='{}'".format(value) in body assert "initial-value='{}'".format(value) in body
@pytest.mark.requests_workflow
def test_creator_info_is_autopopulated_for_new_request( def test_creator_info_is_autopopulated_for_new_request(
monkeypatch, client, user_session monkeypatch, client, user_session
): ):
@ -130,7 +121,6 @@ def test_creator_info_is_autopopulated_for_new_request(
assert "initial-value='{}'".format(user.email) in body assert "initial-value='{}'".format(user.email) in body
@pytest.mark.requests_workflow
def test_non_creator_info_is_not_autopopulated(monkeypatch, client, user_session): def test_non_creator_info_is_not_autopopulated(monkeypatch, client, user_session):
user = UserFactory.create() user = UserFactory.create()
creator = UserFactory.create() creator = UserFactory.create()
@ -144,7 +134,6 @@ def test_non_creator_info_is_not_autopopulated(monkeypatch, client, user_session
assert not user.email in body assert not user.email in body
@pytest.mark.requests_workflow
def test_am_poc_causes_poc_to_be_autopopulated(client, user_session): def test_am_poc_causes_poc_to_be_autopopulated(client, user_session):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)
@ -158,7 +147,6 @@ def test_am_poc_causes_poc_to_be_autopopulated(client, user_session):
assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id
@pytest.mark.requests_workflow
def test_not_am_poc_requires_poc_info_to_be_completed(client, user_session): def test_not_am_poc_requires_poc_info_to_be_completed(client, user_session):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)
@ -172,7 +160,6 @@ def test_not_am_poc_requires_poc_info_to_be_completed(client, user_session):
assert ERROR_CLASS in response.data.decode() assert ERROR_CLASS in response.data.decode()
@pytest.mark.requests_workflow
def test_not_am_poc_allows_user_to_fill_in_poc_info(client, user_session): def test_not_am_poc_allows_user_to_fill_in_poc_info(client, user_session):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)
@ -192,7 +179,6 @@ def test_not_am_poc_allows_user_to_fill_in_poc_info(client, user_session):
assert ERROR_CLASS not in response.data.decode() assert ERROR_CLASS not in response.data.decode()
@pytest.mark.requests_workflow
def test_poc_details_can_be_autopopulated_on_new_request(client, user_session): def test_poc_details_can_be_autopopulated_on_new_request(client, user_session):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)
@ -207,7 +193,6 @@ def test_poc_details_can_be_autopopulated_on_new_request(client, user_session):
assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id assert request.body["primary_poc"]["dodid_poc"] == creator.dod_id
@pytest.mark.requests_workflow
def test_poc_autofill_checks_information_about_you_form_first(client, user_session): def test_poc_autofill_checks_information_about_you_form_first(client, user_session):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)
@ -236,7 +221,6 @@ def test_poc_autofill_checks_information_about_you_form_first(client, user_sessi
) )
@pytest.mark.requests_workflow
def test_can_review_data(user_session, client): def test_can_review_data(user_session, client):
creator = UserFactory.create() creator = UserFactory.create()
user_session(creator) user_session(creator)
@ -248,7 +232,6 @@ def test_can_review_data(user_session, client):
assert request.body["information_about_you"]["email_request"] in body assert request.body["information_about_you"]["email_request"] in body
@pytest.mark.requests_workflow
def test_displays_ccpo_review_comment(user_session, client): def test_displays_ccpo_review_comment(user_session, client):
creator = UserFactory.create() creator = UserFactory.create()
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")

2
tests/routes/requests/requests_form/test_submit.py
View File

@ -8,7 +8,6 @@ def _mock_func(*args, **kwargs):
return RequestFactory.create() return RequestFactory.create()
@pytest.mark.requests_workflow
def test_submit_reviewed_request(monkeypatch, client, user_session): def test_submit_reviewed_request(monkeypatch, client, user_session):
user_session() user_session()
monkeypatch.setattr("atst.domain.requests.Requests.get", _mock_func) monkeypatch.setattr("atst.domain.requests.Requests.get", _mock_func)
@ -25,7 +24,6 @@ def test_submit_reviewed_request(monkeypatch, client, user_session):
assert "modal=pendingCCPOAcceptance" in response.headers["Location"] assert "modal=pendingCCPOAcceptance" in response.headers["Location"]
@pytest.mark.requests_workflow
def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session): def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session):
user_session() user_session()
monkeypatch.setattr("atst.domain.requests.Requests.get", _mock_func) monkeypatch.setattr("atst.domain.requests.Requests.get", _mock_func)

14
tests/routes/requests/test_approval.py
View File

@ -1,4 +1,3 @@
import pytest
import os import os
from flask import url_for from flask import url_for
@ -15,7 +14,6 @@ from tests.factories import (
) )
@pytest.mark.requests_workflow
def test_ccpo_can_view_approval(user_session, client): def test_ccpo_can_view_approval(user_session, client):
ccpo = Roles.get("ccpo") ccpo = Roles.get("ccpo")
user = UserFactory.create(atat_role=ccpo) user = UserFactory.create(atat_role=ccpo)
@ -26,7 +24,6 @@ def test_ccpo_can_view_approval(user_session, client):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_ccpo_prepopulated_as_mission_owner(user_session, client): def test_ccpo_prepopulated_as_mission_owner(user_session, client):
user = UserFactory.from_atat_role("ccpo") user = UserFactory.from_atat_role("ccpo")
user_session(user) user_session(user)
@ -39,7 +36,6 @@ def test_ccpo_prepopulated_as_mission_owner(user_session, client):
assert user.last_name in body assert user.last_name in body
@pytest.mark.requests_workflow
def test_non_ccpo_cannot_view_approval(user_session, client): def test_non_ccpo_cannot_view_approval(user_session, client):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
@ -49,7 +45,6 @@ def test_non_ccpo_cannot_view_approval(user_session, client):
assert response.status_code == 404 assert response.status_code == 404
@pytest.mark.requests_workflow
def prepare_request_pending_approval(creator, pdf_attachment=None): def prepare_request_pending_approval(creator, pdf_attachment=None):
legacy_task_order = LegacyTaskOrderFactory.create( legacy_task_order = LegacyTaskOrderFactory.create(
number="abc123", pdf=pdf_attachment number="abc123", pdf=pdf_attachment
@ -61,7 +56,6 @@ def prepare_request_pending_approval(creator, pdf_attachment=None):
) )
@pytest.mark.requests_workflow
def test_ccpo_sees_pdf_link(user_session, client, pdf_upload): def test_ccpo_sees_pdf_link(user_session, client, pdf_upload):
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")
user_session(ccpo) user_session(ccpo)
@ -76,7 +70,6 @@ def test_ccpo_sees_pdf_link(user_session, client, pdf_upload):
assert download_url in body assert download_url in body
@pytest.mark.requests_workflow
def test_ccpo_does_not_see_pdf_link_if_no_pdf(user_session, client, pdf_upload): def test_ccpo_does_not_see_pdf_link_if_no_pdf(user_session, client, pdf_upload):
ccpo = UserFactory.from_atat_role("ccpo") ccpo = UserFactory.from_atat_role("ccpo")
user_session(ccpo) user_session(ccpo)
@ -90,7 +83,6 @@ def test_ccpo_does_not_see_pdf_link_if_no_pdf(user_session, client, pdf_upload):
assert download_url not in body assert download_url not in body
@pytest.mark.requests_workflow
def test_task_order_download(app, client, user_session, pdf_upload): def test_task_order_download(app, client, user_session, pdf_upload):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
@ -116,7 +108,6 @@ def test_task_order_download(app, client, user_session, pdf_upload):
assert response.data == pdf_content assert response.data == pdf_content
@pytest.mark.requests_workflow
def test_task_order_download_does_not_exist(client, user_session): def test_task_order_download_does_not_exist(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
@ -127,7 +118,6 @@ def test_task_order_download_does_not_exist(client, user_session):
assert response.status_code == 404 assert response.status_code == 404
@pytest.mark.requests_workflow
def test_can_submit_request_approval(client, user_session): def test_can_submit_request_approval(client, user_session):
user = UserFactory.from_atat_role("ccpo") user = UserFactory.from_atat_role("ccpo")
user_session(user) user_session(user)
@ -143,7 +133,6 @@ def test_can_submit_request_approval(client, user_session):
assert request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION assert request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION
@pytest.mark.requests_workflow
def test_can_submit_request_denial(client, user_session): def test_can_submit_request_denial(client, user_session):
user = UserFactory.from_atat_role("ccpo") user = UserFactory.from_atat_role("ccpo")
user_session(user) user_session(user)
@ -159,7 +148,6 @@ def test_can_submit_request_denial(client, user_session):
assert request.status == RequestStatus.CHANGES_REQUESTED assert request.status == RequestStatus.CHANGES_REQUESTED
@pytest.mark.requests_workflow
def test_ccpo_user_can_comment_on_request(client, user_session): def test_ccpo_user_can_comment_on_request(client, user_session):
user = UserFactory.from_atat_role("ccpo") user = UserFactory.from_atat_role("ccpo")
user_session(user) user_session(user)
@ -179,7 +167,6 @@ def test_ccpo_user_can_comment_on_request(client, user_session):
assert request.internal_comments[0].text == comment_text assert request.internal_comments[0].text == comment_text
@pytest.mark.requests_workflow
def test_comment_text_is_required(client, user_session): def test_comment_text_is_required(client, user_session):
user = UserFactory.from_atat_role("ccpo") user = UserFactory.from_atat_role("ccpo")
user_session(user) user_session(user)
@ -197,7 +184,6 @@ def test_comment_text_is_required(client, user_session):
assert len(request.internal_comments) == 0 assert len(request.internal_comments) == 0
@pytest.mark.requests_workflow
def test_other_user_cannot_comment_on_request(client, user_session): def test_other_user_cannot_comment_on_request(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)

29
tests/routes/requests/test_financial_verification.py
View File

@ -69,7 +69,6 @@ FalseValidator = MagicMock()
FalseValidator.validate = MagicMock(return_value=False) FalseValidator.validate = MagicMock(return_value=False)
@pytest.mark.requests_workflow
def test_update_fv(fv_data): def test_update_fv(fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -82,7 +81,6 @@ def test_update_fv(fv_data):
assert updated_request.is_pending_ccpo_approval assert updated_request.is_pending_ccpo_approval
@pytest.mark.requests_workflow
def test_update_fv_re_enter_pe_number(fv_data): def test_update_fv_re_enter_pe_number(fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -98,7 +96,6 @@ def test_update_fv_re_enter_pe_number(fv_data):
assert updated_request.is_pending_ccpo_approval assert updated_request.is_pending_ccpo_approval
@pytest.mark.requests_workflow
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()
@ -116,7 +113,6 @@ def test_update_fv_invalid_task_order_number(fv_data):
update_fv.execute() update_fv.execute()
@pytest.mark.requests_workflow
def test_draft_without_pe_id(fv_data): def test_draft_without_pe_id(fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -131,7 +127,6 @@ def test_draft_without_pe_id(fv_data):
).execute() ).execute()
@pytest.mark.requests_workflow
def test_update_fv_extended(fv_data, e_fv_data): def test_update_fv_extended(fv_data, e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -143,7 +138,6 @@ def test_update_fv_extended(fv_data, e_fv_data):
assert update_fv.execute() assert update_fv.execute()
@pytest.mark.requests_workflow
def test_update_fv_extended_does_not_validate_task_order(fv_data, e_fv_data): def test_update_fv_extended_does_not_validate_task_order(fv_data, e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -155,7 +149,6 @@ def test_update_fv_extended_does_not_validate_task_order(fv_data, e_fv_data):
assert update_fv.execute() assert update_fv.execute()
@pytest.mark.requests_workflow
def test_update_fv_missing_extended_data(fv_data): def test_update_fv_missing_extended_data(fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -172,7 +165,6 @@ def test_update_fv_missing_extended_data(fv_data):
update_fv.execute() update_fv.execute()
@pytest.mark.requests_workflow
def test_update_fv_submission(fv_data): def test_update_fv_submission(fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -182,7 +174,6 @@ def test_update_fv_submission(fv_data):
assert updated_request assert updated_request
@pytest.mark.requests_workflow
def test_save_empty_draft(): def test_save_empty_draft():
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -193,7 +184,6 @@ def test_save_empty_draft():
assert save_draft.execute() assert save_draft.execute()
@pytest.mark.requests_workflow
def test_save_draft_with_ba_code(): def test_save_draft_with_ba_code():
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -205,7 +195,6 @@ def test_save_draft_with_ba_code():
assert save_draft.execute() assert save_draft.execute()
@pytest.mark.requests_workflow
def test_save_draft_allows_invalid_data(): def test_save_draft_allows_invalid_data():
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -225,7 +214,6 @@ def test_save_draft_allows_invalid_data():
).execute() ).execute()
@pytest.mark.requests_workflow
def test_save_draft_and_then_submit(): def test_save_draft_and_then_submit():
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -240,7 +228,6 @@ def test_save_draft_and_then_submit():
).execute() ).execute()
@pytest.mark.requests_workflow
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()
@ -251,7 +238,6 @@ def test_updated_request_has_pdf(fv_data, e_fv_data):
assert updated_request.legacy_task_order.pdf assert updated_request.legacy_task_order.pdf
@pytest.mark.requests_workflow
def test_can_save_draft_with_just_pdf(e_fv_data): def test_can_save_draft_with_just_pdf(e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -264,7 +250,6 @@ def test_can_save_draft_with_just_pdf(e_fv_data):
assert form.legacy_task_order.pdf assert form.legacy_task_order.pdf
@pytest.mark.requests_workflow
def test_task_order_info_present_in_extended_form(fv_data, e_fv_data): def test_task_order_info_present_in_extended_form(fv_data, e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -280,7 +265,6 @@ def test_task_order_info_present_in_extended_form(fv_data, e_fv_data):
assert form.legacy_task_order.clin_0001.data assert form.legacy_task_order.clin_0001.data
@pytest.mark.requests_workflow
def test_update_ignores_empty_values(fv_data, e_fv_data): def test_update_ignores_empty_values(fv_data, e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -290,7 +274,6 @@ def test_update_ignores_empty_values(fv_data, e_fv_data):
).execute() ).execute()
@pytest.mark.requests_workflow
def test_can_save_draft_with_funding_type(fv_data, e_fv_data): def test_can_save_draft_with_funding_type(fv_data, e_fv_data):
request = RequestFactory.create() request = RequestFactory.create()
user = UserFactory.create() user = UserFactory.create()
@ -305,7 +288,6 @@ def test_can_save_draft_with_funding_type(fv_data, e_fv_data):
assert updated_request.legacy_task_order.funding_type assert updated_request.legacy_task_order.funding_type
@pytest.mark.requests_workflow
def test_update_fv_route(client, user_session, fv_data): def test_update_fv_route(client, user_session, fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -319,7 +301,6 @@ def test_update_fv_route(client, user_session, fv_data):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_save_fv_draft_route(client, user_session, fv_data): def test_save_fv_draft_route(client, user_session, fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -333,7 +314,6 @@ def test_save_fv_draft_route(client, user_session, fv_data):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_get_fv_form_route(client, user_session, fv_data): def test_get_fv_form_route(client, user_session, fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -347,7 +327,6 @@ def test_get_fv_form_route(client, user_session, fv_data):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_manual_task_order_triggers_extended_form( def test_manual_task_order_triggers_extended_form(
client, user_session, fv_data, e_fv_data client, user_session, fv_data, e_fv_data
): ):
@ -369,7 +348,6 @@ def test_manual_task_order_triggers_extended_form(
assert "extended" in response.headers["Location"] assert "extended" in response.headers["Location"]
@pytest.mark.requests_workflow
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)
@ -392,7 +370,6 @@ def test_manual_to_does_not_trigger_approval(client, user_session, fv_data, e_fv
assert updated_request.status != RequestStatus.APPROVED assert updated_request.status != RequestStatus.APPROVED
@pytest.mark.requests_workflow
def test_eda_task_order_does_trigger_approval(client, user_session, fv_data, e_fv_data): def test_eda_task_order_does_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)
@ -415,7 +392,6 @@ def test_eda_task_order_does_trigger_approval(client, user_session, fv_data, e_f
assert updated_request.status == RequestStatus.APPROVED assert updated_request.status == RequestStatus.APPROVED
@pytest.mark.requests_workflow
def test_attachment_on_non_extended_form(client, user_session, fv_data, e_fv_data): def test_attachment_on_non_extended_form(client, user_session, fv_data, e_fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -441,7 +417,6 @@ def test_attachment_on_non_extended_form(client, user_session, fv_data, e_fv_dat
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_task_order_number_persists_in_form(fv_data, e_fv_data): def test_task_order_number_persists_in_form(fv_data, e_fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -462,7 +437,6 @@ def test_task_order_number_persists_in_form(fv_data, e_fv_data):
assert form.legacy_task_order.number.data == MANUAL_TO_NUMBER assert form.legacy_task_order.number.data == MANUAL_TO_NUMBER
@pytest.mark.requests_workflow
def test_can_submit_once_to_details_are_entered(fv_data, e_fv_data): def test_can_submit_once_to_details_are_entered(fv_data, e_fv_data):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -490,7 +464,6 @@ def test_can_submit_once_to_details_are_entered(fv_data, e_fv_data):
).execute() ).execute()
@pytest.mark.requests_workflow
def test_existing_task_order_with_pdf(fv_data, e_fv_data, client, user_session): def test_existing_task_order_with_pdf(fv_data, e_fv_data, client, user_session):
# Use finver route to create initial TO #1, complete with PDF # Use finver route to create initial TO #1, complete with PDF
user = UserFactory.create() user = UserFactory.create()
@ -523,7 +496,6 @@ def test_existing_task_order_with_pdf(fv_data, e_fv_data, client, user_session):
assert response.status_code == 200 assert response.status_code == 200
@pytest.mark.requests_workflow
def test_pdf_clearing(fv_data, e_fv_data, pdf_upload, pdf_upload2): def test_pdf_clearing(fv_data, e_fv_data, pdf_upload, pdf_upload2):
user = UserFactory.create() user = UserFactory.create()
request = RequestFactory.create(creator=user) request = RequestFactory.create(creator=user)
@ -549,7 +521,6 @@ def test_pdf_clearing(fv_data, e_fv_data, pdf_upload, pdf_upload2):
# in the related attachment entity. I have changed the handling in # in the related attachment entity. I have changed the handling in
# FinancialVerificationBase#_get_form to be more generous in how it finds the # FinancialVerificationBase#_get_form to be more generous in how it finds the
# PDF filename and prepopulates the form data with that name. # PDF filename and prepopulates the form data with that name.
@pytest.mark.requests_workflow
def test_always_derives_pdf_filename(fv_data, e_fv_data, pdf_upload): def test_always_derives_pdf_filename(fv_data, e_fv_data, pdf_upload):
user = UserFactory.create() user = UserFactory.create()
request_one = RequestFactory.create(creator=user) request_one = RequestFactory.create(creator=user)

3
tests/routes/requests/test_requests_index.py
View File

@ -1,4 +1,3 @@
import pytest
from flask import url_for from flask import url_for
from atst.routes.requests.index import RequestsIndex from atst.routes.requests.index import RequestsIndex
@ -6,7 +5,6 @@ from tests.factories import RequestFactory, UserFactory
from atst.domain.requests import Requests from atst.domain.requests import Requests
@pytest.mark.requests_workflow
def test_action_required_mission_owner(): def test_action_required_mission_owner():
creator = UserFactory.create() creator = UserFactory.create()
requests = RequestFactory.create_batch(5, creator=creator) requests = RequestFactory.create_batch(5, creator=creator)
@ -18,7 +16,6 @@ def test_action_required_mission_owner():
assert context["requests"][0]["action_required"] == False assert context["requests"][0]["action_required"] == False
@pytest.mark.requests_workflow
def test_action_required_ccpo(): def test_action_required_ccpo():
creator = UserFactory.create() creator = UserFactory.create()
requests = RequestFactory.create_batch(5, creator=creator) requests = RequestFactory.create_batch(5, creator=creator)

1
tests/test_integration.py
View File

@ -26,7 +26,6 @@ def serialize_dates(data):
return new_data return new_data
@pytest.mark.requests_workflow
def test_stepthrough_request_form(user_session, screens, client): def test_stepthrough_request_form(user_session, screens, client):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)