mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-11 10:28:41 -04:00
Updating tests, but need to add a new one to test the new secondary navivation
This commit is contained in:
@@ -117,18 +117,27 @@
|
|||||||
"active": header_navigation.is_selected('user-profile')
|
"active": header_navigation.is_selected('user-profile')
|
||||||
}
|
}
|
||||||
] %}
|
] %}
|
||||||
{% set secondaryNavigation = [
|
{% if current_service %}
|
||||||
{
|
{% set secondaryNavigation = [
|
||||||
"href": url_for('.service_settings', service_id=current_service.id),
|
{
|
||||||
"text": "Settings",
|
"href": url_for('main.service_settings', service_id=current_service.id),
|
||||||
"active": secondary_navigation.is_selected('settings')
|
"text": "Settings",
|
||||||
},
|
"active": secondary_navigation.is_selected('settings')
|
||||||
{
|
},
|
||||||
"href": url_for('main.sign_out'),
|
{
|
||||||
"text": "Sign out"
|
"href": url_for('main.sign_out'),
|
||||||
}
|
"text": "Sign out"
|
||||||
] %}
|
}
|
||||||
{% endif %}
|
] %}
|
||||||
|
{% else %}
|
||||||
|
{% set secondaryNavigation = [
|
||||||
|
{
|
||||||
|
"href": url_for('main.sign_out'),
|
||||||
|
"text": "Sign out"
|
||||||
|
}
|
||||||
|
] %}
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<!-- Add navigation back after pilot -->
|
<!-- Add navigation back after pilot -->
|
||||||
{# {% set navigation = [
|
{# {% set navigation = [
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
<ul class="usa-sidenav">
|
<ul class="usa-sidenav">
|
||||||
{# {% if current_user.has_permissions() %} #}
|
{# {% if current_user.has_permissions() %} #}
|
||||||
<li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('settings') }}"
|
<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') }}"
|
<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>
|
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') }}"
|
<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 %} #}
|
{# {% endif %} #}
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -1052,9 +1052,9 @@ def test_menu_send_messages(
|
|||||||
in page
|
in page
|
||||||
)
|
)
|
||||||
# assert url_for('main.uploads', service_id=service_one['id']) 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
|
# 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
|
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.service_settings", service_id=service_one["id"]) in page
|
||||||
|
|
||||||
# assert url_for('main.api_keys', service_id=service_one['id']) not 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
|
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"]) 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
|
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)
|
page = str(page)
|
||||||
assert url_for("main.choose_template", service_id=service_one["id"]) in 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.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.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('main.view_notifications', service_id=service_one['id'], message_type='email') in page
|
||||||
assert (
|
assert (
|
||||||
url_for(
|
url_for(
|
||||||
|
|||||||
Reference in New Issue
Block a user