Committing before merge

This commit is contained in:
Jonathan Bobel
2023-10-12 10:21:11 -04:00
parent d12faf6cd8
commit 3e7a4f78f3
9 changed files with 45 additions and 36 deletions

View File

@@ -256,21 +256,23 @@ def test_choose_account_should_should_organizations_link_for_platform_admin(
] == expected_headings
def test_choose_account_should_show_back_to_service_link(
client_request,
mock_get_orgs_and_services,
mock_get_organization,
mock_get_organization_services,
):
resp = client_request.get("main.choose_account")
# Moving the back to service link into the top navigation
service_navigation = resp.find(
"div", {"class": "navigation-service usa-breadcrumb"}
)
back_to_service_link = service_navigation.a
# def test_choose_account_should_show_back_to_service_link(
# client_request,
# mock_get_orgs_and_services,
# mock_get_organization,
# mock_get_organization_services,
# ):
# resp = client_request.get("main.choose_account")
assert back_to_service_link["href"] == url_for("main.show_accounts_or_dashboard")
assert back_to_service_link.text == "Back to service one"
# service_navigation = resp.find(
# "div", {"class": "navigation-service usa-breadcrumb"}
# )
# back_to_service_link = service_navigation.a
# assert back_to_service_link["href"] == url_for("main.show_accounts_or_dashboard")
# assert back_to_service_link.text == "Back to service one"
def test_choose_account_should_not_show_back_to_service_link_if_no_service_in_session(
@@ -322,7 +324,7 @@ def test_choose_account_should_not_show_back_to_service_link_if_service_archived
assert normalize_spaces(page.select_one("h1").text) == "Choose service"
if active:
assert page.select_one(".navigation-service a") is not None
assert page.select_one(".navigation-service a") is None
else:
assert page.select_one(".navigation-service a") is None

View File

@@ -17,7 +17,7 @@ def test_should_show_overview_page(
client_request,
):
page = client_request.get("main.user_profile")
assert page.select_one("h1").text.strip() == "Your profile"
assert page.select_one("h1").text.strip() == "User profile"
assert "Use platform admin view" not in page
assert "Security keys" not in page
@@ -27,7 +27,7 @@ def test_overview_page_shows_disable_for_platform_admin(
):
client_request.login(platform_admin_user)
page = client_request.get("main.user_profile")
assert page.select_one("h1").text.strip() == "Your profile"
assert page.select_one("h1").text.strip() == "User profile"
disable_platform_admin_row = page.select_one("#disable-platform-admin")
assert (
" ".join(disable_platform_admin_row.text.split())
@@ -365,7 +365,7 @@ def test_non_gov_user_cannot_see_change_email_link(
client_request.login(api_nongov_user_active)
page = client_request.get("main.user_profile")
assert not page.find("a", {"href": url_for("main.user_profile_email")})
assert page.select_one("h1").text.strip() == "Your profile"
assert page.select_one("h1").text.strip() == "User profile"
def test_non_gov_user_cannot_access_change_email_page(