Skip to content

Commit

Permalink
fix types
Browse files Browse the repository at this point in the history
  • Loading branch information
@liamdebeasi
liamdebeasi committed Apr 30, 2024
1 parent 49681e5 commit 25b1743
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
9 changes: 5 additions & 4 deletions core/src/utils/focus-controller/test/generic/focus-controller.e2e.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { expect } from '@playwright/test';
import { configs, test } from '@utils/test/playwright';
import type { E2ELocator } from '@utils/test/playwright';

configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
test.describe(title('focus controller: generic components'), () => {
Expand All @@ -8,7 +9,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
});
test('should focus heading', async ({ page }) => {
const goToPageOneButton = page.locator('page-root button.page-one');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');

// Focus heading on Page One
Expand All @@ -21,7 +22,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {

test('should focus banner', async ({ page }) => {
const goToPageThreeButton = page.locator('page-root button.page-three');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');

const pageThreeHeader = page.locator('page-three header');
Expand All @@ -33,7 +34,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {

test('should focus content', async ({ page }) => {
const goToPageTwoButton = page.locator('page-root button.page-two');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');
const pageTwoContent = page.locator('page-two main');

Expand All @@ -47,7 +48,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
test.skip(browserName === 'webkit', 'Desktop Safari does not consider buttons to be focusable');

const goToPageOneButton = page.locator('page-root button.page-one');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');
const pageOneBackButton = page.locator('page-one ion-back-button');

Expand Down
9 changes: 5 additions & 4 deletions core/src/utils/focus-controller/test/ionic/focus-controller.e2e.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { expect } from '@playwright/test';
import { configs, test } from '@utils/test/playwright';
import type { E2ELocator } from '@utils/test/playwright';

configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
test.describe(title('focus controller: ionic components'), () => {
Expand All @@ -8,7 +9,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
});
test('should focus heading', async ({ page }) => {
const goToPageOneButton = page.locator('page-root ion-button.page-one');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');

// Focus heading on Page One
Expand All @@ -21,7 +22,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {

test('should focus banner', async ({ page }) => {
const goToPageThreeButton = page.locator('page-root ion-button.page-three');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');

const pageThreeHeader = page.locator('page-three ion-header');
Expand All @@ -33,7 +34,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {

test('should focus content', async ({ page }) => {
const goToPageTwoButton = page.locator('page-root ion-button.page-two');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');
const pageTwoContent = page.locator('page-two ion-content');

Expand All @@ -47,7 +48,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
test.skip(browserName === 'webkit', 'Desktop Safari does not consider buttons to be focusable');

const goToPageOneButton = page.locator('page-root ion-button.page-one');
const nav = page.locator('ion-nav');
const nav = page.locator('ion-nav') as E2ELocator;
const ionNavDidChange = await (nav as any).spyOnEvent('ionNavDidChange');
const pageOneBackButton = page.locator('page-one ion-back-button');

Expand Down

0 comments on commit 25b1743

Please sign in to comment.