mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-07 13:18:24 -04:00
Updated width of sidenav and fixed test
This commit is contained in:
@@ -50,7 +50,7 @@
|
|||||||
{% block maincolumn_content %}
|
{% block maincolumn_content %}
|
||||||
<div class="grid-row">
|
<div class="grid-row">
|
||||||
{% if navigation_links %}
|
{% if navigation_links %}
|
||||||
<div class="tablet:grid-col-3 margin-bottom-4">
|
<div class="tablet:grid-col-2 margin-bottom-4">
|
||||||
<nav class="nav">
|
<nav class="nav">
|
||||||
<ul class="usa-sidenav">
|
<ul class="usa-sidenav">
|
||||||
{% for item in navigation_links %}
|
{% for item in navigation_links %}
|
||||||
@@ -80,9 +80,9 @@
|
|||||||
|
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</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 %}
|
{% else %}
|
||||||
<div class="tablet:grid-col-9">
|
<div class="tablet:grid-col-10">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% block content_column_content %}{% endblock %}
|
{% block content_column_content %}{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -108,52 +108,34 @@ def test_hiding_pages_from_search_engines(
|
|||||||
def test_static_pages(client_request, mock_get_organization_by_domain, view, mocker):
|
def test_static_pages(client_request, mock_get_organization_by_domain, view, mocker):
|
||||||
mocker.patch("app.notify_client.user_api_client.UserApiClient.deactivate_user")
|
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))
|
request = partial(client_request.get, "main.{}".format(view))
|
||||||
|
|
||||||
# If the guidance feature is disabled, expect a 404 for feature-flagged views
|
# Assert the page loads successfully
|
||||||
if is_feature_flagged(view):
|
page = request(_expected_status=200)
|
||||||
page = request(_expected_status=404)
|
assert page.select_one("meta[name=description]")
|
||||||
else:
|
|
||||||
# Check the page loads when user is signed in
|
|
||||||
page = request()
|
|
||||||
assert page.select_one("meta[name=description]")
|
|
||||||
|
|
||||||
# Check it still works when they don’t have a recent service
|
# Check the behavior when no recent service is set
|
||||||
with client_request.session_transaction() as session:
|
with client_request.session_transaction() as session:
|
||||||
session["service_id"] = None
|
session["service_id"] = None
|
||||||
request()
|
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):
|
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")
|
mocker.patch("app.notify_client.user_api_client.UserApiClient.deactivate_user")
|
||||||
|
|
||||||
request = partial(client_request.get, "main.edit_and_format_messages")
|
request = partial(client_request.get, "main.edit_and_format_messages")
|
||||||
selector = ".list-number li a"
|
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:
|
with client_request.session_transaction() as session:
|
||||||
session["service_id"] = None
|
session["service_id"] = None
|
||||||
session["user_id"] = None
|
session["user_id"] = None
|
||||||
page = request(_expected_status=302)
|
request(_expected_status=302)
|
||||||
assert not page.select_one(selector)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
|||||||
Reference in New Issue
Block a user