From e2979410b3f010220b9a5fa98c7783babe6c0db9 Mon Sep 17 00:00:00 2001 From: Katarzyna Kita <156378082+katarzynakita@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:34:13 +0200 Subject: [PATCH] [ACS-7364] Changed getRowsCount&getNthRow method not to count header row (#3752) * Changed getRowsCount method not to count header row * Removed commented code * Fixed missing empty line * Fixed getNthRow method usage --- .../list-views/src/tests/permissions.e2e.ts | 12 +++++----- .../src/tests/search-filters-logic.e2e.ts | 24 +++++++++---------- .../search/src/tests/search-sorting.e2e.ts | 4 ++-- .../dataTable/data-table.component.ts | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/e2e/playwright/list-views/src/tests/permissions.e2e.ts b/e2e/playwright/list-views/src/tests/permissions.e2e.ts index c1a94c9ab..65de1b10c 100755 --- a/e2e/playwright/list-views/src/tests/permissions.e2e.ts +++ b/e2e/playwright/list-views/src/tests/permissions.e2e.ts @@ -88,7 +88,7 @@ test.describe('Special permissions', () => { test('[C213173] on Recent Files', async ({ recentFilesPage }) => { await recentFilesPage.navigate(); - expect(await recentFilesPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(2); + expect(await recentFilesPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(1); await siteApiAdmin.deleteSiteMember(sitePrivate, username); await recentFilesPage.reload(); expect(await recentFilesPage.dataTable.isEmpty(), 'Items are still displayed').toBe(true); @@ -96,7 +96,7 @@ test.describe('Special permissions', () => { test('[C213227] on Favorites', async ({ favoritePage }) => { await favoritePage.navigate(); - expect(await favoritePage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(2); + expect(await favoritePage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(1); await siteApiAdmin.deleteSiteMember(sitePrivate, username); await favoritePage.reload(); expect(await favoritePage.dataTable.isEmpty(), 'Items are still displayed').toBe(true); @@ -117,7 +117,7 @@ test.describe('Special permissions', () => { await searchPage.searchOverlay.searchFor(fileName); await searchPage.dataTable.spinnerWaitForReload(); - expect(await searchPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(2); + expect(await searchPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(1); await siteApiAdmin.deleteSiteMember(sitePrivate, username); @@ -168,13 +168,13 @@ test.describe('Special permissions', () => { test('[C213178] on Recent Files', async ({ recentFilesPage }) => { await recentFilesPage.navigate(); - expect(await recentFilesPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(2); + expect(await recentFilesPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(1); expect(await recentFilesPage.dataTable.getItemLocationText(fileName)).toEqual('Unknown'); }); test('[C213672] on Favorites', async ({ favoritePage }) => { await favoritePage.navigate(); - expect(await favoritePage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(2); + expect(await favoritePage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(1); expect(await favoritePage.dataTable.getItemLocationText(fileName)).toEqual('Unknown'); }); @@ -190,7 +190,7 @@ test.describe('Special permissions', () => { await searchPage.searchOverlay.searchFor(fileName); await searchPage.dataTable.spinnerWaitForReload(); - expect(await searchPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(2); + expect(await searchPage.dataTable.getRowsCount(), 'Incorrect number of items').toBe(1); expect(await searchPage.dataTable.getItemLocationText(fileName)).toEqual('Unknown'); }); }); diff --git a/e2e/playwright/search/src/tests/search-filters-logic.e2e.ts b/e2e/playwright/search/src/tests/search-filters-logic.e2e.ts index c4797019d..b7804cb4f 100644 --- a/e2e/playwright/search/src/tests/search-filters-logic.e2e.ts +++ b/e2e/playwright/search/src/tests/search-filters-logic.e2e.ts @@ -84,7 +84,7 @@ test.describe('Search - Filters - Logic', () => { await searchPage.dataTable.progressBarWaitForReload(); await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeVisible(); - await expect(searchPage.dataTable.getRowByName(logicFile2.name)).not.toBeVisible(); + await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeHidden(); }); test('[C699501] Filter with Match Any', async ({ searchPage }) => { @@ -95,7 +95,7 @@ test.describe('Search - Filters - Logic', () => { await searchPage.searchFiltersLogic.applyButton.click(); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.getRowsCount()).toBe(3); + expect(await searchPage.dataTable.getRowsCount()).toBe(2); await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeVisible(); await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeVisible(); }); @@ -109,8 +109,8 @@ test.describe('Search - Filters - Logic', () => { await searchPage.searchFiltersLogic.applyButton.click(); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.getRowsCount()).toBe(2); - await expect(searchPage.dataTable.getRowByName(logicFile1.name)).not.toBeVisible(); + expect(await searchPage.dataTable.getRowsCount()).toBe(1); + await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeHidden(); await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeVisible(); }); @@ -120,8 +120,8 @@ test.describe('Search - Filters - Logic', () => { await searchPage.searchFiltersLogic.applyButton.click(); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.getRowsCount()).toBe(2); - await expect(searchPage.dataTable.getRowByName(logicFile2.name)).not.toBeVisible(); + expect(await searchPage.dataTable.getRowsCount()).toBe(1); + await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeHidden(); await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeVisible(); await searchPage.searchFilters.logicFilter.click(); @@ -129,8 +129,8 @@ test.describe('Search - Filters - Logic', () => { await searchPage.searchFiltersLogic.applyButton.click(); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.getRowsCount()).toBe(2); - await expect(searchPage.dataTable.getRowByName(logicFile2.name)).not.toBeVisible(); + expect(await searchPage.dataTable.getRowsCount()).toBe(1); + await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeHidden(); await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeVisible(); await searchPage.searchFilters.logicFilter.click(); @@ -138,8 +138,8 @@ test.describe('Search - Filters - Logic', () => { await searchPage.searchFiltersLogic.applyButton.click(); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.getRowsCount()).toBe(2); - await expect(searchPage.dataTable.getRowByName(logicFile2.name)).not.toBeVisible(); + expect(await searchPage.dataTable.getRowsCount()).toBe(1); + await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeHidden(); await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeVisible(); }); @@ -154,8 +154,8 @@ test.describe('Search - Filters - Logic', () => { await searchPage.searchFiltersLogic.applyButton.click(); await searchPage.dataTable.progressBarWaitForReload(); - expect(await searchPage.dataTable.getRowsCount()).toBe(2); - await expect(searchPage.dataTable.getRowByName(logicFile1.name)).not.toBeVisible(); + expect(await searchPage.dataTable.getRowsCount()).toBe(1); + await expect(searchPage.dataTable.getRowByName(logicFile1.name)).toBeHidden(); await expect(searchPage.dataTable.getRowByName(logicFile2.name)).toBeVisible(); }); }); diff --git a/e2e/playwright/search/src/tests/search-sorting.e2e.ts b/e2e/playwright/search/src/tests/search-sorting.e2e.ts index e5c4d4a52..c17df4ac2 100644 --- a/e2e/playwright/search/src/tests/search-sorting.e2e.ts +++ b/e2e/playwright/search/src/tests/search-sorting.e2e.ts @@ -111,8 +111,8 @@ test.describe('Search sorting', () => { await searchPage.searchSortingPicker.sortBy(sortBy, sortOrder); - expect(await searchPage.dataTable.getNthRow(1).textContent()).toContain(expectedFirstFile); - expect(await searchPage.dataTable.getNthRow(2).textContent()).toContain(expectedSecondFile); + expect(await searchPage.dataTable.getNthRow(0).textContent()).toContain(expectedFirstFile); + expect(await searchPage.dataTable.getNthRow(1).textContent()).toContain(expectedSecondFile); } [ 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 0a80b2f8b..c6a160ed1 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 @@ -57,7 +57,7 @@ export class DataTableComponent extends BaseComponent { sitesRole = this.page.locator('.adf-datatable-body [data-automation-id*="datatable-row"] [aria-label="My Role"]'); /** Locator for row (or rows) */ - getRowLocator = this.getChild(`adf-datatable-row`); + getRowLocator = this.page.getByRole('rowgroup').nth(1).locator('adf-datatable-row'); /** Locator to get "No results found" message */ getNoResultsFoundMessage = this.getChild('adf-custom-empty-content-template', { hasText: 'No results found' });