Remove trailing spaces in default UIs

- Default UIs had blank lines with only spaces. These get deleted by the
  spring-javaformat plugin. In order to avoid this behavior, an extra \s
  had been inserted in the tests. The reason for those \s is not obvious.
- This commit cleans up the \s but changing the HTML templates.
This commit is contained in:
Daniel Garnier-Moiroux 2024-09-11 13:14:57 +02:00 committed by Rob Winch
parent 85693b2806
commit 7e41785dfc
5 changed files with 15 additions and 15 deletions

View File

@ -105,7 +105,7 @@ public class DefaultLoginPageConfigurerTests {
<div class="content"> <div class="content">
<form class="login-form" method="post" action="/login"> <form class="login-form" method="post" action="/login">
<h2>Please sign in</h2> <h2>Please sign in</h2>
\s
<p> <p>
<label for="username" class="screenreader">Username</label> <label for="username" class="screenreader">Username</label>
<input type="text" id="username" name="username" placeholder="Username" required autofocus> <input type="text" id="username" name="username" placeholder="Username" required autofocus>
@ -286,7 +286,7 @@ public class DefaultLoginPageConfigurerTests {
<div class="content"> <div class="content">
<form class="login-form" method="post" action="/login"> <form class="login-form" method="post" action="/login">
<h2>Please sign in</h2> <h2>Please sign in</h2>
\s
<p> <p>
<label for="username" class="screenreader">Username</label> <label for="username" class="screenreader">Username</label>
<input type="text" id="username" name="username" placeholder="Username" required autofocus> <input type="text" id="username" name="username" placeholder="Username" required autofocus>

View File

@ -150,7 +150,7 @@ public class OneTimeTokenLoginConfigurerTests {
<div class="content"> <div class="content">
<form class="login-form" method="post" action="/login"> <form class="login-form" method="post" action="/login">
<h2>Please sign in</h2> <h2>Please sign in</h2>
\s
<p> <p>
<label for="username" class="screenreader">Username</label> <label for="username" class="screenreader">Username</label>
<input type="text" id="username" name="username" placeholder="Username" required autofocus> <input type="text" id="username" name="username" placeholder="Username" required autofocus>
@ -165,7 +165,7 @@ public class OneTimeTokenLoginConfigurerTests {
</form> </form>
<form id="ott-form" class="login-form" method="post" action="/ott/generate"> <form id="ott-form" class="login-form" method="post" action="/ott/generate">
<h2>Request a One-Time Token</h2> <h2>Request a One-Time Token</h2>
\s
<p> <p>
<label for="ott-username" class="screenreader">Username</label> <label for="ott-username" class="screenreader">Username</label>
<input type="text" id="ott-username" name="username" placeholder="Username" required> <input type="text" id="ott-username" name="username" placeholder="Username" required>

View File

@ -68,7 +68,7 @@ public class FormLoginBeanDefinitionParserTests {
<div class="content"> <div class="content">
<form class="login-form" method="post" action="/login"> <form class="login-form" method="post" action="/login">
<h2>Please sign in</h2> <h2>Please sign in</h2>
\s
<p> <p>
<label for="username" class="screenreader">Username</label> <label for="username" class="screenreader">Username</label>
<input type="text" id="username" name="username" placeholder="Username" required autofocus> <input type="text" id="username" name="username" placeholder="Username" required autofocus>
@ -115,7 +115,7 @@ public class FormLoginBeanDefinitionParserTests {
<div class="content"> <div class="content">
<form class="login-form" method="post" action="/signin"> <form class="login-form" method="post" action="/signin">
<h2>Please sign in</h2> <h2>Please sign in</h2>
\s
<p> <p>
<label for="username" class="screenreader">Username</label> <label for="username" class="screenreader">Username</label>
<input type="text" id="username" name="custom_user" placeholder="Username" required autofocus> <input type="text" id="username" name="custom_user" placeholder="Username" required autofocus>

View File

@ -199,12 +199,12 @@ public class DefaultLoginPageGeneratingFilterTests {
assertThat(response.getContentAsString()).contains(""" assertThat(response.getContentAsString()).contains("""
<form id="ott-form" class="login-form" method="post" action="/ott/authenticate"> <form id="ott-form" class="login-form" method="post" action="/ott/authenticate">
<h2>Request a One-Time Token</h2> <h2>Request a One-Time Token</h2>
\s
<p> <p>
<label for="ott-username" class="screenreader">Username</label> <label for="ott-username" class="screenreader">Username</label>
<input type="text" id="ott-username" name="username" placeholder="Username" required> <input type="text" id="ott-username" name="username" placeholder="Username" required>
</p> </p>
\s
<button class="primary" type="submit" form="ott-form">Send Token</button> <button class="primary" type="submit" form="ott-form">Send Token</button>
</form> </form>
"""); """);