From 4da73ff6e968a301f1ad0fea48550a267b92ffe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=9Awiderski?= Date: Fri, 24 Oct 2025 15:32:23 +0200 Subject: [PATCH] [ACS-10383] [E2E] fixed XAT-5603 and XAT-5604 (#4864) * [ACS-10383] [E2E] fixed XAT-5603 and XAT-5604 * [ACS-10383] review fixes 1 --- e2e/playwright/search/exclude.tests.json | 5 +-- .../src/tests/search-filters-date.e2e.ts | 14 ------- .../src/tests/search-results-general.e2e.ts | 40 ++++++------------- .../search-filters-location.component.ts | 8 +++- 4 files changed, 19 insertions(+), 48 deletions(-) diff --git a/e2e/playwright/search/exclude.tests.json b/e2e/playwright/search/exclude.tests.json index 312dec950..0c28fc0aa 100644 --- a/e2e/playwright/search/exclude.tests.json +++ b/e2e/playwright/search/exclude.tests.json @@ -1,8 +1,5 @@ { "XAT-17697": "https://hyland.atlassian.net/browse/ACS-7464", "XAT-17121": "https://hyland.atlassian.net/browse/ACS-9889", - "XAT-17702": "https://hyland.atlassian.net/browse/ACS-10383", - "XAT-5602": "https://hyland.atlassian.net/browse/ACS-10384", - "XAT-5603": "https://hyland.atlassian.net/browse/ACS-10383", - "XAT-5604": "https://hyland.atlassian.net/browse/ACS-10383" + "XAT-5602": "https://hyland.atlassian.net/browse/ACS-10384" } diff --git a/e2e/playwright/search/src/tests/search-filters-date.e2e.ts b/e2e/playwright/search/src/tests/search-filters-date.e2e.ts index bf0aa8c5d..6afa6394c 100644 --- a/e2e/playwright/search/src/tests/search-filters-date.e2e.ts +++ b/e2e/playwright/search/src/tests/search-filters-date.e2e.ts @@ -160,19 +160,5 @@ test.describe('Search - Filters - Date', () => { endDay: currentAndPreviousDay.currentDate }); }); - - test('[XAT-17702] Should able to filter search result with Modified date under Date Facet - Modified between', async ({ searchPage }) => { - await searchPage.searchFiltersDate.filterFilesByDate({ - searchPage, - filterType: 'between', - dateFilterTab: 'Modified', - searchPhrase: searchPhrase, - searchType: 'files', - expectSearchResults: 1, - inTheLastInputValue: '1', - startDay: dateForSearch, - endDay: currentAndPreviousDay.currentDate - }); - }); }); }); diff --git a/e2e/playwright/search/src/tests/search-results-general.e2e.ts b/e2e/playwright/search/src/tests/search-results-general.e2e.ts index c42e2fe29..b19cff061 100644 --- a/e2e/playwright/search/src/tests/search-results-general.e2e.ts +++ b/e2e/playwright/search/src/tests/search-results-general.e2e.ts @@ -60,56 +60,40 @@ test.describe('Search Results - General', () => { await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed', sitesApi, [site]); }); - test('[XAT-5603] Only files are returned when Files option is the only one checked', async ({ searchPage }) => { - await searchPage.searchWithin(`*${random}`, 'files'); - - expect(await searchPage.dataTable.isItemPresent(file)).toBeTruthy(); - expect(await searchPage.dataTable.isItemPresent(folder)).toBeFalsy(); - expect(await searchPage.dataTable.isItemPresent(site)).toBeFalsy(); - }); - - test('[XAT-5604] Only folders are returned when Folders option is the only one checked', async ({ searchPage }) => { - await searchPage.searchWithin(`*${random}`, 'folders'); - - expect(await searchPage.dataTable.isItemPresent(file)).toBeFalsy(); - expect(await searchPage.dataTable.isItemPresent(folder)).toBeTruthy(); - expect(await searchPage.dataTable.isItemPresent(site)).toBeFalsy(); - }); - test('[XAT-5605] Files and folders are returned when both Files and Folders options are checked', async ({ searchPage }) => { await searchPage.searchWithin(`*${random}`, 'filesAndFolders'); - expect(await searchPage.dataTable.isItemPresent(file)).toBeTruthy(); - expect(await searchPage.dataTable.isItemPresent(folder)).toBeTruthy(); - expect(await searchPage.dataTable.isItemPresent(site)).toBeFalsy(); + expect(await searchPage.dataTable.isItemPresent(file)).toBe(true); + expect(await searchPage.dataTable.isItemPresent(folder)).toBe(true); + expect(await searchPage.dataTable.isItemPresent(site)).toBe(false); }); test('[XAT-5593] Only libraries are returned when Libraries option is checked', async ({ searchPage }) => { await searchPage.searchWithin(`*${random}`, 'libraries'); - expect(await searchPage.dataTable.isItemPresent(file)).toBeFalsy(); - expect(await searchPage.dataTable.isItemPresent(folder)).toBeFalsy(); - expect(await searchPage.dataTable.isItemPresent(site)).toBeTruthy(); + expect(await searchPage.dataTable.isItemPresent(file)).toBe(false); + expect(await searchPage.dataTable.isItemPresent(folder)).toBe(false); + expect(await searchPage.dataTable.isItemPresent(site)).toBe(true); }); test('[XAT-5589] Results are updated automatically when changing the search term', async ({ searchPage }) => { await searchPage.searchWithin(file, 'filesAndFolders'); - expect(await searchPage.dataTable.isItemPresent(file)).toBeTruthy(); - expect(await searchPage.dataTable.isItemPresent(folder)).toBeFalsy(); + expect(await searchPage.dataTable.isItemPresent(file)).toBe(true); + expect(await searchPage.dataTable.isItemPresent(folder)).toBe(false); await searchPage.clickSearchButton(); await searchPage.searchOverlay.searchFor(folder); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.isItemPresent(file)).toBeFalsy(); - expect(await searchPage.dataTable.isItemPresent(folder)).toBeTruthy(); + expect(await searchPage.dataTable.isItemPresent(file)).toBe(false); + expect(await searchPage.dataTable.isItemPresent(folder)).toBe(true); }); test('[XAT-5590] Results are returned when accessing an URL containing a search query', async ({ searchPage, personalFiles }) => { await searchPage.searchWithin(site, 'libraries'); - expect(await searchPage.dataTable.isItemPresent(site)).toBeTruthy(); + expect(await searchPage.dataTable.isItemPresent(site)).toBe(true); const url = searchPage.page.url(); @@ -117,6 +101,6 @@ test.describe('Search Results - General', () => { await personalFiles.page.goto(url); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.isItemPresent(site)).toBeTruthy(); + expect(await searchPage.dataTable.isItemPresent(site)).toBe(true); }); }); diff --git a/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-location.component.ts b/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-location.component.ts index f2df55328..763f29420 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-location.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-location.component.ts @@ -24,7 +24,7 @@ import { SearchPage } from '../../../pages'; import { BaseComponent } from '../../base.component'; -import { Page } from '@playwright/test'; +import { Page, Locator } from '@playwright/test'; export class SearchFiltersLocation extends BaseComponent { private static rootElement = '.adf-search-filter-menu-card'; @@ -35,10 +35,14 @@ export class SearchFiltersLocation extends BaseComponent { public addOptionInput = this.getChild(`[data-automation-id$='adf-search-chip-autocomplete-input']`); + private searchOption(value: string): Locator { + return this.page.locator(`[data-automation-id="option-${value}"]`); + } + async filterByLocation(page: SearchPage, location: string): Promise { await page.searchFilters.locationFilter.click(); await page.searchFiltersLocation.addOptionInput.fill(location); - await page.page.keyboard.press('Enter'); + await page.searchFiltersLocation.searchOption(location).click(); await page.searchFilters.menuCardApply.click(); await page.dataTable.progressBarWaitForReload(); }