diff --git a/atst/app.py b/atst/app.py index f064a820..f2e100b2 100644 --- a/atst/app.py +++ b/atst/app.py @@ -64,9 +64,10 @@ def make_app(config): make_error_pages(app) app.register_blueprint(bp) app.register_blueprint(workspace_routes) - app.register_blueprint(requests_bp) app.register_blueprint(task_orders_bp) app.register_blueprint(user_routes) + app.register_blueprint(requests_bp) + if ENV != "prod": app.register_blueprint(dev_routes) diff --git a/atst/routes/task_orders/invite.py b/atst/routes/task_orders/invite.py index ea55ef9b..78e2daf5 100644 --- a/atst/routes/task_orders/invite.py +++ b/atst/routes/task_orders/invite.py @@ -1,11 +1,10 @@ -from flask import g, redirect, url_for +from flask import redirect, url_for, g from . import task_orders_bp from atst.domain.task_orders import TaskOrders from atst.utils.flash import formatted_flash as flash -# TODO: add a real implementation for this @task_orders_bp.route("/task_orders/invite/", methods=["POST"]) def invite(task_order_id): task_order = TaskOrders.get(g.current_user, task_order_id) diff --git a/templates/about.html b/templates/about.html index 967afddd..083d9cc1 100644 --- a/templates/about.html +++ b/templates/about.html @@ -15,7 +15,6 @@ JEDI Cloud provides commercial Infrastructure as a Service (IaaS) and Platform as a Service (PaaS) offerings to support DoD business and mission operations.
Anyone with a DoD mission may use JEDI.

- New JEDI Request

Five Steps to the JEDI Cloud

@@ -27,7 +26,6 @@

Complete a JEDI Cloud Access Request

A JEDI Cloud Access Request will inform the the Cloud Computing Program Office (CCPO) about your intention to use JEDI's commercial cloud services and provide the preliminary information needed to grant access. - Any DoD employee with a CAC may initiate this request. Start a Request

  • diff --git a/templates/navigation/global_navigation.html b/templates/navigation/global_navigation.html index a87c329d..c0c43cf2 100644 --- a/templates/navigation/global_navigation.html +++ b/templates/navigation/global_navigation.html @@ -2,15 +2,6 @@
      - {{ SidenavItem("Requests", - href="/requests", - icon="document", - active=g.matchesPath('/requests'), - subnav=[ - {"label":"New Request", "href":url_for("requests.requests_form_new", screen=1), "icon": "plus", "active": g.matchesPath('/requests/new')}, - ] - ) }} - {{ SidenavItem("New Task Order", href=url_for("task_orders.new", screen=1), icon="plus", diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html index ce3561bc..f0837a99 100644 --- a/templates/navigation/topbar.html +++ b/templates/navigation/topbar.html @@ -53,10 +53,6 @@

      {% endif %} - - - {{ "navigation.topbar.request_workspace_link_text" | translate }} -
    diff --git a/tests/routes/task_orders/test_invite.py b/tests/routes/task_orders/test_invite.py new file mode 100644 index 00000000..39cfeb76 --- /dev/null +++ b/tests/routes/task_orders/test_invite.py @@ -0,0 +1,11 @@ +import pytest +from flask import url_for + +from tests.factories import TaskOrderFactory + + +def test_invite(client): + to = TaskOrderFactory.create() + response = client.post( + url_for("task_orders.invite", task_order_id=to.id), follow_redirects=False + ) diff --git a/tests/routes/test_auth.py b/tests/routes/test_auth.py index aef34fbd..a0389929 100644 --- a/tests/routes/test_auth.py +++ b/tests/routes/test_auth.py @@ -4,20 +4,22 @@ from urllib.parse import quote from tests.factories import UserFactory +PROTECTED_URL = "/workspaces" + + def test_request_page_with_complete_profile(client, user_session): user = UserFactory.create() user_session(user) - response = client.get("/requests", follow_redirects=False) + response = client.get(PROTECTED_URL, follow_redirects=False) assert response.status_code == 200 def test_redirect_when_profile_missing_fields(client, user_session): user = UserFactory.create(date_latest_training=None) user_session(user) - requested_url = "/requests" - response = client.get(requested_url, follow_redirects=False) + response = client.get(PROTECTED_URL, follow_redirects=False) assert response.status_code == 302 - assert "/user?next={}".format(quote(requested_url, safe="")) in response.location + assert "/user?next={}".format(quote(PROTECTED_URL, safe="")) in response.location def test_unprotected_route_with_incomplete_profile(client, user_session): @@ -30,7 +32,7 @@ def test_unprotected_route_with_incomplete_profile(client, user_session): def test_completing_user_profile(client, user_session): user = UserFactory.create(phone_number=None) user_session(user) - response = client.get("/requests", follow_redirects=True) + response = client.get(PROTECTED_URL, follow_redirects=True) assert b"You must complete your profile" in response.data updated_data = {**user.to_dictionary(), "phone_number": "5558675309"} @@ -40,6 +42,6 @@ def test_completing_user_profile(client, user_session): response = client.post(url_for("users.update_user"), data=updated_data) assert response.status_code == 200 - response = client.get("/requests", follow_redirects=False) + response = client.get(PROTECTED_URL, follow_redirects=False) assert response.status_code == 200 assert b"You must complete your profile" not in response.data diff --git a/tests/routes/test_errors.py b/tests/routes/test_errors.py index 2ab85918..35c0d82d 100644 --- a/tests/routes/test_errors.py +++ b/tests/routes/test_errors.py @@ -1,4 +1,5 @@ import pytest +from flask import url_for @pytest.fixture @@ -10,7 +11,7 @@ def csrf_enabled_app(app): def test_csrf_error(csrf_enabled_app, client): response = client.post( - "/requests/new/1", + url_for("users.user"), headers={"Content-Type": "application/x-www-form-urlencoded"}, data="csrf_token=invalid_token", follow_redirects=True, diff --git a/tests/routes/test_home.py b/tests/routes/test_home.py index 082efca6..c95cb25d 100644 --- a/tests/routes/test_home.py +++ b/tests/routes/test_home.py @@ -19,6 +19,7 @@ def test_user_without_workspaces_has_no_workspaces_nav(client, user_session): assert b'href="/workspaces"' not in response.data +@pytest.mark.skip(reason="this may no longer be accurate") def test_request_owner_with_no_workspaces_redirected_to_requests(client, user_session): request = RequestFactory.create() user_session(request.creator) @@ -50,6 +51,7 @@ def test_request_owner_with_more_than_one_workspace_redirected_to_workspaces( assert "/workspaces" in response.location +@pytest.mark.skip(reason="this may no longer be accurate") def test_non_owner_user_with_no_workspaces_redirected_to_requests(client, user_session): user = UserFactory.create() @@ -86,6 +88,7 @@ def test_non_owner_user_with_mulitple_workspaces_redirected_to_workspaces( assert "/workspaces" in response.location +@pytest.mark.skip(reason="this may no longer be accurate") def test_ccpo_user_redirected_to_requests(client, user_session): user = UserFactory.from_atat_role("ccpo") for _ in range(3): diff --git a/tests/test_auth.py b/tests/test_auth.py index 099dc4ec..129b3205 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -189,11 +189,11 @@ def test_logout(app, client, monkeypatch): ) # create a real session resp = _login(client) - resp_success = client.get(url_for("requests.requests_index")) + resp_success = client.get(url_for("users.user")) # verify session is valid assert resp_success.status_code == 200 client.get(url_for("atst.logout")) - resp_failure = client.get(url_for("requests.requests_index")) + resp_failure = client.get(url_for("users.user")) # verify that logging out has cleared the session assert resp_failure.status_code == 302 destination = urlparse(resp_failure.headers["Location"]).path @@ -208,6 +208,6 @@ def test_redirected_on_login(client, monkeypatch): "atst.domain.authnid.AuthenticationContext.get_user", lambda *args: UserFactory.create(), ) - target_route = url_for("requests.requests_form_new", screen=1) + target_route = url_for("users.user") response = _login(client, next=target_route) assert target_route in response.headers.get("Location") diff --git a/tests/test_routes.py b/tests/test_routes.py deleted file mode 100644 index b1c03a4a..00000000 --- a/tests/test_routes.py +++ /dev/null @@ -1,19 +0,0 @@ -import pytest - - -@pytest.mark.parametrize( - "path", - ( - "/workspaces", - "/requests", - "/requests/new/1", - "/users", - "/reports", - "/calculator", - ), -) -def test_routes(path, client, user_session): - user_session() - - response = client.get(path) - assert response.status_code == 200