From 4a7103c98d9ee0f75469b04a41cbd7600c7aba9e Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Tue, 19 Dec 2023 18:09:25 +0000 Subject: [PATCH] Fixed slider search e2es --- e2e/search/components/search-slider.e2e.ts | 2 +- e2e/search/search-component.e2e.ts | 2 +- .../search-slider/search-slider.component.html | 1 - .../pages/search/search-categories.page.ts | 4 ++-- .../pages/search/search-slider.page.ts | 10 +++++----- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index ab728ff223..3740f3ac44 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -108,9 +108,9 @@ describe('Search Slider Filter', () => { await sizeSliderFilter.setValue(size); await searchFilters.clickSizeSliderFilterHeader(); await searchFilters.checkSizeSliderFilterIsCollapsed(); + await searchFilters.checkSizeSliderFilterIsDisplayed(); await searchFilters.clickSizeSliderFilterHeader(); await searchFilters.checkSizeSliderFilterIsExpanded(); - await searchFilters.checkSizeSliderFilterIsDisplayed(); await expect(await sizeSliderFilter.getValue()).toEqual(`${size}`); }); diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index 88cdaabd8d..0c00ae83d1 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -157,7 +157,7 @@ describe('Search component - Search Bar', () => { it('[C260256] Should display file/folder in search suggestion when typing first characters', async () => { await openSearchBar(); - await searchBarPage.enterText(firstFolderModel.shortName); + await searchBarPage.enterTextAndPressEnter(firstFolderModel.shortName); await searchBarPage.resultTableContainsRow(firstFolderModel.name); diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html index ed7a3ba0af..d4617a3aae 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.html @@ -8,7 +8,6 @@ (change)="onChangedHandler({source: ngSliderThumb, parent: ngSlider, value: ngSliderThumb.value})" #ngSliderThumb="matSliderThumb" [(value)]="value" /> -
diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts b/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts index b4320d71f5..134384acd2 100644 --- a/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts +++ b/lib/testing/src/lib/protractor/content-services/pages/search/search-categories.page.ts @@ -51,11 +51,11 @@ export class SearchCategoriesPage { } async clickFilter(filter: ElementFinder): Promise { - await BrowserActions.click(filter.$('mat-expansion-panel-header')); + await BrowserActions.click(filter.$(' .mat-expansion-panel-header')); } async clickFilterHeader(filter: ElementFinder): Promise { - const fileSizeFilterHeader = filter.$('mat-expansion-panel-header'); + const fileSizeFilterHeader = filter.$(' .mat-expansion-panel-header'); await BrowserActions.click(fileSizeFilterHeader); } diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/search-slider.page.ts b/lib/testing/src/lib/protractor/content-services/pages/search/search-slider.page.ts index 8c7c0d5fbf..28b3e066e5 100644 --- a/lib/testing/src/lib/protractor/content-services/pages/search/search-slider.page.ts +++ b/lib/testing/src/lib/protractor/content-services/pages/search/search-slider.page.ts @@ -31,21 +31,21 @@ export class SearchSliderPage { } async getMaxValue() { - return BrowserActions.getAttribute(this.filter.$(this.slider), 'aria-valuemax'); + return BrowserActions.getAttribute(this.filter.$(this.slider).$('input'), 'max'); } async getMinValue() { - return BrowserActions.getAttribute(this.filter.$(this.slider), 'aria-valuemin'); + return BrowserActions.getAttribute(this.filter.$(this.slider).$('input'), 'min'); } async getValue() { - return BrowserActions.getAttribute(this.filter.$(this.slider), 'aria-valuenow'); + return BrowserActions.getAttribute(this.filter.$(this.slider).$('input'), 'aria-valuetext'); } async setValue(value: number): Promise { - const elem = this.filter.$(this.slider).$('.mat-slider-wrapper'); + const elem = this.filter.$(this.slider).$('.mdc-slider__thumb-knob'); await browser.actions().mouseMove(elem, { x: 0, y: 0 }).perform(); - await browser.actions().mouseDown().mouseMove({x: value * 20, y: 0}).mouseUp().perform(); + await browser.actions().mouseDown().mouseMove({x: value * 25, y: 0}).mouseUp().perform(); } async checkSliderIsDisplayed(): Promise {