Merge branch 'main' into BC-2936-dynamic-selectors

hpi-schul-cloud · Nov 4, 2024 · a5ee2c6 · a5ee2c6
2 parents 3d498ea + d4594ec
commit a5ee2c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/views/administration/users_edit.hbs b/views/administration/users_edit.hbs
@@ -178,7 +178,7 @@
                             class="btn btn-secondary btn-delete" data-testid="button_delete_user">{{$t "administration.users_edit.headline.deleteUser" }}</button>
                         {{/if}}
                         <button style="margin: 0 10px 20px 0" style="margin:15px"
-                            class="btn btn-secondary btn-invitation-link-with-hash {{#if editTeacher}}teacher{{else}}student{{/if}}"
+                            class="btn btn-secondary btn-invitation-link-with-hash {{#if editTeacher}}teacher{{else}}student{{/if}}" data-testid="generate-registration-link"
                             {{#if hasAccount}} disabled {{/if}}
                             {{#ifeq consentStatusIcon '<i class="fa fa-check consent-status double-check"></i><i class="fa fa-check consent-status double-check"></i>'}}
                             title="{{$t "administration.users_edit.button.alreadyRegistered" }}" {{/ifeq}}>

diff --git a/views/lib/forms/paginatedForm.hbs b/views/lib/forms/paginatedForm.hbs
@@ -7,7 +7,7 @@
 
 	<div class="stages">
 		{{#for 1 (add sections 1) 1}}
-			<label role="button" class="section-button" aria-pressed="false" tabindex="0" for="section-{{this}}">{{this}}</label>
+			<label role="button" class="section-button" aria-pressed="false" tabindex="0" for="section-{{this}}" data-testid="section-button-{{this}}">{{this}} </label>
 		{{/for}}
 	</div>
 
@@ -21,7 +21,7 @@
 
 	{{#block "buttons"}}{{/block}}
         <button id="prevSection" class="btn btn-secondary" type="button" disabled="disabled">{{$t "global.button.back" }}</button>
-        <button id="nextSection" class="btn btn-primary pull-right" type="submit" value="Submit" data-next-label="{{$t "global.button.next" }}" 
+        <button id="nextSection" class="btn btn-primary pull-right" type="submit" value="Submit" data-next-label="{{$t "global.button.next" }}"
 		{{#unless submit-testid}}{{else}}data-testid="{{submit-testid}}"{{/unless}}
         data-submit-label="{{#unless submit-label}}{{$t "global.button.submit" }}{{else}}{{submit-label}}{{/unless}}">
         {{$t "global.button.next" }}

diff --git a/views/registration/registration-employee.hbs b/views/registration/registration-employee.hbs
@@ -106,7 +106,7 @@
           {{#embed "registration/pin" digits=4 pattern="[0-9]" required="true" name="pin" class="mail-validation my-1"}}{{/embed}}
         </div>
       </section>
-      <section data-panel="section-6">
+      <section data-panel="section-6" data-testid="teacher-registration-summary">
         <h2 class="h4">{{$t "registration._registration.global.headline.thankYouForRegistering" (dict "title" theme.theme_title)}}</h2>
         <p>{{$t "registration._registration.employee.text.youCanNowSingIn" (dict "title" theme.title)}}</p>
         <a class="btn btn-primary" href="/logout">{{$t "registration._registration.global.button.openLogin" }}</a>

diff --git a/views/registration/registration-student.hbs b/views/registration/registration-student.hbs
@@ -93,8 +93,8 @@
                 <div class="print">
                     <div class="recap">
                         <!--<p>Nutzername: <i data-from="firstName"></i>.<i data-from="lastName"></i></p>-->
-                        <p>{{$t "global.label.emailAddress"}} <i data-from="email"></i></p>
-                        <p>{{$t "global.label.password"}} <i class="student-password">{{password}}</i></p>
+                        <p>{{$t "global.label.emailAddress"}} <i data-from="email" data-testid="student-email"></i></p>
+                        <p>{{$t "global.label.password"}} <i class="student-password" data-testid="student-initial-password">{{password}}</i></p>
                     </div>
                     <button type="button" class="btn btn-secondary btn-print" data-toggle="tooltip" title="" data-original-title="Anmeldedaten drucken">
                         <i class="fa fa-print"></i> {{$t "global.button.print"}}
@@ -104,7 +104,7 @@
             </div>
         {{/if}}
 
-        <a class="btn btn-primary" href="/logout">{{$t "registration._registration.global.button.openLogin"}}</a>
+        <a class="btn btn-primary" href="/logout" data-testid="open-login-button">{{$t "registration._registration.global.button.openLogin"}}</a>
       </section>
       {{/content}}
     {{/embed}}