darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-05 08:59:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated width of sidenav and fixed test

Browse Source
This commit is contained in:
alexjanousekGSA
2025-01-13 11:42:48 -05:00
parent 05e73da4e8
commit 36b9d2f772
2 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/base.html
View File

@@ -50,7 +50,7 @@
{% block maincolumn_content %}
<div class="grid-row">
{% if navigation_links %}
<div class="tablet:grid-col-3 margin-bottom-4">
<div class="tablet:grid-col-2 margin-bottom-4">
<nav class="nav">
<ul class="usa-sidenav">
{% for item in navigation_links %}
@@ -80,9 +80,9 @@
</nav>
</div>
<div class="tablet:grid-col-9 tablet:padding-left-4 usa-prose site-prose">
<div class="tablet:grid-col-10 tablet:padding-left-4 usa-prose site-prose">
{% else %}
<div class="tablet:grid-col-9">
<div class="tablet:grid-col-10">
{% endif %}
{% block content_column_content %}{% endblock %}
</div>

62
tests/app/main/views/test_index.py
View File

@@ -108,52 +108,34 @@ def test_hiding_pages_from_search_engines(
def test_static_pages(client_request, mock_get_organization_by_domain, view, mocker):
mocker.patch("app.notify_client.user_api_client.UserApiClient.deactivate_user")
# Function to check if a view is feature-flagged and should return 404 when disabled
def is_feature_flagged(view):
feature_flagged_views = [
"clear_goals",
"rules_and_regulations",
"establish_trust",
"write_for_action",
"multiple_languages",
"benchmark_performance",
"guidance_index",
]
return (
view in feature_flagged_views
)
request = partial(client_request.get, "main.{}".format(view))
# If the guidance feature is disabled, expect a 404 for feature-flagged views
if is_feature_flagged(view):
page = request(_expected_status=404)
else:
# Check the page loads when user is signed in
page = request()
assert page.select_one("meta[name=description]")
# Assert the page loads successfully
page = request(_expected_status=200)
assert page.select_one("meta[name=description]")
# Check it still works when they don’t have a recent service
with client_request.session_transaction() as session:
session["service_id"] = None
request()
# Check the behavior when no recent service is set
with client_request.session_transaction() as session:
session["service_id"] = None
request()
# Check redirection to login screen when signed out
client_request.logout()
with client_request.session_transaction() as session:
session["service_id"] = None
session["user_id"] = None
request(
_expected_status=302,
_expected_redirect="/sign-in?next={}".format(
url_for("main.{}".format(view))
),
)
# Check it redirects to the login screen when they sign out
client_request.logout()
with client_request.session_transaction() as session:
session["service_id"] = None
session["user_id"] = None
request(
_expected_status=302,
_expected_redirect="/sign-in?next={}".format(
url_for("main.{}".format(view))
),
)
def test_guidance_pages_link_to_service_pages_when_signed_in(client_request, mocker):
mocker.patch("app.notify_client.user_api_client.UserApiClient.deactivate_user")
request = partial(client_request.get, "main.edit_and_format_messages")
selector = ".list-number li a"
@@ -175,8 +157,8 @@ def test_guidance_pages_link_to_service_pages_when_signed_in(client_request, moc
with client_request.session_transaction() as session:
session["service_id"] = None
session["user_id"] = None
page = request(_expected_status=302)
assert not page.select_one(selector)
request(_expected_status=302)
@pytest.mark.parametrize(