From e8306c20f0fde92410d0b6fb33902f2501b8e63e Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Tue, 3 Sep 2024 22:27:40 +0200
Subject: [PATCH] Harden tests

---
 backend/i18n/frontend_en.json                 |  3 +++
 backend/i18n/frontend_fr.json                 |  3 +++
 backend/i18n/frontend_it.json                 |  3 +++
 backend/i18n/frontend_nl.json                 |  3 +++
 backend/i18n/frontend_pt.json                 |  3 +++
 backend/i18n/frontend_zh.json                 |  3 +++
 backend/i18n/source/frontend_en.json          |  3 +++
 .../framework/angular/pager.component.html    | 20 ++++++++++++++++---
 tools/e2e/tests/given-app/rules.spec.ts       |  3 +++
 tools/e2e/tests/given-app/schemas.spec.ts     |  2 +-
 tools/e2e/tests/given-schema/contents.spec.ts |  1 +
 11 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json
index 7e6200155b..4caac78856 100644
--- a/backend/i18n/frontend_en.json
+++ b/backend/i18n/frontend_en.json
@@ -310,6 +310,7 @@
   "common.more": "More",
   "common.name": "Name",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "No",
   "common.nothingChanged": "Nothing has been changed.",
   "common.notSupported": "Not Supported",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst}-{itemLast} of {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} of total?",
   "common.pagerReload": "Click to reload view and get total number of items",
+  "common.pageSize": "Page Size",
   "common.password": "Password",
   "common.passwordConfirm": "Confirm Password",
   "common.pattern": "Pattern",
@@ -328,6 +330,7 @@
   "common.permissions": "Permissions",
   "common.prev": "Back",
   "common.preview": "Preview",
+  "common.prevPage": "Previous Page",
   "common.product": "Squidex Headless CMS",
   "common.project": "Project",
   "common.queryOperators.contains": "contains",
diff --git a/backend/i18n/frontend_fr.json b/backend/i18n/frontend_fr.json
index 4e4c93550a..b477ad81cc 100644
--- a/backend/i18n/frontend_fr.json
+++ b/backend/i18n/frontend_fr.json
@@ -310,6 +310,7 @@
   "common.more": "Plus",
   "common.name": "Nom",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "Non",
   "common.nothingChanged": "Rien n'a été changé.",
   "common.notSupported": "Non supporté",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst}-{itemLast} de {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} Du total?",
   "common.pagerReload": "Cliquez pour recharger la vue et obtenir le nombre total d'articles",
+  "common.pageSize": "Page Size",
   "common.password": "Mot de passe",
   "common.passwordConfirm": "Confirmez le mot de passe",
   "common.pattern": "Modèle",
@@ -328,6 +330,7 @@
   "common.permissions": "Autorisations",
   "common.prev": "Back",
   "common.preview": "Aperçu",
+  "common.prevPage": "Previous Page",
   "common.product": "CMS sans tête Squidex",
   "common.project": "Projet",
   "common.queryOperators.contains": "contient",
diff --git a/backend/i18n/frontend_it.json b/backend/i18n/frontend_it.json
index 2e4cac966c..a63f233826 100644
--- a/backend/i18n/frontend_it.json
+++ b/backend/i18n/frontend_it.json
@@ -310,6 +310,7 @@
   "common.more": "More",
   "common.name": "Nome",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "No",
   "common.nothingChanged": "Non è stato cambiato niente.",
   "common.notSupported": "Not Supported",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst}-{itemLast} of {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} of total?",
   "common.pagerReload": "Click to reload view and get total number of items",
+  "common.pageSize": "Page Size",
   "common.password": "Password",
   "common.passwordConfirm": "Conferma Password",
   "common.pattern": "Pattern",
@@ -328,6 +330,7 @@
   "common.permissions": "Permessi",
   "common.prev": "Back",
   "common.preview": "Anteprima",
+  "common.prevPage": "Previous Page",
   "common.product": "Squidex Headless CMS",
   "common.project": "Progetto",
   "common.queryOperators.contains": "contiene",
diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json
index 754e061b94..f32f93344a 100644
--- a/backend/i18n/frontend_nl.json
+++ b/backend/i18n/frontend_nl.json
@@ -310,6 +310,7 @@
   "common.more": "Meer",
   "common.name": "Naam",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "Nee",
   "common.nothingChanged": "Er is niets veranderd.",
   "common.notSupported": "Not Supported",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst} - {itemLast} van {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} of total?",
   "common.pagerReload": "Click to reload view and get total number of items",
+  "common.pageSize": "Page Size",
   "common.password": "Wachtwoord",
   "common.passwordConfirm": "Bevestig wachtwoord",
   "common.pattern": "Patroon",
@@ -328,6 +330,7 @@
   "common.permissions": "Rechten",
   "common.prev": "Back",
   "common.preview": "Preview",
+  "common.prevPage": "Previous Page",
   "common.product": "Squidex Headless CMS",
   "common.project": "Project",
   "common.queryOperators.contains": "bevat",
diff --git a/backend/i18n/frontend_pt.json b/backend/i18n/frontend_pt.json
index e0d8fc30fb..1c0c73a187 100644
--- a/backend/i18n/frontend_pt.json
+++ b/backend/i18n/frontend_pt.json
@@ -310,6 +310,7 @@
   "common.more": "Mais",
   "common.name": "Nome",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "Não",
   "common.nothingChanged": "Nada foi mudado.",
   "common.notSupported": "Não suportado",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst}-{itemLast} de {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} do total?",
   "common.pagerReload": "Clique para recarregar a vista e obter o número total de itens",
+  "common.pageSize": "Page Size",
   "common.password": "Password",
   "common.passwordConfirm": "Confirmar Password",
   "common.pattern": "Padrão",
@@ -328,6 +330,7 @@
   "common.permissions": "Permissões",
   "common.prev": "Back",
   "common.preview": "Previsualizar",
+  "common.prevPage": "Previous Page",
   "common.product": "CMS Headless Squidex",
   "common.project": "Projeto",
   "common.queryOperators.contains": "contém",
diff --git a/backend/i18n/frontend_zh.json b/backend/i18n/frontend_zh.json
index 43418d1186..a168e96305 100644
--- a/backend/i18n/frontend_zh.json
+++ b/backend/i18n/frontend_zh.json
@@ -310,6 +310,7 @@
   "common.more": "More",
   "common.name": "名称",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "不",
   "common.nothingChanged": "什么都没有改变。",
   "common.notSupported": "Not Supported",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst}-{itemLast} 的 {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} of total?",
   "common.pagerReload": "Click to reload view and get total number of items",
+  "common.pageSize": "Page Size",
   "common.password": "密码",
   "common.passwordConfirm": "确认密码",
   "common.pattern": "模式",
@@ -328,6 +330,7 @@
   "common.permissions": "权限",
   "common.prev": "Back",
   "common.preview": "预览",
+  "common.prevPage": "Previous Page",
   "common.product": "Squidex Headless CMS",
   "common.project": "项目",
   "common.queryOperators.contains": "包含",
diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json
index 7e6200155b..4caac78856 100644
--- a/backend/i18n/source/frontend_en.json
+++ b/backend/i18n/source/frontend_en.json
@@ -310,6 +310,7 @@
   "common.more": "More",
   "common.name": "Name",
   "common.next": "Continue",
+  "common.nextPage": "Next Page",
   "common.no": "No",
   "common.nothingChanged": "Nothing has been changed.",
   "common.notSupported": "Not Supported",
@@ -320,6 +321,7 @@
   "common.pagerInfo": "{itemFirst}-{itemLast} of {numberOfItems}",
   "common.pagerInfoNoTotal": "{itemFirst}-{itemLast} of total?",
   "common.pagerReload": "Click to reload view and get total number of items",
+  "common.pageSize": "Page Size",
   "common.password": "Password",
   "common.passwordConfirm": "Confirm Password",
   "common.pattern": "Pattern",
@@ -328,6 +330,7 @@
   "common.permissions": "Permissions",
   "common.prev": "Back",
   "common.preview": "Preview",
+  "common.prevPage": "Previous Page",
   "common.product": "Squidex Headless CMS",
   "common.project": "Project",
   "common.queryOperators.contains": "contains",
diff --git a/frontend/src/app/framework/angular/pager.component.html b/frontend/src/app/framework/angular/pager.component.html
index 1d228b355c..130bcd10d2 100644
--- a/frontend/src/app/framework/angular/pager.component.html
+++ b/frontend/src/app/framework/angular/pager.component.html
@@ -2,7 +2,11 @@
     <div class="d-flex align-items-center justify-content-end">
         @if (paging) {
             <div class="float-end pagination">
-                <select class="form-select form-select-sm" [ngModel]="paging.pageSize" (ngModelChange)="setPageSize($event)">
+                <select
+                    class="form-select form-select-sm"
+                    attr.aria-label="{{ 'common.pageSize' | sqxTranslate }}"
+                    [ngModel]="paging.pageSize"
+                    (ngModelChange)="setPageSize($event)">
                     @for (pageSize of pageSizes; track pageSize) {
                         <option [ngValue]="pageSize">{{ pageSize }}</option>
                     }
@@ -20,10 +24,20 @@
                             {{ "common.pagerInfoNoTotal" | sqxTranslate: translationInfo }}
                         </button>
                     }
-                    <button class="btn btn-sm btn-text-secondary ms-2" (click)="goPrev()" [disabled]="!canGoPrev" type="button">
+                    <button
+                        class="btn btn-sm btn-text-secondary ms-2"
+                        attr.aria-label="{{ 'common.prevPage' | sqxTranslate }}"
+                        (click)="goPrev()"
+                        [disabled]="!canGoPrev"
+                        type="button">
                         <i class="icon-angle-left"></i>
                     </button>
-                    <button class="btn btn-sm btn-text-secondary ms-2" (click)="goNext()" [disabled]="!canGoNext" type="button">
+                    <button
+                        class="btn btn-sm btn-text-secondary ms-2"
+                        attr.aria-label="{{ 'common.nextPage' | sqxTranslate }}"
+                        (click)="goNext()"
+                        [disabled]="!canGoNext"
+                        type="button">
                         <i class="icon-angle-right"></i>
                     </button>
                 </span>
diff --git a/tools/e2e/tests/given-app/rules.spec.ts b/tools/e2e/tests/given-app/rules.spec.ts
index cd8ddee396..14598dd4dc 100644
--- a/tools/e2e/tests/given-app/rules.spec.ts
+++ b/tools/e2e/tests/given-app/rules.spec.ts
@@ -2,6 +2,9 @@ import { expect, Page } from '@playwright/test';
 import { escapeRegex, getRandomId } from '../utils';
 import { test } from './_fixture';
 
+// We have no easy way to identity rules. Therefore run them sequentially.
+test.describe.configure({ mode: 'serial' });
+
 test.beforeEach(async ({ page, appName }) => {
     await page.goto(`/app/${appName}/rules`);
 });
diff --git a/tools/e2e/tests/given-app/schemas.spec.ts b/tools/e2e/tests/given-app/schemas.spec.ts
index 8c3892e990..038e8c9b11 100644
--- a/tools/e2e/tests/given-app/schemas.spec.ts
+++ b/tools/e2e/tests/given-app/schemas.spec.ts
@@ -68,7 +68,7 @@ async function createRandomField(page: Page) {
     await page.getByPlaceholder('Enter field name').fill(fieldName);
 
     // Save field.
-    await page.getByRole('button', { name: 'Create and close' }).click();
+    await page.getByTestId('dialog').getByRole('button', { name: 'Create' }).click();
 
     return fieldName;
 }
diff --git a/tools/e2e/tests/given-schema/contents.spec.ts b/tools/e2e/tests/given-schema/contents.spec.ts
index f2c606034f..900efb1dac 100644
--- a/tools/e2e/tests/given-schema/contents.spec.ts
+++ b/tools/e2e/tests/given-schema/contents.spec.ts
@@ -11,6 +11,7 @@ import { expect, test } from './_fixture';
 
 test.beforeEach(async ({ page, appName, schemaName }) => {
     await page.goto(`/app/${appName}/content/${schemaName}`);
+    await page.getByRole('combobox').selectOption('3: 50');
 });
 
 test('create content and close', async ({ page }) => {