darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-23 09:29:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updating tests, but need to add a new one to test the new secondary navivation

Browse Source
This commit is contained in:
Jonathan Bobel
2024-01-04 15:23:01 -05:00
parent 7d6a07efd7
commit f1e678760b
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/templates/admin_template.html
View File

@@ -117,18 +117,27 @@
"active": header_navigation.is_selected('user-profile')
}
] %}
{% set secondaryNavigation = [
{
"href": url_for('.service_settings', service_id=current_service.id),
"text": "Settings",
"active": secondary_navigation.is_selected('settings')
},
{
"href": url_for('main.sign_out'),
"text": "Sign out"
}
] %}
{% endif %}
{% if current_service %}
{% set secondaryNavigation = [
{
"href": url_for('main.service_settings', service_id=current_service.id),
"text": "Settings",
"active": secondary_navigation.is_selected('settings')
},
{
"href": url_for('main.sign_out'),
"text": "Sign out"
}
] %}
{% else %}
{% set secondaryNavigation = [
{
"href": url_for('main.sign_out'),
"text": "Sign out"
}
] %}
{% endif %}
{% endif %}
{% else %}
<!-- Add navigation back after pilot -->
{# {% set navigation = [

4
app/templates/settings_nav.html
View File

@@ -5,11 +5,11 @@
<ul class="usa-sidenav">
{# {% if current_user.has_permissions() %} #}
<li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}"
href="{{ url_for('.service_settings', service_id=current_service.id) }}">General</a></li>
href="{{ url_for('main.service_settings', service_id=current_service.id) }}">General</a></li>
<li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('user-profile') }}"
href="{{ url_for('main.user_profile', service_id=current_service.id) }}">User profile</a></li>
<li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('team-members') }}"
href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
href="{{ url_for('main.manage_users', service_id=current_service.id) }}">Team members</a></li>
{# {% endif %} #}
</ul>
</nav>

14
tests/app/main/views/test_dashboard.py
View File

@@ -1052,9 +1052,9 @@ 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.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.service_settings", service_id=service_one["id"]) in page
# assert url_for('main.api_keys', service_id=service_one['id']) not in page
@@ -1086,7 +1086,7 @@ def test_menu_manage_service(
)
in page
)
assert url_for("main.manage_users", 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.api_keys', service_id=service_one['id']) not in page
@@ -1122,8 +1122,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 +1145,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(