Tests

Squidex · Sep 21, 2024 · 63863d3 · 63863d3
1 parent 45f647b
commit 63863d3
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 38 deletions.
diff --git a/tools/e2e/.eslintrc.js b/tools/e2e/.eslintrc.js
@@ -54,11 +54,12 @@ module.exports = {
                 ],
             }
         ],
+        "@typescript-eslint/no-floating-promises": "error",
+        "@typescript-eslint/no-shadow": "off",
         "@typescript-eslint/no-this-alias": "error",
         "@typescript-eslint/no-unnecessary-boolean-literal-compare": "error",
         "@typescript-eslint/no-unused-expressions": "off",
         "@typescript-eslint/no-use-before-define": "off",
-        "@typescript-eslint/no-shadow": "off",
         "@typescript-eslint/no-unused-vars": [
             "error",
             {

diff --git a/tools/e2e/tests/given-app/assets.spec.ts b/tools/e2e/tests/given-app/assets.spec.ts
@@ -17,32 +17,31 @@ test.beforeEach(async ({ appName, assetsPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: /Assets/ });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('upload asset', async ({ assetsPage }) => {
     const assetName = await uploadRandomAsset(assetsPage);
     const assetCard = await assetsPage.getAssetCard(assetName);
 
-    expect(assetCard.root).toBeVisible();
+    await expect(assetCard.root).toBeVisible();
 });
 
 test('delete asset', async ({ assetsPage }) => {
     const assetName = await uploadRandomAsset(assetsPage);
     const assetCard = await assetsPage.getAssetCard(assetName);
     await assetCard.delete();
 
-    expect(assetCard.root).not.toBeVisible();
+    await expect(assetCard.root).not.toBeVisible();
 });
 
 test('not delete asset if cancelled', async ({ assetsPage }) => {
     const assetName = await uploadRandomAsset(assetsPage);
     const assetCard = await assetsPage.getAssetCard(assetName);
     await assetCard.delete(/No/);
 
-    expect(assetCard.root).toBeVisible();
+    await expect(assetCard.root).toBeVisible();
 });
 
 test('edit asset name', async ({ assetsPage }) => {
@@ -56,7 +55,7 @@ test('edit asset name', async ({ assetsPage }) => {
 
     const newCard = await assetsPage.getAssetCard(newName);
 
-    expect(newCard.root).toBeVisible();
+    await expect(newCard.root).toBeVisible();
 });
 
 test('edit asset metadata', async ({ assetsPage }) => {
@@ -73,7 +72,7 @@ test('edit asset metadata', async ({ assetsPage }) => {
 
     const newCard = await assetsPage.getAssetCard(`${w}x${h}px`);
 
-    expect(newCard.root).toBeVisible();
+    await expect(newCard.root).toBeVisible();
 });
 
 test('add asset folder', async ({ assetsPage }) => {
@@ -85,7 +84,7 @@ test('add asset folder', async ({ assetsPage }) => {
 
     const folderCard = await assetsPage.getAssetFolderCard(folderName);
 
-    expect(folderCard.root).toBeVisible();
+    await expect(folderCard.root).toBeVisible();
 });
 
 test('open asset folder', async ({ assetsPage }) => {
@@ -100,7 +99,7 @@ test('open asset folder', async ({ assetsPage }) => {
 
     const moveUpCard = await assetsPage.getAssetFolderCard('<Parent>');
 
-    expect(moveUpCard.root).toBeVisible();
+    await expect(moveUpCard.root).toBeVisible();
 });
 
 test('rename asset folder', async ({ assetsPage }) => {
@@ -118,7 +117,7 @@ test('rename asset folder', async ({ assetsPage }) => {
     await renameDialog.rename();
     const renamedCard = await assetsPage.getAssetFolderCard(newName);
 
-    expect(renamedCard.root).toBeVisible();
+    await expect(renamedCard.root).toBeVisible();
 });
 
 test('delete asset folder', async ({ assetsPage }) => {
@@ -133,7 +132,7 @@ test('delete asset folder', async ({ assetsPage }) => {
     const dropdown = await folderCard.openOptionsDropdown();
     await dropdown.delete();
 
-    expect(folderCard.root).not.toBeVisible();
+    await expect(folderCard.root).not.toBeVisible();
 });
 
 test('add asset folder to parent', async ({ assetsPage }) => {
@@ -157,11 +156,11 @@ test('add asset folder to parent', async ({ assetsPage }) => {
     const moveUpCard = await assetsPage.getAssetFolderCard('<Parent>');
     await moveUpCard.open();
 
-    expect(childCard.root).not.toBeVisible();
+    await expect(childCard.root).not.toBeVisible();
 
     await parentcard.open();
 
-    expect(childCard.root).toBeVisible();
+    await expect(childCard.root).toBeVisible();
 });
 
 async function uploadRandomAsset(assetsPage: AssetsPage) {

diff --git a/tools/e2e/tests/given-app/rules.spec.ts b/tools/e2e/tests/given-app/rules.spec.ts
@@ -12,9 +12,8 @@ test.beforeEach(async ({ appName, rulesPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: /Rules/ });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('create rule', async ({ rulesPage, rulePage }) => {

diff --git a/tools/e2e/tests/given-app/schemas.spec.ts b/tools/e2e/tests/given-app/schemas.spec.ts
@@ -15,9 +15,8 @@ test.beforeEach(async ({ appName, schemasPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: /Schemas/ });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('create schema', async ({ schemasPage }) => {

diff --git a/tools/e2e/tests/given-login/clients.spec.ts b/tools/e2e/tests/given-login/clients.spec.ts
@@ -20,9 +20,8 @@ test.beforeEach(async ({ context, appsPage, clientsPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: /Clients/ });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('add client', async ({ clientsPage }) => {
@@ -39,7 +38,7 @@ test('copy client ID', async ({ page, clientsPage }) => {
     const handle = await page.evaluateHandle(() => navigator.clipboard.readText());
     const clipboardContent = await handle.jsonValue();
 
-    expect(clipboardContent).toContain(':default');
+    await expect(clipboardContent).toContain(':default');
 });
 
 test('copy client Secret', async ({ page, clientsPage }) => {
@@ -49,7 +48,7 @@ test('copy client Secret', async ({ page, clientsPage }) => {
     const handle = await page.evaluateHandle(() => navigator.clipboard.readText());
     const clipboardContent = await handle.jsonValue();
 
-    expect(clipboardContent.length).toBeGreaterThan(40);
+    await expect(clipboardContent.length).toBeGreaterThan(40);
 });
 
 test('rename rule with dbclick', async ({ clientsPage }) => {

diff --git a/tools/e2e/tests/given-login/languages.spec.ts b/tools/e2e/tests/given-login/languages.spec.ts
@@ -18,9 +18,8 @@ test.beforeEach(async ({ languagesPage, appsPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: /Languages/ });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('add random language', async ({ languagesPage }) => {
@@ -31,17 +30,17 @@ test('add random language', async ({ languagesPage }) => {
 
     const languagesCard = await languagesPage.getLanguageCard(randomName);
 
-    expect(languagesCard.root).toBeVisible();
+    await expect(languagesCard.root).toBeVisible();
 });
 
-test('add language with from dropdown', async ({ languagesPage }) => {
+test('add language with dropdown', async ({ languagesPage }) => {
     await languagesPage.enterLanguage('de-');
     await languagesPage.selectLanguage('de-DE (German (Germany))');
     await languagesPage.save();
 
     const languagesCard = await languagesPage.getLanguageCard('German (Germany)');
 
-    expect(languagesCard.root).toBeVisible();
+    await expect(languagesCard.root).toBeVisible();
 });
 
 test('delete language', async ({ languagesPage }) => {
@@ -52,10 +51,10 @@ test('delete language', async ({ languagesPage }) => {
 
     const languagesCard = await languagesPage.getLanguageCard(randomName);
 
-    expect(languagesCard.root).toBeVisible();
+    await expect(languagesCard.root).toBeVisible();
 
     await languagesCard.delete();
-    expect(languagesCard.root).not.toBeVisible();
+    await expect(languagesCard.root).not.toBeVisible();
 });
 
 test('add default language', async ({ languagesPage }) => {
@@ -66,7 +65,7 @@ test('add default language', async ({ languagesPage }) => {
     await languagesPage.save();
 
     const languagesCard1 = await languagesPage.getLanguageCard(randomName1);
-    expect(languagesCard1.root).toBeVisible();
+    await expect(languagesCard1.root).toBeVisible();
 
     await languagesPage.enterLanguage(randomName2);
     await languagesPage.save();
@@ -76,7 +75,7 @@ test('add default language', async ({ languagesPage }) => {
     await languagesCard2.addFallbackLanguage(randomName1);
     await languagesCard2.save();
 
-    expect(languagesCard2.root.getByText(randomName2)).toBeVisible();
+    await expect(languagesCard2.root.getByText(randomName2)).toBeVisible();
 });
 
 test('make master', async ({ languagesPage }) => {
@@ -90,5 +89,5 @@ test('make master', async ({ languagesPage }) => {
     await languagesCard.makeMaster();
     await languagesCard.save();
 
-    expect(languagesCard.root.getByLabel('Delete')).toBeDisabled();
+    await expect(languagesCard.root.getByLabel('Delete')).toBeDisabled();
 });
diff --git a/tools/e2e/tests/given-login/settings.spec.ts b/tools/e2e/tests/given-login/settings.spec.ts
@@ -17,9 +17,8 @@ test.beforeEach(async ({ appsPage, settingsPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: /UI Settings/ });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('add pattern', async ({ settingsPage })=> {
@@ -33,13 +32,13 @@ test('add pattern', async ({ settingsPage })=> {
 
     const patternRow = await settingsPage.getPatternRow(patternName);
 
-    expect(patternRow.root).toBeVisible();
+    await expect(patternRow.root).toBeVisible();
 });
 
 test('delete pattern', async ({ settingsPage })=> {
     const patternRow = await settingsPage.getPatternRow('Email');
     await patternRow.delete();
     await settingsPage.save();
 
-    expect(patternRow.root).not.toBeVisible();
+    await expect(patternRow.root).not.toBeVisible();
 });
diff --git a/tools/e2e/tests/given-schema/contents.spec.ts b/tools/e2e/tests/given-schema/contents.spec.ts
@@ -16,9 +16,8 @@ test.beforeEach(async ({ appName, schemaName, contentsPage }) => {
 
 test('has header', async ({ page }) => {
     const header = page.getByRole('heading', { name: 'Contents' });
-    await header.click();
 
-    expect(header).toBeVisible();
+    await expect(header).toBeVisible();
 });
 
 test('create content and close', async ({ contentsPage, contentPage }) => {