From 31a34b06992259e087e1b355f6bb2d7ccb52d5b7 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice.gangler@adullact.org>
Date: Tue, 25 Feb 2025 00:02:46 +0100
Subject: [PATCH] fix(twig): use H1 instead of H2 for some pages
---
webapp/templates/user/forgot_passord_form.html.twig | 4 ++--
.../user/forgot_passord_not_valid_token.html.twig | 4 ++--
.../user/forgot_passord_request_form.html.twig | 4 ++--
.../user/forgot_passord_request_result.html.twig | 4 ++--
webapp/templates/user/login.html.twig | 4 ++--
.../Functional/User/FunctionalTestLostPasswordTest.php | 10 +++++-----
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/webapp/templates/user/forgot_passord_form.html.twig b/webapp/templates/user/forgot_passord_form.html.twig
index 3ea5ddc..bc7dab6 100644
--- a/webapp/templates/user/forgot_passord_form.html.twig
+++ b/webapp/templates/user/forgot_passord_form.html.twig
@@ -19,9 +19,9 @@
<div class="col-md-7">
- <h2>
+ <h1>
{{ 'forgot_password.page.title'|trans }}
- </h2>
+ </h1>
{{ form_start(forgotPasswordForm) }}
{{ form_widget(forgotPasswordForm) }}
<button id="public_forgotPassword_newPasswordForm_submit" class="btn btn-primary">
diff --git a/webapp/templates/user/forgot_passord_not_valid_token.html.twig b/webapp/templates/user/forgot_passord_not_valid_token.html.twig
index 7800fbf..52a035b 100644
--- a/webapp/templates/user/forgot_passord_not_valid_token.html.twig
+++ b/webapp/templates/user/forgot_passord_not_valid_token.html.twig
@@ -17,9 +17,9 @@
</nav>
<div class="col-md-9">
- <h2>
+ <h1>
{{ 'forgot_password.not-voalid-token.page.title'|trans }}
- </h2>
+ </h1>
<p id="error_forgot-password_not-voalid-token" class="alert alert-danger">
{{ 'forgot_password.not-voalid-token.error_msg'|trans }}
</p>
diff --git a/webapp/templates/user/forgot_passord_request_form.html.twig b/webapp/templates/user/forgot_passord_request_form.html.twig
index 40c8dbb..cc144f6 100644
--- a/webapp/templates/user/forgot_passord_request_form.html.twig
+++ b/webapp/templates/user/forgot_passord_request_form.html.twig
@@ -19,9 +19,9 @@
</nav>
<div class="col-md-7">
- <h2>
+ <h1>
{{ 'forgot_password.request.page.title'|trans }}
- </h2>
+ </h1>
{{ form_start(forgotPasswordForm) }}
{{ form_widget(forgotPasswordForm) }}
<button id="public_forgotPassword_requestForm_submit" class="btn btn-primary">
diff --git a/webapp/templates/user/forgot_passord_request_result.html.twig b/webapp/templates/user/forgot_passord_request_result.html.twig
index e6f86fd..a20919f 100644
--- a/webapp/templates/user/forgot_passord_request_result.html.twig
+++ b/webapp/templates/user/forgot_passord_request_result.html.twig
@@ -18,9 +18,9 @@
</ol>
</nav>
- <h2>
+ <h1>
{{ 'forgot_password.request.page.title'|trans }}
- </h2>
+ </h1>
<div class="col-md-7">
<p class="alert alert-success">
{{ 'forgot_password.request.result'|trans }}
diff --git a/webapp/templates/user/login.html.twig b/webapp/templates/user/login.html.twig
index 432554c..5cdd306 100644
--- a/webapp/templates/user/login.html.twig
+++ b/webapp/templates/user/login.html.twig
@@ -15,9 +15,9 @@
</nav>
- <h2>
+ <h1>
{{ 'login.page.title'|trans }}
- </h2>
+ </h1>
{% if error %}
<div class="alert alert-warning">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
{% endif %}
diff --git a/webapp/tests/Functional/User/FunctionalTestLostPasswordTest.php b/webapp/tests/Functional/User/FunctionalTestLostPasswordTest.php
index 192fabc..a15505a 100644
--- a/webapp/tests/Functional/User/FunctionalTestLostPasswordTest.php
+++ b/webapp/tests/Functional/User/FunctionalTestLostPasswordTest.php
@@ -153,7 +153,7 @@ private function sendForgotPasswordNewPasswordFormWithWrongData(
);
$this->assertRouteSame("app_account_forgot_password_new-password");
$this->assertResponseStatusCodeSame(Response::HTTP_OK); // HTTP status code = 200
- $this->assertSelectorTextSame('h2', 'Reset your password');
+ $this->assertSelectorTextSame('h1', 'Reset your password');
$this->assertSelectorExists("div.invalid-feedback");
// $this->assertSelectorTextSame('div.alert-danger', 'The form contains some errors, as described below.');
return $crawler;
@@ -169,7 +169,7 @@ private function sendRequestForgotPasswordFormWithWrongData(
);
$this->assertRouteSame("app_account_forgot_password_request");
$this->assertResponseStatusCodeSame(Response::HTTP_OK); // HTTP status code = 200
- $this->assertSelectorTextSame('h2', 'Forgot your password?');
+ $this->assertSelectorTextSame('h1', 'Forgot your password?');
// $this->assertSelectorTextSame('div.alert-danger', 'The form contains some errors, as described below.');
return $crawler;
}
@@ -187,7 +187,7 @@ private function loadEmptyForgotPasswordNewPasswordForm(
if ($enableBasicAssertions === true) {
$this->assertRouteSame("app_account_forgot_password_new-password");
$this->assertResponseStatusCodeSame(Response::HTTP_OK); // HTTP status code = 200
- $this->assertSelectorTextContains('h2', "Reset your password");
+ $this->assertSelectorTextContains('h1', "Reset your password");
}
if (\is_null($expectedErrorMsg)) {
@@ -263,7 +263,7 @@ private function loadEmptyForgotPasswordRequestForm(
if ($enableAssertions === true) {
$this->assertRouteSame("app_account_forgot_password_request");
$this->assertResponseStatusCodeSame(Response::HTTP_OK); // HTTP status code = 200
- $this->assertSelectorTextSame('h2', 'Forgot your password?');
+ $this->assertSelectorTextSame('h1', 'Forgot your password?');
$htmlFormName = "reset_password_request_form";
$this->checkAttribute(crawler: $crawler, cssFilter: "form[name=$htmlFormName]", attributesExpected: []);
$this->checkFormField(
@@ -907,7 +907,7 @@ public function testAnonymousUserCanSendNewPasswordFormAndLoginWithNewPassword()
$this->assertResponseStatusCodeSame(Response::HTTP_SEE_OTHER); // HTTP status code = 303
$this->assertResponseHeaderSame("Location", '/en/account/login');
$crawler = $kernelBrowser->request('GET', '/en/account/login');
- $this->assertSelectorTextSame('h2', 'Login');
+ $this->assertSelectorTextSame('h1', 'Login');
$this->assertSelectorTextContains('.alert-success', "Your password has been successfully changed.");
// Check that password has been changed in database
--
GitLab