Merge branch 'main' into N21-2151-partial-course-sync

hpi-schul-cloud · Nov 6, 2024 · 154d0cc · 154d0cc
2 parents 41413bb + ae89485
commit 154d0cc
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 21 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/components/files-storage/files-card.hbs b/views/lib/components/files-storage/files-card.hbs
@@ -11,7 +11,7 @@
 			tabindex="0"
 			aria-label="{{$t "files.label.clickToOpenFile" (dict "name" this.name)}}"
 			role="button">
-			<div class="card-title" data-testid="file-title-card">
+			<div class="card-title" data-testid="file-title-card-{{fileIndex}}">
 				<div class="file-preview-wrapper col-sm-1 no-padding hidden-xs-down">
 				<div class="file-preview" style="background-image: url({{getThumbnailIcon this.name}}); -webkit-background-size: 25px ;background-size: 25px;"></div>
 				</div>
@@ -37,7 +37,7 @@
 						data-file-name="{{../this.name}}"
 						class="file-btn"
 						data-method="download"
-                        data-testid="file-download-btn"
+                        data-testid="file-download-btn-{{../fileIndex}}"
 						title="{{$t "files.label.downloadFile"}}">
 						<i aria-hidden="true" class="fa fa-cloud-download"></i>
 					</button>
@@ -48,13 +48,15 @@
 							data-file-id="{{../this.id}}"
 							data-file-name="{{../this.name}}"
 							title="{{$t "files.label.renameFile"}}"
-							class="file-btn fa fa-edit file-name-edit">
+							class="file-btn fa fa-edit file-name-edit"
+                            data-testid="file-rename-btn-{{../fileIndex}}">
 						</button>
 					{{/userHasPermission}}
 					{{#userHasPermission "FILESTORAGE_REMOVE"}}
 						<button
 							class="file-btn"
 							data-method="delete"
+                            data-testid="file-delete-btn-{{../fileIndex}}"
 							title="{{$t "files.label.deleteFile"}}"
 							data-file-id="{{../this.id}}"
 							data-file-name="{{../this.name}}">

diff --git a/views/lib/components/files-storage/files-grid.hbs b/views/lib/components/files-storage/files-grid.hbs
@@ -2,7 +2,7 @@
 	<div class="row">
 		{{#each files}}
 			<div class="col-sm-12">
-				{{> "lib/components/files-storage/files-card" readonly=../readonly}}
+				{{> "lib/components/files-storage/files-card" readonly=../readonly fileIndex=@index}}
 			</div>
 		{{/each}}
 	</div>

diff --git a/views/lib/components/files-storage/forms/form-name-edit.hbs b/views/lib/components/files-storage/forms/form-name-edit.hbs
@@ -1,9 +1,10 @@
-<div class="form-group">
-    <label for="newNameInput">{{$t "files.label.chooseANewName"}}</label>
-    <input id="newNameInput" class="form-control" type="text" />
-    <input
-        id="fileRecordId"
-        class="form-control"
-        type="hidden"
-    />
+<div class='form-group'>
+  <label for='newNameInput'>{{$t 'files.label.chooseANewName'}}</label>
+  <input
+    id='newNameInput'
+    data-testid='rename-file-input'
+    class='form-control'
+    type='text'
+  />
+  <input id='fileRecordId' class='form-control' type='hidden' />
 </div>
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}}

diff --git a/views/teams/team.hbs b/views/teams/team.hbs
@@ -305,13 +305,13 @@
 {{#embed "lib/components/modal-form" class="create-event-modal" action=../createEventAction collapseId=1
 userId=../userId teamId=../teamId}}
     {{#content "fields"}}
-    {{> "calendar/forms/form-create-event" showVideoconferenceOption=@root.showVideoconferenceOption}}
+    {{> "calendar/forms/form-create-event" showVideoconferenceOption=@root.showVideoconferenceOption testIdPrefix="create"}}
     {{/content}}
 {{/embed}}
 
 {{#embed "lib/components/modal-form" method="put" action="/calendar/events/" class="edit-event-modal"}}
     {{#content "fields"}}
-    {{> "calendar/forms/form-create-event" collapseIdCourse="4" collapseIdTeam="5"}}
+    {{> "calendar/forms/form-create-event" collapseIdCourse="4" collapseIdTeam="5" testIdPrefix="edit"}}
     {{/content}}
     {{#content "additional-actions"}}
     <button type="button" class="btn btn-primary btn-danger btn-delete pull-left" data-testid="delete_team_event">