templates: fix service info fragment broken links (#77844) #62

Merged
pmarillonnet merged 1 commits from wip/77844-service-info-fragment-broken-link into main 2023-05-23 14:58:32 +02:00
2 changed files with 4 additions and 2 deletions

View File

@ -24,7 +24,7 @@
<a href="{% firstof home_url generic_service_home_url %}">
{% endif %}
<img src="{{ logo_url }}" alt="{{ name }}" class="service-message--logo" />
{% if service.home_url %}
{% if service.home_url or generic_service_home_url %}
</a>
{% endif %}
</picture>
@ -34,7 +34,7 @@
<div class="service-message--paragraph">
{% block service-text %}
{% if service.home_url or generic_service_home_url %}
<a href="{% firstof service.home_url generic_service_home_url %}" class="service-message--link">
<a href="{% firstof service.home_url generic_service_home_url %}" class="service-message--link">{{ name }}</a>
{% else %}
<span class="service-message--text">{{ name }}</span>
{% endif %}

View File

@ -564,8 +564,10 @@ def test_sso_redirect_post_default_appearance(app, idp, user):
scenario = Scenario(app, sp_kwargs=dict(binding='post'))
scenario.launch_authn_request()
assert scenario.login_page_response.pyquery.find("picture a[href='https://default.example.net']")
link = scenario.login_page_response.pyquery.find('a.service-message--link')[0]
assert link.attrib['href'] == 'https://default.example.net'
assert link.text == 'Some default service name'
assert 'color: #8c22ec' in scenario.login_page_response.text
assert (
scenario.login_page_response.pyquery.find('img.service-message--logo')[0].attrib['src']