diff --git a/e2e/playwright/search/exclude.tests.json b/e2e/playwright/search/exclude.tests.json index d1f9312b1..95fd43c75 100644 --- a/e2e/playwright/search/exclude.tests.json +++ b/e2e/playwright/search/exclude.tests.json @@ -2,10 +2,6 @@ "XAT-5601": "https://hyland.atlassian.net/browse/ACS-6928", "XAT-5600": "https://hyland.atlassian.net/browse/ACS-6928", "XAT-17697": "https://hyland.atlassian.net/browse/ACS-7464", - "XAT-5571": "https://hyland.atlassian.net/browse/ACS-9756", - "XAT-17700": "https://hyland.atlassian.net/browse/ACS-9756", - "XAT-17120": "https://hyland.atlassian.net/browse/ACS-9756", - "XAT-5567": "https://hyland.atlassian.net/browse/ACS-9756", "XAT-17121": "https://hyland.atlassian.net/browse/ACS-9795", "XAT-17702": "https://hyland.atlassian.net/browse/ACS-9795" } 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 90917e46e..bf0aa8c5d 100644 --- a/e2e/playwright/search/src/tests/search-filters-date.e2e.ts +++ b/e2e/playwright/search/src/tests/search-filters-date.e2e.ts @@ -25,6 +25,7 @@ import { expect } from '@playwright/test'; import { ApiClientFactory, Utils, test, NodesApi, TrashcanApi, FileActionsApi, TEST_FILES } from '@alfresco/aca-playwright-shared'; +test.use({ launchOptions: { slowMo: 500 } }); test.describe('Search - Filters - Date', () => { let nodesApi: NodesApi; let trashcanApi: TrashcanApi; diff --git a/e2e/playwright/search/src/tests/search-highlighting.e2e.ts b/e2e/playwright/search/src/tests/search-highlighting.e2e.ts index 6cbd4ae83..e63b05d31 100644 --- a/e2e/playwright/search/src/tests/search-highlighting.e2e.ts +++ b/e2e/playwright/search/src/tests/search-highlighting.e2e.ts @@ -25,6 +25,7 @@ import { expect } from '@playwright/test'; import { ApiClientFactory, Utils, test, NodesApi, TrashcanApi, TEST_FILES, FileActionsApi } from '@alfresco/aca-playwright-shared'; +test.use({ launchOptions: { slowMo: 500 } }); test.describe('Search Highlighting', () => { let nodesApi: NodesApi; let trashcanApi: TrashcanApi; @@ -63,18 +64,21 @@ test.describe('Search Highlighting', () => { test('[XAT-17119] Matching phrases should be highlighted in the file name for search results', async ({ searchPage }) => { await searchPage.searchWithin(fileNameHighlight, 'files'); - expect(await searchPage.dataTable.hasHighlightedText('name')).toBeTruthy(); + await searchPage.dataTable.progressBarWaitForReload(); + expect(await searchPage.dataTable.hasHighlightedText('name')).toBe(true); }); test('[XAT-17120] Matching phrases should be highlighted in the file description for search results', async ({ searchPage }) => { await searchPage.searchWithin(fileDescription, 'files'); - expect(await searchPage.dataTable.hasHighlightedText('description')).toBeTruthy(); - expect(await searchPage.dataTable.hasHighlightedText('name')).toBeFalsy(); + await searchPage.dataTable.progressBarWaitForReload(); + expect(await searchPage.dataTable.hasHighlightedText('description')).toBe(true); + expect(await searchPage.dataTable.hasHighlightedText('name')).toBe(false); }); test('[XAT-17121] Matching phrases should be highlighted in the file content for search results', async ({ searchPage }) => { await searchPage.searchWithin(fileContent, 'files'); - expect(await searchPage.dataTable.hasHighlightedText('content')).toBeTruthy(); - expect(await searchPage.dataTable.hasHighlightedText('name')).toBeFalsy(); + await searchPage.dataTable.progressBarWaitForReload(); + expect(await searchPage.dataTable.hasHighlightedText('content')).toBe(true); + expect(await searchPage.dataTable.hasHighlightedText('name')).toBe(false); }); }); diff --git a/e2e/playwright/search/src/tests/search-sorting.e2e.ts b/e2e/playwright/search/src/tests/search-sorting.e2e.ts index 6bdcd88ad..1d7cc4b30 100644 --- a/e2e/playwright/search/src/tests/search-sorting.e2e.ts +++ b/e2e/playwright/search/src/tests/search-sorting.e2e.ts @@ -36,6 +36,7 @@ import { SortByType } from '@alfresco/aca-playwright-shared'; +test.use({ launchOptions: { slowMo: 500 } }); test.describe('Search sorting', () => { const random = Utils.random(); @@ -57,6 +58,11 @@ test.describe('Search sorting', () => { source: TEST_FILES.PDF.path }; + const fileJpgBudget = { + name: `budget.xls`, + source: TEST_FILES.XLSX.path + }; + let nodesApi1: NodesApi; let trashcanApi1: TrashcanApi; let fileActionsApi1: FileActionsApi; @@ -86,6 +92,7 @@ test.describe('Search sorting', () => { await fileActionsApi1.uploadFileWithRename(fileJpg.source, fileJpg.name, parentId); await fileActionsApi2.uploadFileWithRename(filePdf.source, filePdf.name, parentId, filePdf.title, filePdf.description); + await fileActionsApi1.uploadFileWithRename(fileJpgBudget.source, fileJpgBudget.name, parentId); await fileActionsApi1.waitForNodes(fileJpg.name, { expect: 1 }); await fileActionsApi2.waitForNodes(filePdf.name, { expect: 1 }); @@ -105,10 +112,16 @@ test.describe('Search sorting', () => { sortBy: SortByType, sortOrder: SortByDirection, expectedFirstFile: string, - expectedSecondFile: string + expectedSecondFile: string, + searchTerm?: string ) { - await searchPage.searchWithin(`*${random}*`, 'files'); + if (searchTerm) { + await searchPage.searchWithin(searchTerm, 'files'); + } else { + await searchPage.searchWithin(`*${random}*`, 'files'); + } await searchPage.searchSortingPicker.sortBy(sortBy, sortOrder); + await searchPage.dataTable.progressBarWaitForReload(); expect(await searchPage.dataTable.getNthRow(0).textContent()).toContain(expectedFirstFile); expect(await searchPage.dataTable.getNthRow(1).textContent()).toContain(expectedSecondFile); } @@ -130,7 +143,9 @@ test.describe('Search sorting', () => { }); test(`[XAT-5571] Sort by Modified date`, async ({ searchPage }) => { - await testSearchSorting(searchPage, 'Modified date' as SortByType, 'asc', fileJpg.name, filePdf.name); + const budgetFileOld = 'budget.xls ( Web Site Design - Budget )'; + const budgetFileNew = 'budget.xls'; + await testSearchSorting(searchPage, 'Modified date' as SortByType, 'asc', budgetFileOld, budgetFileNew, budgetFileNew); }); test(`[XAT-5567] Sort by Relevance`, async ({ searchPage }) => { diff --git a/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-date.component.ts b/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-date.component.ts index af3513ea2..86e9b03e9 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-date.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/search/search-filters/search-filters-date.component.ts @@ -92,6 +92,7 @@ export class SearchFiltersDate extends BaseComponent { const { searchPage, filterType, dateFilterTab, searchPhrase, searchType, expectSearchResults, inTheLastInputValue, startDay, endDay } = params; await searchPage.searchWithin(searchPhrase, searchType); + await searchPage.dataTable.progressBarWaitForReload(); await searchPage.searchFilters.dateFilter.click(); if (dateFilterTab === 'Modified') { @@ -116,7 +117,7 @@ export class SearchFiltersDate extends BaseComponent { } await searchPage.searchFilters.menuCardApply.click(); - await searchPage.dataTable.spinnerWaitForReload(); + await searchPage.dataTable.progressBarWaitForReload(); expect(await searchPage.dataTable.getRowsCount()).toEqual(expectSearchResults); let dateText: string;