Skip to content

chore(ci): Fix tests searching for non-existing searchbox role #61111

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

Draft
come-nc wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Draft

chore(ci): Fix tests searching for non-existing searchbox role #61111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/files/src/views/FilesNavigation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('Navigation', () => {
// see the navigation
await expect(component.findByRole('navigation', { name: 'Files' })).resolves.not.toThrow()
// see the search box
await expect(component.findByRole('searchbox', { name: /Search here/ })).resolves.not.toThrow()
await expect(component.findByRole('combobox', { name: /Search here/ })).resolves.not.toThrow()
// see the settings entry
await expect(component.findByRole('link', { name: /Files settings/ })).resolves.not.toThrow()
})
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/dav/availability.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ describe('Calendar: Availability', { testIsolation: true }, () => {
.type('Happy holidays!')

cy.intercept('GET', '**/ocs/v2.php/apps/files_sharing/api/v1/sharees?*search=replacement*').as('userSearch')
cy.findByRole('searchbox')
cy.findByRole('combobox')
.should('be.visible')
.as('userSearchBox')
.click()
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/files/search.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('files: search', () => {
.should('be.visible')
.within(() => {
// see within there is a search box with the same value
cy.findByRole('searchbox', { name: /search for files/i })
cy.findByRole('combobox', { name: /search for files/i })
.should('be.visible')
.and('have.value', 'xyz')
})
Expand Down
8 changes: 4 additions & 4 deletions cypress/e2e/settings/users_search.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ describe('Settings: Unified search for accounts and groups', { testIsolation: fa
})

it('shows the search input in the navigation sidebar', () => {
accountNav().findByRole('searchbox', { name: /search accounts and groups/i })
accountNav().findByRole('combobox', { name: /search accounts and groups/i })
.should('be.visible')
.and('have.value', '')
})

it('dispatches the query to both the users and groups API', () => {
accountNav().findByRole('searchbox', { name: /search accounts and groups/i })
accountNav().findByRole('combobox', { name: /search accounts and groups/i })
.type(alice.userId)

// A single keystroke sequence debounces once (300ms), then fans out
Expand All @@ -88,7 +88,7 @@ describe('Settings: Unified search for accounts and groups', { testIsolation: fa
})

it('filters the group list when the query matches a group name', () => {
accountNav().findByRole('searchbox', { name: /search accounts and groups/i })
accountNav().findByRole('combobox', { name: /search accounts and groups/i })
.clear()
.type(matchingGroup)

Expand All @@ -102,7 +102,7 @@ describe('Settings: Unified search for accounts and groups', { testIsolation: fa
it('resets both lists when the clear button is clicked', () => {
accountNav().findByRole('button', { name: /clear search/i }).click()

accountNav().findByRole('searchbox', { name: /search accounts and groups/i })
accountNav().findByRole('combobox', { name: /search accounts and groups/i })
.should('have.value', '')

waitForSearchRequest('@loadUsers', '')
Expand Down
2 changes: 1 addition & 1 deletion cypress/pages/FilesNavigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class FilesNavigationPage {
}

searchInput() {
return this.navigation().findByRole('searchbox')
return this.navigation().findByRole('combobox')
}

searchScopeTrigger() {
Expand Down
Loading