Skip to content

Commit 389e3e0

Browse files
committed
chore: adjust a11y for dm creation and update user role locator in tests
1 parent 1052c44 commit 389e3e0

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

apps/meteor/client/navbar/NavBarPagesGroup/actions/CreateDirectMessage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ const CreateDirectMessage = ({ onClose }: CreateDirectMessageProps) => {
9494
aria-describedby={`${membersFieldId}-hint ${membersFieldId}-error`}
9595
aria-required='true'
9696
aria-invalid={Boolean(errors.users)}
97+
aria-label={t('Direct_message_creation_description')}
9798
/>
9899
)}
99100
/>

apps/meteor/tests/e2e/administration.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ test.describe.parallel('administration', () => {
7777
await poAdminUsers.editUser.inputSetManually.click();
7878
await poAdminUsers.editUser.inputPassword.fill('P@ssw0rd1234.!');
7979
await poAdminUsers.editUser.inputConfirmPassword.fill('P@ssw0rd1234.!');
80-
await expect(poAdminUsers.editUser.userRole).toBeVisible();
80+
await expect(poAdminUsers.editUser.chipUserRole).toBeVisible();
8181
await poAdminUsers.editUser.btnAddUser.click();
8282
});
8383

@@ -97,7 +97,7 @@ test.describe.parallel('administration', () => {
9797
await poAdminUsers.editUser.inputSetManually.click();
9898
await poAdminUsers.editUser.inputPassword.fill('P@ssw0rd1234.!');
9999
await poAdminUsers.editUser.inputConfirmPassword.fill('P@ssw0rd1234.!');
100-
await expect(poAdminUsers.editUser.userRole).toBeVisible();
100+
await expect(poAdminUsers.editUser.chipUserRole).toBeVisible();
101101
await expect(poAdminUsers.editUser.joinDefaultChannels).toBeVisible();
102102
await poAdminUsers.editUser.btnAddUser.click();
103103

apps/meteor/tests/e2e/page-objects/fragments/edit-user-flextab.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ export class EditUserFlexTab extends FlexTab {
3939
return this.root.locator('//label[text()="Join default channels"]');
4040
}
4141

42-
get userRole(): Locator {
43-
return this.root.locator('button[role="option"]:has-text("user")');
42+
get chipUserRole(): Locator {
43+
return this.root.getByRole('button', { name: 'user', exact: true });
4444
}
4545

4646
get setupSmtpLink(): Locator {

apps/meteor/tests/e2e/page-objects/fragments/modals/create-new-modal.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,15 @@ export class CreateNewDMModal extends CreateNewModal {
6868
super(page.getByRole('dialog', { name: 'New direct message' }), page);
6969
}
7070

71-
get dmListbox(): Locator {
72-
return this.root.getByRole('listbox');
73-
}
74-
7571
get autocompleteUser(): Locator {
76-
return this.root.getByRole('listbox').getByRole('textbox');
72+
return this.root.getByLabel('Select one or more people to', { exact: true }).getByRole('textbox');
7773
}
7874

7975
async inviteUserToDM(username: string) {
8076
await this.autocompleteUser.click();
8177
await this.autocompleteUser.fill(username);
82-
await this.dmListbox.selectOption(username);
78+
await this.listbox.selectOption(username);
79+
await this.page?.keyboard.press('Tab');
8380
}
8481
}
8582

apps/meteor/tests/e2e/page-objects/fragments/navbar.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,7 @@ export class Navbar {
215215

216216
async createNewDM(username: string): Promise<void> {
217217
await this.openCreate('Direct message');
218-
await this.modals['Direct message'].dmListbox.click();
219-
await this.modals['Direct message'].dmListbox.pressSequentially(username);
220-
await this.root.waitForTimeout(600);
221-
await this.root.keyboard.press('Enter');
222-
218+
await this.modals['Direct message'].inviteUserToDM(username);
223219
await this.modals['Direct message'].btnCreate.click();
224220
}
225221

0 commit comments

Comments
 (0)