From b2db53096f669da6e25f0c62cbff1b80f31844ce Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 16 Jul 2019 13:41:25 -0400 Subject: [PATCH] Rename routes --- atst/routes/task_orders/index.py | 2 +- atst/routes/task_orders/new.py | 10 ++--- templates/portfolios/task_orders/index.html | 2 +- templates/portfolios/task_orders/review.html | 2 +- templates/task_orders/step_1.html | 4 +- templates/task_orders/step_2.html | 2 +- tests/routes/task_orders/test_index.py | 3 +- tests/routes/task_orders/test_new.py | 39 ++++++++------------ 8 files changed, 28 insertions(+), 36 deletions(-) diff --git a/atst/routes/task_orders/index.py b/atst/routes/task_orders/index.py index 8fbaccfe..c05dde08 100644 --- a/atst/routes/task_orders/index.py +++ b/atst/routes/task_orders/index.py @@ -15,7 +15,7 @@ from atst.utils.flash import formatted_flash as flash def review_task_order(task_order_id): task_order = TaskOrders.get(task_order_id) if task_order.is_draft: - return redirect(url_for("task_orders.add_to_pdf", task_order_id=task_order.id)) + return redirect(url_for("task_orders.add_pdf", task_order_id=task_order.id)) else: signature_form = SignatureForm() return render_template( diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index 208f8f14..1e7e93fa 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -58,7 +58,7 @@ def update_task_order( @task_orders_bp.route("/portfolios//task_orders/step_1") @task_orders_bp.route("/task_orders//step_1") @user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form") -def add_to_pdf(portfolio_id=None, task_order_id=None): +def add_pdf(portfolio_id=None, task_order_id=None): return render_task_orders_edit( "task_orders/step_1.html", portfolio_id=portfolio_id, @@ -69,9 +69,9 @@ def add_to_pdf(portfolio_id=None, task_order_id=None): @task_orders_bp.route("/portfolios//task_orders/step-1", methods=["POST"]) @task_orders_bp.route("/task_orders//step_1", methods=["POST"]) @user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form") -def upload_to_pdf(portfolio_id=None, task_order_id=None): +def upload_pdf(portfolio_id=None, task_order_id=None): form_data = {**http_request.form, **http_request.files} - next_page = "task_orders.add_to_number" + next_page = "task_orders.add_number" current_template = "task_orders/step_1.html" return update_task_order( @@ -85,7 +85,7 @@ def upload_to_pdf(portfolio_id=None, task_order_id=None): @task_orders_bp.route("/task_orders//step_2") @user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form") -def add_to_number(task_order_id): +def add_number(task_order_id): return render_task_orders_edit( "task_orders/step_2.html", task_order_id=task_order_id ) @@ -93,7 +93,7 @@ def add_to_number(task_order_id): @task_orders_bp.route("/task_orders//step_2", methods=["POST"]) @user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form") -def update_to_number(task_order_id): +def update_number(task_order_id): form_data = {**http_request.form} next_page = "task_orders.add_clins" current_template = "task_orders/step_2.html" diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index a2305cc5..975b5286 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -97,7 +97,7 @@ {% call StickyCTA(text="Funding") %} {% if user_can(permissions.CREATE_TASK_ORDER) %} - Start a new task order + Start a new task order {% endif %} {% endcall %} diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index dd74e758..c1a7a0e5 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -22,7 +22,7 @@ {% endcall %} {% call StickyCTA(text="Review Funding") %} - Edit + Edit Submit task order {% endcall %} diff --git a/templates/task_orders/step_1.html b/templates/task_orders/step_1.html index a1f7d1e5..bf499fb5 100644 --- a/templates/task_orders/step_1.html +++ b/templates/task_orders/step_1.html @@ -6,9 +6,9 @@ {% block portfolio_content %} {% if task_order_id %} - {% set action = url_for("task_orders.upload_to_pdf", task_order_id=task_order_id) %} + {% set action = url_for("task_orders.upload_pdf", task_order_id=task_order_id) %} {% else %} - {% set action = url_for("task_orders.upload_to_pdf", portfolio_id=portfolio.id) %} + {% set action = url_for("task_orders.upload_pdf", portfolio_id=portfolio.id) %} {% endif %} diff --git a/templates/task_orders/step_2.html b/templates/task_orders/step_2.html index 53b37b27..414bdbaa 100644 --- a/templates/task_orders/step_2.html +++ b/templates/task_orders/step_2.html @@ -4,7 +4,7 @@ {% from 'components/text_input.html' import TextInput %} {% block portfolio_content %} - {% set action = url_for("task_orders.update_to_number", task_order_id=task_order_id) %} + {% set action = url_for("task_orders.update_number", task_order_id=task_order_id) %}
diff --git a/tests/routes/task_orders/test_index.py b/tests/routes/task_orders/test_index.py index 0c7f34e0..c3476026 100644 --- a/tests/routes/task_orders/test_index.py +++ b/tests/routes/task_orders/test_index.py @@ -52,8 +52,7 @@ def test_review_task_order_draft(client, user_session, task_order): ) assert response.status_code == 302 assert ( - url_for("task_orders.add_to_pdf", task_order_id=task_order.id) - in response.location + url_for("task_orders.add_pdf", task_order_id=task_order.id) in response.location ) diff --git a/tests/routes/task_orders/test_new.py b/tests/routes/task_orders/test_new.py index 1f41382b..a6e77f75 100644 --- a/tests/routes/task_orders/test_new.py +++ b/tests/routes/task_orders/test_new.py @@ -32,19 +32,17 @@ def user(): return UserFactory.create() -def test_task_orders_add_to_pdf(client, user_session, portfolio): +def test_task_orders_add_pdf(client, user_session, portfolio): user_session(portfolio.owner) - response = client.get(url_for("task_orders.add_to_pdf", portfolio_id=portfolio.id)) + response = client.get(url_for("task_orders.add_pdf", portfolio_id=portfolio.id)) assert response.status_code == 200 -def test_task_orders_upload_to_pdf( - client, user_session, portfolio, pdf_upload, session -): +def test_task_orders_upload_pdf(client, user_session, portfolio, pdf_upload, session): user_session(portfolio.owner) form_data = {"pdf": pdf_upload} response = client.post( - url_for("task_orders.upload_to_pdf", portfolio_id=portfolio.id), data=form_data + url_for("task_orders.upload_pdf", portfolio_id=portfolio.id), data=form_data ) assert response.status_code == 302 @@ -52,19 +50,19 @@ def test_task_orders_upload_to_pdf( assert task_order.pdf.filename == pdf_upload.filename -def test_task_orders_add_to_number(client, user_session, task_order): +def test_task_orders_add_number(client, user_session, task_order): user_session(task_order.creator) response = client.get( - url_for("task_orders.add_to_number", task_order_id=task_order.id) + url_for("task_orders.add_number", task_order_id=task_order.id) ) assert response.status_code == 200 -def test_task_orders_update_to_number(client, user_session, task_order): +def test_task_orders_update_number(client, user_session, task_order): user_session(task_order.creator) form_data = {"number": "1234567890"} response = client.post( - url_for("task_orders.update_to_number", task_order_id=task_order.id), + url_for("task_orders.update_number", task_order_id=task_order.id), data=form_data, ) @@ -96,8 +94,7 @@ def test_task_orders_update_clins(client, user_session, task_order): "clins-1-loas-0": "78979087", } response = client.post( - url_for("task_orders.update_to_number", task_order_id=task_order.id), - data=form_data, + url_for("task_orders.update_clins", task_order_id=task_order.id), data=form_data ) assert response.status_code == 302 @@ -126,15 +123,13 @@ def test_task_orders_save_incomplete(client, user_session, portfolio): assert response.location == expected_url -def test_task_orders_add_to_pdf_existing_to(client, user_session, task_order): +def test_task_orders_add_pdf_existing_to(client, user_session, task_order): user_session(task_order.creator) - response = client.get( - url_for("task_orders.add_to_pdf", task_order_id=task_order.id) - ) + response = client.get(url_for("task_orders.add_pdf", task_order_id=task_order.id)) assert response.status_code == 200 -def test_task_orders_upload_to_pdf_existing_to( +def test_task_orders_upload_pdf_existing_to( client, user_session, task_order, pdf_upload, pdf_upload2 ): task_order.pdf = pdf_upload @@ -143,19 +138,18 @@ def test_task_orders_upload_to_pdf_existing_to( user_session(task_order.creator) form_data = {"pdf": pdf_upload2} response = client.post( - url_for("task_orders.upload_to_pdf", task_order_id=task_order.id), - data=form_data, + url_for("task_orders.upload_pdf", task_order_id=task_order.id), data=form_data ) assert response.status_code == 302 assert task_order.pdf.filename == pdf_upload2.filename -def test_task_orders_update_to_number_existing_to(client, user_session, task_order): +def test_task_orders_update_number_existing_to(client, user_session, task_order): user_session(task_order.creator) form_data = {"number": "0000000000"} original_number = task_order.number response = client.post( - url_for("task_orders.upload_to_pdf", task_order_id=task_order.id), + url_for("task_orders.update_number", task_order_id=task_order.id), data=form_data, ) assert response.status_code == 302 @@ -195,8 +189,7 @@ def test_task_orders_update_clins_existing_to(client, user_session, task_order): "clins-0-loas-0": "123123123123", } response = client.post( - url_for("task_orders.update_to_number", task_order_id=task_order.id), - data=form_data, + url_for("task_orders.update_clins", task_order_id=task_order.id), data=form_data ) assert response.status_code == 302