diff --git a/e2e/playwright/search/src/tests/search-results-files-folders.spec.ts b/e2e/playwright/search/src/tests/search-results-files-folders.spec.ts index 77f4b28a4..fb43e4616 100644 --- a/e2e/playwright/search/src/tests/search-results-files-folders.spec.ts +++ b/e2e/playwright/search/src/tests/search-results-files-folders.spec.ts @@ -56,11 +56,7 @@ test.describe('Search results - files and folders', () => { const fileRussian = `любимый-сайт-${random}`; await nodesApi.createFile(fileRussian); - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkFilesAndFolders(); - await searchPage.searchInput.searchFor(fileRussian); - await searchPage.dataTable.progressBarWaitForReload(); + await searchPage.searchWithin(fileRussian, 'filesAndFolders'); await expect(searchPage.dataTable.getRowByName(fileRussian)).toBeVisible(); }); @@ -70,11 +66,7 @@ test.describe('Search results - files and folders', () => { const fileDescription = 'file description'; await nodesApi.createFile(file, '-my-', fileTitle, fileDescription); - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkFilesAndFolders(); - await searchPage.searchInput.searchFor(file); - await searchPage.dataTable.progressBarWaitForReload(); + await searchPage.searchWithin(file, 'files'); await searchPage.dataTable.clickItemLocation(file); expect((await personalFiles.breadcrumb.items.textContent()).trim()).toEqual('Personal Files'); }); diff --git a/e2e/playwright/search/src/tests/search-results-general.spec.ts b/e2e/playwright/search/src/tests/search-results-general.spec.ts index 1bcb8d779..ac2ecf2a0 100644 --- a/e2e/playwright/search/src/tests/search-results-general.spec.ts +++ b/e2e/playwright/search/src/tests/search-results-general.spec.ts @@ -58,15 +58,11 @@ test.describe('Search Results - General', () => { }); test.afterAll(async () => { - await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed'); + await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed', sitesApi, [site]); }); test('[C290005] Only files are returned when Files option is the only one checked', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkOnlyFiles(); - await searchPage.searchInput.searchFor(`*${random}`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`*${random}`, 'files'); expect(await searchPage.dataTable.isItemPresent(file)).toBeTruthy(); expect(await searchPage.dataTable.isItemPresent(folder)).toBeFalsy(); @@ -74,11 +70,7 @@ test.describe('Search Results - General', () => { }); test('[C290006] Only folders are returned when Folders option is the only one checked', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkOnlyFolders(); - await searchPage.searchInput.searchFor(`*${random}`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`*${random}`, 'folders'); expect(await searchPage.dataTable.isItemPresent(file)).toBeFalsy(); expect(await searchPage.dataTable.isItemPresent(folder)).toBeTruthy(); @@ -86,11 +78,7 @@ test.describe('Search Results - General', () => { }); test('[C290007] Files and folders are returned when both Files and Folders options are checked', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkFilesAndFolders(); - await searchPage.searchInput.searchFor(`*${random}`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`*${random}`, 'filesAndFolders'); expect(await searchPage.dataTable.isItemPresent(file)).toBeTruthy(); expect(await searchPage.dataTable.isItemPresent(folder)).toBeTruthy(); @@ -98,11 +86,7 @@ test.describe('Search Results - General', () => { }); test('[C290008] Only libraries are returned when Libraries option is checked', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(`*${random}`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`*${random}`, 'libraries'); expect(await searchPage.dataTable.isItemPresent(file)).toBeFalsy(); expect(await searchPage.dataTable.isItemPresent(folder)).toBeFalsy(); @@ -110,28 +94,21 @@ test.describe('Search Results - General', () => { }); test('[C279162] Results are updated automatically when changing the search term', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.searchFor(file); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(file, 'filesAndFolders'); expect(await searchPage.dataTable.isItemPresent(file)).toBeTruthy(); expect(await searchPage.dataTable.isItemPresent(folder)).toBeFalsy(); await searchPage.searchInput.searchButton.click(); await searchPage.searchInput.searchFor(folder); - await searchPage.dataTable.waitForTable(); + await searchPage.dataTable.progressBarWaitForReload(); expect(await searchPage.dataTable.isItemPresent(file)).toBeFalsy(); expect(await searchPage.dataTable.isItemPresent(folder)).toBeTruthy(); }); test('[C279178] Results are returned when accessing an URL containing a search query', async ({ searchPage, personalFiles }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(site); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(site, 'libraries'); expect(await searchPage.dataTable.isItemPresent(site)).toBeTruthy(); @@ -139,7 +116,7 @@ test.describe('Search Results - General', () => { await personalFiles.navigate(); await personalFiles.page.goto(url); - await searchPage.dataTable.waitForTable(); + await searchPage.dataTable.progressBarWaitForReload(); expect(await searchPage.dataTable.isItemPresent(site)).toBeTruthy(); }); diff --git a/e2e/playwright/search/src/tests/search-results-libraries.spec.ts b/e2e/playwright/search/src/tests/search-results-libraries.spec.ts index 376a4480f..2da119424 100644 --- a/e2e/playwright/search/src/tests/search-results-libraries.spec.ts +++ b/e2e/playwright/search/src/tests/search-results-libraries.spec.ts @@ -85,7 +85,21 @@ test.describe('Search Results - General', () => { }); test.afterAll(async () => { - await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed'); + await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed', sitesApi, [ + site1.id, + site2.id, + site3.id, + site4.id, + userSiteModerated, + userSitePrivate, + userSitePublic, + adminSite1, + adminSite2, + adminSite3, + adminSite4, + adminPrivate, + siteRussian.id + ]); }); test.beforeAll(async () => { @@ -126,11 +140,7 @@ test.describe('Search Results - General', () => { }); test('[C290012] Search library - full name match', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(site1.name); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(site1.name, 'libraries'); expect(await searchPage.dataTable.isItemPresent(site1.name)).toBeTruthy(); expect(await searchPage.dataTable.isItemPresent(site2.name)).toBeFalsy(); @@ -140,11 +150,7 @@ test.describe('Search Results - General', () => { test('[C290013] Search library - partial name match', async ({ searchPage }) => { await fileActionsApi.waitForNodes(site3.id, { expect: 1 }); - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(`lib-${random}`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`lib-${random}`, 'libraries'); expect(await searchPage.dataTable.isItemPresent(site1.name)).toBeTruthy(); expect(await searchPage.dataTable.isItemPresent(site2.name)).toBeFalsy(); @@ -153,11 +159,7 @@ test.describe('Search Results - General', () => { }); test('[C290014] Search library - description match', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(site4.description); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(site4.description, 'libraries'); expect(await searchPage.dataTable.isItemPresent(site1.name)).toBeFalsy(); expect(await searchPage.dataTable.isItemPresent(site2.name)).toBeFalsy(); @@ -166,11 +168,7 @@ test.describe('Search Results - General', () => { }); test('[C290016] Results page columns', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(site1.name); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(site1.name, 'libraries'); const expectedColumns = ['Name', 'Description', 'My Role', 'Visibility']; const actualColumns = await searchPage.dataTable.getColumnHeaders(); @@ -179,11 +177,7 @@ test.describe('Search Results - General', () => { }); test('[C290017] Library visibility is correctly displayed', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(`user-site-${random}`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`user-site-${random}`, 'libraries'); const expectedSitesVisibility = { [userSitePrivate]: SITE_VISIBILITY.PRIVATE, @@ -197,11 +191,7 @@ test.describe('Search Results - General', () => { }); test('[C290018] User role is correctly displayed', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(`admin-${random}-site`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`admin-${random}-site`, 'libraries'); const expectedSitesRoles = { [adminSite1]: SITE_ROLES.SITE_CONSUMER.LABEL, @@ -216,21 +206,13 @@ test.describe('Search Results - General', () => { }); test('[C290019] Private sites are not displayed when user is not a member', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(`admin-${random}-site`); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(`admin-${random}-site`, 'libraries'); expect(await searchPage.dataTable.isItemPresent(adminPrivate)).toBeFalsy(); }); test('[C290028] Search libraries with special characters', async ({ searchPage }) => { - await searchPage.acaHeader.searchButton.click(); - await searchPage.searchInput.searchButton.click(); - await searchPage.searchInput.checkLibraries(); - await searchPage.searchInput.searchFor(siteRussian.name); - await searchPage.dataTable.waitForTable(); + await searchPage.searchWithin(siteRussian.name, 'libraries'); expect(await searchPage.dataTable.isItemPresent(siteRussian.name)).toBeTruthy(); }); diff --git a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts index fde03af7f..f67e69324 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts @@ -366,11 +366,4 @@ export class DataTableComponent extends BaseComponent { } return sitesInfo; } - - /** - * Method used to wait for values to be loaded in the table - */ - async waitForTable(): Promise { - await this.getRowLocator.nth(0).waitFor({timeout:5000}); - } } diff --git a/projects/aca-playwright-shared/src/page-objects/components/search/search-input.component.ts b/projects/aca-playwright-shared/src/page-objects/components/search/search-input.component.ts index df71aa1db..acab05eee 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/search/search-input.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/search/search-input.component.ts @@ -28,16 +28,13 @@ import { timeouts } from '../../../utils'; export class SearchInputComponent extends BaseComponent { private static rootElement = 'aca-page-layout'; - public searchOptionsArea = this.page.locator('mat-checkbox'); - public searchInput = this.getChild('input[id="app-control-input"]'); - public searchButton = this.getChild('.app-search-button'); + public searchInput = this.page.locator('#app-control-input'); + public searchButton = this.page.locator('.app-search-button'); public searchButtonWindow = this.page.locator('#app-search-button'); - public searchInputWindow = this.page.locator('.app-search-control'); - public searchInputWindowInput = this.page.locator('.app-search-control input'); public searchOptions = this.page.locator('#search-options'); - public searchFilesOption = this.searchOptionsArea.getByText(' Files '); - public searchLibrariesOption = this.searchOptionsArea.getByText(' Libraries '); - public searchFoldersOption = this.searchOptionsArea.getByText(' Folders '); + public searchFilesOption = this.page.locator('#content') + public searchLibrariesOption = this.page.locator('#libraries') + public searchFoldersOption = this.page.locator('#folder') getIconByName = (name: string): Locator => this.getChild('.mat-icon', { hasText: name }); @@ -121,9 +118,9 @@ export class SearchInputComponent extends BaseComponent { } async searchFor(text: string) { - await this.searchInputWindow.click(); - await this.searchInputWindowInput.clear(); - await this.searchInputWindow.type(text); + await this.searchInput.click({force: true}); + await this.searchInput.clear({force: true}); + await this.searchInput.fill(text, {force: true}); await this.searchButtonWindow.click(); } } diff --git a/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts index cd9b63d5b..49bd4a037 100644 --- a/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts +++ b/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts @@ -28,6 +28,8 @@ import { DataTableComponent, MatMenuComponent, ViewerComponent, SearchInputCompo import { AcaHeader } from '../components/aca-header.component'; import { AdfConfirmDialogComponent, AdfFolderDialogComponent } from '../components/dialogs'; +type SearchType = 'files' | 'folders' | 'filesAndFolders' | 'libraries'; + export class SearchPage extends BasePage { private static pageUrl = 'search'; @@ -44,4 +46,27 @@ export class SearchPage extends BasePage { public searchOverlay = new SearchOverlayComponent(this.page); public sidenav = new SidenavComponent(this.page); public confirmDialogComponent = new AdfConfirmDialogComponent(this.page); + + async searchWithin(searchText: string, searchType: SearchType): Promise { + await this.acaHeader.searchButton.click(); + await this.searchInput.searchButton.click(); + switch (searchType) { + case 'files': + await this.searchInput.checkOnlyFiles(); + break; + case 'folders': + await this.searchInput.checkOnlyFolders(); + break; + case 'filesAndFolders': + await this.searchInput.checkFilesAndFolders(); + break; + case 'libraries': + await this.searchInput.checkLibraries(); + break; + default: + break; + } + await this.searchInput.searchFor(searchText); + await this.dataTable.progressBarWaitForReload(); + } }