Korjattu spinnereiden piilotuksen odottaminen saavutettavuustesteissä

Opetushallitus · Apr 22, 2024 · 777e2f1 · 777e2f1
1 parent 4211044
commit 777e2f1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/tests/e2e/haut.spec.ts b/tests/e2e/haut.spec.ts
@@ -1,5 +1,8 @@
 import { test, expect, Page } from '@playwright/test';
-import { expectPageAccessibilityOk } from './playwright-utils';
+import {
+  expectAllSpinnersHidden,
+  expectPageAccessibilityOk,
+} from './playwright-utils';
 
 async function selectHakutapa(page: Page, idx: number, expectedOption: string) {
   await page.getByTestId('haku-hakutapa-select').click();
@@ -26,7 +29,7 @@ test('Haku-page accessibility', async ({ page }) => {
   await page.goto(
     '/valintojen-toteuttaminen/haku/1.2.246.562.29.00000000000000046872',
   );
-  await expect(page.getByRole('progressbar')).toBeHidden();
+  await expectAllSpinnersHidden(page);
   await expectPageAccessibilityOk(page);
 });
 

diff --git a/tests/e2e/index.spec.ts b/tests/e2e/index.spec.ts
@@ -1,9 +1,12 @@
 import { test, expect } from '@playwright/test';
-import { expectPageAccessibilityOk } from './playwright-utils';
+import {
+  expectAllSpinnersHidden,
+  expectPageAccessibilityOk,
+} from './playwright-utils';
 
 test('index accessibility', async ({ page }) => {
   await page.goto('/');
-  await expect(page.getByRole('progressbar')).toBeHidden();
+  await expectAllSpinnersHidden(page);
   await page.locator('tr').nth(1).hover();
   await expectPageAccessibilityOk(page);
 });
@@ -15,7 +18,7 @@ test('has title', async ({ page }) => {
 
 test('not found page accessibility', async ({ page }) => {
   await page.goto('/valintojen-toteuttaminen/mimic-treasure-chest');
-  await expect(page.getByRole('progressbar')).toBeHidden();
+  await expectAllSpinnersHidden(page);
   await expectPageAccessibilityOk(page);
 });
 

diff --git a/tests/e2e/playwright-utils.ts b/tests/e2e/playwright-utils.ts
@@ -5,3 +5,8 @@ export const expectPageAccessibilityOk = async (page: Page) => {
   const accessibilityScanResults = await new AxeBuilder({ page }).analyze();
   await expect(accessibilityScanResults.violations).toEqual([]);
 };
+
+export const expectAllSpinnersHidden = async (page: Page) => {
+  const spinners = page.getByRole('progressbar');
+  await expect(spinners).toHaveCount(0);
+};