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

Combine similar routes and templates, delete unused TO form templates

Browse Source
This commit is contained in:
leigh-mil
2019-06-03 14:37:02 -04:00
committed by Montana
parent 0a2d241dc4
commit b97ae02a93
14 changed files with 47 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/routes/task_orders/test_new.py
View File

@@ -35,14 +35,14 @@ def user():
def test_task_orders_new(client, user_session, portfolio):
user_session(portfolio.owner)
response = client.get(url_for("task_orders.new", portfolio_id=portfolio.id))
response = client.get(url_for("task_orders.edit", portfolio_id=portfolio.id))
assert response.status_code == 200
def test_task_orders_create(client, user_session, portfolio):
user_session(portfolio.owner)
response = client.post(
url_for("task_orders.create", portfolio_id=portfolio.id),
url_for("task_orders.update", portfolio_id=portfolio.id),
data={"number": "0123456789"},
)
assert response.status_code == 302
@@ -52,7 +52,7 @@ def test_task_orders_create_invalid_data(client, user_session, portfolio):
user_session(portfolio.owner)
num_task_orders = len(portfolio.task_orders)
response = client.post(
url_for("task_orders.create", portfolio_id=portfolio.id), data={"number": ""}
url_for("task_orders.update", portfolio_id=portfolio.id), data={"number": ""}
)
assert response.status_code == 200
assert num_task_orders == len(portfolio.task_orders)
@@ -78,7 +78,9 @@ def test_task_order_form_shows_errors(client, user_session, task_order):
funding_data.update({"clin_01": "one milllllion dollars"})
response = client.post(
url_for("task_orders.update", screen=2, task_order_id=task_order.id),
url_for(
"task_orders.update", portfolio_id=portfolio.id, task_order_id=task_order.id
),
data=funding_data,
follow_redirects=False,
)

14
tests/test_access.py
View File

@@ -477,7 +477,7 @@ def test_task_orders_download_task_order_pdf_access(get_url_assert_status, monke
get_url_assert_status(rando, url, 404)
# task_orders.new
# task_orders.edit
@pytest.mark.skip(reason="Update after new TO form implemented")
def test_task_orders_new_access(get_url_assert_status):
ccpo = user_with(PermissionSets.EDIT_PORTFOLIO_FUNDING)
@@ -485,7 +485,7 @@ def test_task_orders_new_access(get_url_assert_status):
rando = user_with()
portfolio = PortfolioFactory.create(owner=owner)
url = url_for("task_orders.new", portfolio_id=portfolio.id)
url = url_for("task_orders.edit", portfolio_id=portfolio.id)
get_url_assert_status(owner, url, 200)
get_url_assert_status(ccpo, url, 200)
get_url_assert_status(rando, url, 404)
@@ -535,21 +535,23 @@ def test_task_orders_update_access(post_url_assert_status):
ccpo = user_with(PermissionSets.EDIT_PORTFOLIO_FUNDING)
owner = user_with()
rando = user_with()
portfolio = PortfolioFactory.create(owner=owner)
url = url_for("task_orders.update", screen=1)
url = url_for("task_orders.update", portfolio_id=portfolio.id)
post_url_assert_status(owner, url, 200)
post_url_assert_status(ccpo, url, 200)
post_url_assert_status(rando, url, 200)
portfolio = PortfolioFactory.create(owner=owner)
task_order = TaskOrderFactory.create(portfolio=portfolio)
url = url_for("task_orders.update", screen=2, task_order_id=task_order.id)
url = url_for(
"task_orders.update", portfolio_id=portfolio.id, task_order_id=task_order.id
)
post_url_assert_status(owner, url, 302)
post_url_assert_status(ccpo, url, 302)
post_url_assert_status(rando, url, 404)
url = url_for("task_orders.update", screen=1, portfolio_id=portfolio.id)
url = url_for("task_orders.update", portfolio_id=portfolio.id)
post_url_assert_status(owner, url, 302)
post_url_assert_status(ccpo, url, 302)
post_url_assert_status(rando, url, 404)