Skip to content

test: improve selectors specificity #32665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 5 commits into from
Jun 24, 2024
Merged

test: improve selectors specificity #32665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58e5e05
test: `omnichannel-custom-fields` inputSearch selector
juliajforesti Jun 24, 2024
c8e35b5
add `FilterByText` aria-label
juliajforesti Jun 24, 2024
c155b0e
add `AddManager` field ids
juliajforesti Jun 24, 2024
80bb46d
omnichannel fragments - add specificity to `inputSearch` fragment sel…
juliajforesti Jun 24, 2024
1428d3e
:)
juliajforesti Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/meteor/client/components/FilterByText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function Fi
value={text}
flexGrow={2}
minWidth='x220'
aria-label={placeholder ?? t('Search')}
/>
</Box>
{isFilterByTextPropsWithButton(props) ? (
Expand Down
8 changes: 5 additions & 3 deletions apps/meteor/client/views/omnichannel/managers/AddManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useState } from 'react';
Expand All @@ -12,6 +12,8 @@ const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
const [username, setUsername] = useState('');
const dispatchToastMessage = useToastMessageDispatch();

const usernameFieldId = useUniqueId();

const saveAction = useEndpointAction('POST', '/v1/livechat/users/manager');

const handleSave = useMutableCallback(async () => {
Expand All @@ -34,9 +36,9 @@ const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
return (
<Box display='flex' alignItems='center'>
<Field>
<FieldLabel>{t('Username')}</FieldLabel>
<FieldLabel htmlFor={usernameFieldId}>{t('Username')}</FieldLabel>
<FieldRow>
<UserAutoComplete value={username} onChange={handleChange} />
<UserAutoComplete id={usernameFieldId} value={username} onChange={handleChange} />
<Button disabled={!username} onClick={handleSave} mis={8} primary>
{t('Add_manager')}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-agents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class OmnichannelAgents {
}

get inputSearch(): Locator {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

get btnAdd(): Locator {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-business-hours.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class OmnichannelBusinessHours extends OmnichannelAdministration {
}

get inputSearch(): Locator {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

get inputName(): Locator {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-custom-fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class OmnichannelCustomFields {
}

get inputSearch(): Locator {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

firstRowInTable(filedName: string) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-departments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class OmnichannelDepartments {
}

get inputSearch() {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

async search(text: string) {
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/tests/e2e/page-objects/omnichannel-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class OmnichannelManager {
}

private get inputSearch() {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

async search(text: string) {
Expand All @@ -27,7 +27,7 @@ export class OmnichannelManager {
}

get inputUsername(): Locator {
return this.page.locator('input').first();
return this.page.getByRole('main').getByLabel('Username');
}

async selectUsername(username: string) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-monitors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class OmnichannelMonitors extends OmnichannelAdministration {
}

get inputSearch(): Locator {
return this.page.locator('input[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

findRowByName(name: string): Locator {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-sla-policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class OmnichannelSlaPolicies {
}

get inputSearch() {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

headingButtonNew(name: string) {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-tags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class OmnichannelTags extends OmnichannelAdministration {
}

get inputSearch(): Locator {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

get confirmDeleteModal(): Locator {
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { OmnichannelAdministration } from './omnichannel-administration';

export class OmnichannelUnits extends OmnichannelAdministration {
get inputSearch() {
return this.page.locator('[placeholder="Search"]');
return this.page.getByRole('main').getByRole('textbox', { name: 'Search' });
}

async search(text: string) {
Expand Down