Merge pull request #1063 from GSA/1043-move-account-info-into-utility-nav

1043 move account info into utility nav

tests/app/main/test_permissions.py

@@ -125,7 +125,6 @@ def test_service_navigation_for_org_user(
             (
                 "Send messages",
                 "Sent messages",
-                "Team members",
             ),
             403,
         ),
@@ -134,7 +133,6 @@ def test_service_navigation_for_org_user(
             (
                 "Send messages",
                 "Sent messages",
-                "Team members",
                 "Usage",
             ),
             200,

tests/app/main/views/accounts/test_choose_accounts.py

@@ -363,7 +363,7 @@ def test_should_show_back_to_service_if_user_belongs_to_service(
 ):
     mock_get_service.return_value = service_one
     expected_page_text = (
-        "Test Service Switch service " "Send messages " "Dashboard " "Team members"
+        "Test Service Switch service " "Send messages " "Dashboard " "Usage"
     )  # TODO: set sidebar variables in common test module
 
     page = client_request.get(

tests/app/main/views/test_dashboard.py

@@ -1020,6 +1020,20 @@ def _test_dashboard_menu(client_request, mocker, usr, service, permissions):
     return client_request.get("main.service_dashboard", service_id=service["id"])
 
 
+def _test_settings_menu(client_request, mocker, usr, service, permissions):
+    usr["permissions"][str(service["id"])] = permissions
+    usr["services"] = [service["id"]]
+    mocker.patch("app.user_api_client.check_verify_code", return_value=(True, ""))
+    mocker.patch(
+        "app.service_api_client.get_services", return_value={"data": [service]}
+    )
+    mocker.patch("app.user_api_client.get_user", return_value=usr)
+    mocker.patch("app.user_api_client.get_user_by_email", return_value=usr)
+    mocker.patch("app.service_api_client.get_service", return_value={"data": service})
+    client_request.login(usr)
+    return client_request.get("main.service_dashboard", service_id=service["id"])
+
+
 def test_menu_send_messages(
     client_request,
     mocker,
@@ -1051,11 +1065,8 @@ def test_menu_send_messages(
         )
         in page
     )
-    # assert url_for('main.uploads', service_id=service_one['id']) in page
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
-
-    assert url_for("main.service_settings", service_id=service_one["id"]) not in page
-    # assert url_for('main.api_keys', service_id=service_one['id']) not in page
+    assert url_for("main.manage_users", service_id=service_one["id"]) not in page
+    assert url_for("main.service_settings", service_id=service_one["id"]) in page
 
 
 def test_menu_manage_service(
@@ -1086,10 +1097,39 @@ def test_menu_manage_service(
         )
         in page
     )
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
-    assert url_for("main.service_settings", service_id=service_one["id"]) in page
+    assert url_for(".service_dashboard", service_id=service_one["id"]) in page
+    assert url_for(".choose_template", service_id=service_one["id"]) in page
 
-    # assert url_for('main.api_keys', service_id=service_one['id']) not in page
+
+def test_menu_main_settings(
+    client_request,
+    mocker,
+    api_user_active,
+    service_one,
+    mock_get_service_templates,
+    mock_has_no_jobs,
+    mock_get_template_statistics,
+    mock_get_service_statistics,
+    mock_get_annual_usage_for_service,
+    mock_get_inbound_sms_summary,
+    mock_get_free_sms_fragment_limit,
+):
+    page = _test_settings_menu(
+        client_request,
+        mocker,
+        api_user_active,
+        service_one,
+        ["view_activity", "user_profile", "manage_users", "manage_settings"],
+    )
+    page = str(page)
+    assert (
+        url_for(
+            "main.service_settings",
+            service_id=service_one["id"],
+        )
+        in page
+    )
+    assert url_for("main.service_settings", service_id=service_one["id"]) in page
 
 
 def test_menu_manage_api_keys(
@@ -1122,8 +1162,8 @@ def test_menu_manage_api_keys(
         )
         in page
     )
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
-    assert url_for("main.service_settings", service_id=service_one["id"]) in page
+    # assert url_for("main.manage_users", service_id=service_one["id"]) not in page
+    # assert url_for("main.service_settings", service_id=service_one["id"]) not in page
     assert url_for("main.api_integration", service_id=service_one["id"]) in page
 
 
@@ -1145,8 +1185,8 @@ def test_menu_all_services_for_platform_admin_user(
     )
     page = str(page)
     assert url_for("main.choose_template", service_id=service_one["id"]) in page
-    assert url_for("main.manage_users", service_id=service_one["id"]) in page
-    assert url_for("main.service_settings", service_id=service_one["id"]) in page
+    # assert url_for("main.manage_users", service_id=service_one["id"]) in page
+    # assert url_for("main.service_settings", service_id=service_one["id"]) in page
     # assert url_for('main.view_notifications', service_id=service_one['id'], message_type='email') in page
     assert (
         url_for(

tests/app/test_navigation.py

@@ -400,9 +400,9 @@ def test_navigation_urls(
     assert [a["href"] for a in page.select(".nav a")] == [
         "/services/{}/templates".format(SERVICE_ONE_ID),
         "/services/{}".format(SERVICE_ONE_ID),
-        "/services/{}/users".format(SERVICE_ONE_ID),
         "/services/{}/usage".format(SERVICE_ONE_ID),
-        "/services/{}/service-settings".format(SERVICE_ONE_ID),
+        # "/services/{}/users".format(SERVICE_ONE_ID),
+        # "/services/{}/service-settings".format(SERVICE_ONE_ID),
         # '/services/{}/api'.format(SERVICE_ONE_ID),
     ]
 
@@ -418,7 +418,7 @@ def test_caseworkers_get_caseworking_navigation(
     client_request.login(active_caseworking_user)
     page = client_request.get("main.choose_template", service_id=SERVICE_ONE_ID)
     assert normalize_spaces(page.select_one("header + .grid-container nav").text) == (
-        "Send messages Sent messages Team members"
+        "Send messages Sent messages"
     )
 
 
@@ -433,5 +433,5 @@ def test_caseworkers_see_jobs_nav_if_jobs_exist(
     client_request.login(active_caseworking_user)
     page = client_request.get("main.choose_template", service_id=SERVICE_ONE_ID)
     assert normalize_spaces(page.select_one("header + .grid-container nav").text) == (
-        "Send messages Sent messages Team members"
+        "Send messages Sent messages"
     )