Skip to content

Commit 2021d48

Browse files
committed
fixup! ✨(feature) accessibility on Icon component
1 parent fc491e6 commit 2021d48

File tree

4 files changed

+41
-22
lines changed

4 files changed

+41
-22
lines changed

src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ test.describe('Doc Header', () => {
143143
const invitationRole = invitationCard.getByLabel('doc-role-dropdown');
144144
await expect(invitationRole).toBeVisible();
145145

146-
await invitationRole.click();
146+
await invitationCard
147+
.getByRole('button', { name: 'Open the invitation options' })
148+
.click();
147149

148150
await page.getByRole('menuitem', { name: 'Remove access' }).click();
149151
await expect(invitationCard).toBeHidden();
@@ -158,8 +160,13 @@ test.describe('Doc Header', () => {
158160

159161
await roles.click();
160162
await expect(
161-
page.getByRole('menuitem', { name: 'Remove access' }),
162-
).toBeEnabled();
163+
memberCard.getByRole('button', { name: 'Open the member options' }),
164+
).toBeVisible();
165+
await memberCard
166+
.getByRole('button', { name: 'Open the member options' })
167+
.click();
168+
169+
await expect(page.getByLabel('Delete')).toBeEnabled();
163170
});
164171

165172
test('it checks the options available if editor', async ({ page }) => {
@@ -213,14 +220,16 @@ test.describe('Doc Header', () => {
213220
).toBeVisible();
214221
await expect(invitationCard.getByLabel('doc-role-text')).toBeVisible();
215222
await expect(
216-
invitationCard.getByRole('button', { name: 'more_horiz' }),
223+
invitationCard.getByRole('button', {
224+
name: 'Open the invitation options',
225+
}),
217226
).toBeHidden();
218227

219228
const memberCard = shareModal.getByLabel('List members card');
220229
await expect(memberCard.getByText('[email protected]')).toBeVisible();
221230
await expect(memberCard.getByLabel('doc-role-text')).toBeVisible();
222231
await expect(
223-
memberCard.getByRole('button', { name: 'more_horiz' }),
232+
memberCard.getByRole('button', { name: 'Open the member options' }),
224233
).toBeHidden();
225234
});
226235

@@ -275,14 +284,16 @@ test.describe('Doc Header', () => {
275284
).toBeVisible();
276285
await expect(invitationCard.getByLabel('doc-role-text')).toBeVisible();
277286
await expect(
278-
invitationCard.getByRole('button', { name: 'more_horiz' }),
287+
invitationCard.getByRole('button', {
288+
name: 'Open the invitation options',
289+
}),
279290
).toBeHidden();
280291

281292
const memberCard = shareModal.getByLabel('List members card');
282293
await expect(memberCard.getByText('[email protected]')).toBeVisible();
283294
await expect(memberCard.getByLabel('doc-role-text')).toBeVisible();
284295
await expect(
285-
memberCard.getByRole('button', { name: 'more_horiz' }),
296+
memberCard.getByRole('button', { name: 'Open the member options' }),
286297
).toBeHidden();
287298
});
288299

src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ test.describe('Document list members', () => {
184184

185185
const emailMyself = `user@${browserName}.test`;
186186
const mySelf = list.getByTestId(`doc-share-member-row-${emailMyself}`);
187-
const mySelfRole = mySelf.getByRole('button', {
188-
name: 'doc-role-dropdown',
189-
});
190187

191188
const userOwnerEmail = await addNewMember(page, 0, 'Owner');
192189
const userOwner = list.getByTestId(
@@ -201,20 +198,31 @@ test.describe('Document list members', () => {
201198
const userReader = list.getByTestId(
202199
`doc-share-member-row-${userReaderEmail}`,
203200
);
204-
const userReaderRole = userReader.getByRole('button', {
205-
name: 'doc-role-dropdown',
206-
});
207201

208202
await expect(mySelf).toBeVisible();
209203
await expect(userOwner).toBeVisible();
210204
await expect(userReader).toBeVisible();
211205

212-
await userReaderRole.click();
213-
await page.getByRole('menuitem', { name: 'Remove access' }).click();
206+
await expect(
207+
userOwner.getByRole('button', {
208+
name: 'Open the member options',
209+
}),
210+
).toBeVisible();
211+
212+
await userReader
213+
.getByRole('button', {
214+
name: 'Open the member options',
215+
})
216+
.click();
217+
await page.getByLabel('Delete').click();
214218
await expect(userReader).toBeHidden();
215219

216-
await mySelfRole.click();
217-
await page.getByRole('menuitem', { name: 'Remove access' }).click();
220+
await mySelf
221+
.getByRole('button', {
222+
name: 'Open the member options',
223+
})
224+
.click();
225+
await page.getByLabel('Delete').click();
218226
await expect(
219227
page.getByText('Insufficient access rights to view the document.'),
220228
).toBeVisible();

src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ export const DocToolBox = ({ doc }: DocToolBoxProps) => {
255255
aria-label={t('Export the document')}
256256
/>
257257
)}
258-
<DropdownMenu options={options}>
258+
<DropdownMenu options={options} label={t('Open the document options')}>
259259
<IconOptions
260260
isHorizontal
261261
$theme="primary"

src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridActions.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '@openfun/cunningham-react';
66
import { useTranslation } from 'react-i18next';
77

8-
import { DropdownMenu, DropdownMenuOption, Icon } from '@/components';
8+
import { DropdownMenu, DropdownMenuOption, IconOptions } from '@/components';
99
import {
1010
Doc,
1111
KEY_LIST_DOC,
@@ -93,10 +93,10 @@ export const DocsGridActions = ({
9393

9494
return (
9595
<>
96-
<DropdownMenu options={options}>
97-
<Icon
96+
<DropdownMenu options={options} label={t('Open the document options')}>
97+
<IconOptions
98+
isHorizontal
9899
data-testid={`docs-grid-actions-button-${doc.id}`}
99-
iconName="more_horiz"
100100
$theme="primary"
101101
$variation="600"
102102
/>

0 commit comments

Comments
 (0)