Skip to content

Commit b5ad03e

Browse files
authored
Merge pull request #118 from c4dt/fix_warnings
Fixing some warnings
2 parents 4a0b3a6 + f77be25 commit b5ad03e

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

web/frontend/tests/formIndex.spec.ts

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expect, test } from '@playwright/test';
1+
import { Locator, Page, expect, test } from '@playwright/test';
22
import { default as i18n } from 'i18next';
33
import { assertHasFooter, assertHasNavBar, initI18n, logIn, setUp, translate } from './shared';
44
import { SCIPER_ADMIN, SCIPER_USER, mockPersonalInfo } from './mocks/api';
@@ -9,7 +9,7 @@ import Admin from './json/api/personal_info/123456.json';
99

1010
initI18n();
1111

12-
async function goForward(page: page) {
12+
async function goForward(page: Page) {
1313
await page.getByRole('button', { name: i18n.t('next') }).click();
1414
}
1515

@@ -85,7 +85,7 @@ test('Assert no forms are displayed for empty list', async ({ page }) => {
8585
.toHaveLength(1);
8686
});
8787

88-
async function assertQuickAction(row: locator, form: object, sciper?: string) {
88+
async function assertQuickAction(row: Locator, form: any, sciper?: string) {
8989
const user = sciper === SCIPER_USER ? User : (sciper === SCIPER_ADMIN ? Admin : undefined); // eslint-disable-line
9090
const quickAction = row.getByTestId('quickAction');
9191
switch (form.Status) {
@@ -94,6 +94,7 @@ async function assertQuickAction(row: locator, form: object, sciper?: string) {
9494
if (
9595
user !== undefined &&
9696
form.FormID in user.authorization &&
97+
// @ts-ignore
9798
user.authorization[form.FormID].includes('vote')
9899
) {
99100
await expect(quickAction).toHaveText(i18n.t('vote'));
@@ -134,9 +135,9 @@ test('Assert forms are displayed correctly for unauthenticated user', async ({ p
134135
await assertQuickAction(row, form);
135136
}
136137
await goForward(page);
137-
let row = await table.getByRole('row', { name: translate(Forms.Forms.at(-1).Title) });
138+
let row = await table.getByRole('row', { name: translate(Forms.Forms.at(-1)!.Title) });
138139
await expect(row).toBeVisible();
139-
await assertQuickAction(row, Forms.Forms.at(-1));
140+
await assertQuickAction(row, Forms.Forms.at(-1)!);
140141
});
141142

142143
test('Assert quick actions are displayed correctly for authenticated users', async ({ page }) => {
@@ -151,8 +152,8 @@ test('Assert quick actions are displayed correctly for authenticated users', asy
151152
}
152153
await goForward(page);
153154
await assertQuickAction(
154-
await table.getByRole('row', { name: translate(Forms.Forms.at(-1).Title) }),
155-
Forms.Forms.at(-1)
155+
await table.getByRole('row', { name: translate(Forms.Forms.at(-1)!.Title) }),
156+
Forms.Forms.at(-1)!
156157
);
157158
}
158159
});

web/frontend/tests/forms.spec.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expect, test } from '@playwright/test';
1+
import { Locator, Page, expect, test } from '@playwright/test';
22
import { default as i18n } from 'i18next';
33
import { assertHasFooter, assertHasNavBar, initI18n, logIn, setUp } from './shared';
44
import {
@@ -36,7 +36,7 @@ const prettyFormStates = [
3636
// main elements
3737

3838
async function setUpMocks(
39-
page: page,
39+
page: Page,
4040
formStatus: number,
4141
dkgActorsStatus: number,
4242
initialized?: boolean
@@ -69,7 +69,7 @@ test('Assert footer is present', async ({ page }) => {
6969
await assertHasFooter(page);
7070
});
7171

72-
async function assertIsOnlyVisibleToOwner(page: page, locator: locator) {
72+
async function assertIsOnlyVisibleToOwner(page: Page, locator: Locator) {
7373
await test.step('Assert is hidden to unauthenticated user', async () => {
7474
await expect(locator).toBeHidden();
7575
});
@@ -88,9 +88,9 @@ async function assertIsOnlyVisibleToOwner(page: page, locator: locator) {
8888
}
8989

9090
async function assertIsOnlyVisibleInStates(
91-
page: page,
92-
locator: locator,
93-
states: Array,
91+
page: Page,
92+
locator: Locator,
93+
states: Array<number>,
9494
assert: Function,
9595
dkgActorsStatus?: number,
9696
initialized?: boolean
@@ -112,7 +112,7 @@ async function assertIsOnlyVisibleInStates(
112112
}
113113

114114
async function assertRouteIsCalled(
115-
page: page,
115+
page: Page,
116116
url: string,
117117
key: string,
118118
action: string,
@@ -387,7 +387,7 @@ test('Assert "Vote" button is visible to admin/non-admin voter user', async ({ p
387387
page.getByRole('button', { name: i18n.t('vote'), exact: true }), // by default name is not matched exactly which returns both the "Vote" and the "Add voters" button
388388
[1],
389389
// eslint-disable-next-line @typescript-eslint/no-shadow
390-
async function (page: page, locator: locator) {
390+
async function (page: Page, locator: Locator) {
391391
await test.step('Assert is hidden to unauthenticated user', async () => {
392392
await expect(locator).toBeHidden();
393393
});

web/frontend/tests/navbar.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ test('Assert "Logout" calls logout API', async ({ page, baseURL }) => {
6161
['menuitem', 'logout'],
6262
['button', 'continue'],
6363
]) {
64+
// @ts-ignore
6465
await page.getByRole(role, { name: i18n.t(key) }).click();
6566
}
6667
});

web/frontend/tests/shared.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { default as i18n } from 'i18next';
2-
import { expect } from '@playwright/test';
2+
import { Locator, Page, expect } from '@playwright/test';
33
import en from './../src/language/en.json';
44
import fr from './../src/language/fr.json';
55
import de from './../src/language/de.json';
@@ -21,7 +21,7 @@ export function initI18n() {
2121
});
2222
}
2323

24-
export async function setUp(page: page, url: string) {
24+
export async function setUp(page: Page, url: string) {
2525
await mockProxy(page);
2626
await mockGetDevLogin(page);
2727
await mockLogout(page);
@@ -30,34 +30,34 @@ export async function setUp(page: page, url: string) {
3030
await expect(page).toHaveURL(url);
3131
}
3232

33-
export async function logIn(page: page, sciper: string) {
33+
export async function logIn(page: Page, sciper: string) {
3434
await mockPersonalInfo(page, sciper);
3535
await page.reload({ waitUntil: 'networkidle' });
3636
}
3737

38-
export async function assertOnlyVisibleToAuthenticated(page: page, locator: locator) {
38+
export async function assertOnlyVisibleToAuthenticated(page: Page, locator: Locator) {
3939
await expect(locator).toBeHidden(); // assert is hidden to unauthenticated user
4040
await logIn(page, SCIPER_USER);
4141
await expect(locator).toBeVisible(); // assert is visible to authenticated user
4242
}
4343

44-
export async function assertOnlyVisibleToAdmin(page: page, locator: locator) {
44+
export async function assertOnlyVisibleToAdmin(page: Page, locator: Locator) {
4545
await expect(locator).toBeHidden(); // assert is hidden to unauthenticated user
4646
await logIn(page, SCIPER_USER);
4747
await expect(locator).toBeHidden(); // assert is hidden to authenticated non-admin user
4848
await logIn(page, SCIPER_ADMIN);
4949
await expect(locator).toBeVisible(); // assert is visible to admin user
5050
}
5151

52-
export async function assertHasNavBar(page: page) {
52+
export async function assertHasNavBar(page: Page) {
5353
await expect(page.getByTestId('navBar')).toBeVisible();
5454
}
5555

56-
export async function assertHasFooter(page: page) {
56+
export async function assertHasFooter(page: Page) {
5757
await expect(page.getByTestId('footer')).toBeVisible();
5858
}
5959

60-
export function translate(internationalizable: object) {
60+
export function translate(internationalizable: any) {
6161
switch (i18n.language) {
6262
case 'en':
6363
return internationalizable.En;

0 commit comments

Comments
 (0)