diff --git a/e2e/content-services/search/components/search-slider.e2e.ts b/e2e/content-services/search/components/search-slider.e2e.ts new file mode 100644 index 0000000000..e10de06cd0 --- /dev/null +++ b/e2e/content-services/search/components/search-slider.e2e.ts @@ -0,0 +1,242 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { LoginPage } from '../../../pages/adf/loginPage'; +import SearchDialog = require('../../../pages/adf/dialog/searchDialog'); +import DataTablePage = require('../../../pages/adf/dataTablePage'); +import { SearchResultsPage } from '../../../pages/adf/searchResultsPage'; +import { NavigationBarPage } from '../../../pages/adf/navigationBarPage'; +import { ConfigEditorPage } from '../../../pages/adf/configEditorPage'; +import { SearchFiltersPage } from '../../../pages/adf/searchFiltersPage'; + +import TestConfig = require('../../../test.config'); + +import AlfrescoApi = require('alfresco-js-api-node'); +import { UploadActions } from '../../../actions/ACS/upload.actions'; +import AcsUserModel = require('../../../models/ACS/acsUserModel'); +import FileModel = require('../../../models/ACS/fileModel'); +import { browser } from 'protractor'; +import resources = require('../../../util/resources'); +import { SearchConfiguration } from '../search.config'; + +describe('Search Number Range Filter', () => { + + const loginPage = new LoginPage(); + const searchDialog = new SearchDialog(); + const searchFilters = new SearchFiltersPage(); + const sizeSliderFilter = searchFilters.sizeSliderFilterPage(); + const searchResults = new SearchResultsPage(); + const navigationBar = new NavigationBarPage(); + const configEditor = new ConfigEditorPage(); + const dataTable = new DataTablePage(); + + const acsUser = new AcsUserModel(); + + const file2BytesModel = new FileModel({ + 'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, + 'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location + }); + + let file2Bytes; + const uploadActions = new UploadActions(); + + beforeAll(async (done) => { + + this.alfrescoJsApi = new AlfrescoApi({ + provider: 'ECM', + hostEcm: TestConfig.adf.url + }); + + await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + + await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); + + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + + file2Bytes = await uploadActions.uploadFile(this.alfrescoJsApi, file2BytesModel.location, file2BytesModel.name, '-my-'); + await browser.driver.sleep(15000); + + loginPage.loginToContentServices(acsUser.id, acsUser.password); + + searchDialog.checkSearchIconIsVisible() + .clickOnSearchIcon() + .enterTextAndPressEnter('*'); + + done(); + }); + + afterAll(async (done) => { + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, file2Bytes.entry.id); + done(); + }); + + beforeEach(() => { + searchFilters.checkSizeSliderFilterIsDisplayed() + .clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsExpanded(); + }); + + afterEach(async (done) => { + await browser.refresh(); + done(); + }); + + it('[C276970] Should be able to expand/collapse Search Size Slider', () => { + searchFilters.checkSizeSliderFilterIsExpanded() + .clickSizeSliderFilterHeader(); + sizeSliderFilter.checkSliderIsDisplayed() + .checkClearButtonIsDisplayed() + .checkClearButtonIsEnabled(); + searchFilters.checkSizeSliderFilterIsCollapsed(); + }); + + it('[C276972] Should be keep value when Search Size Slider is collapsed', () => { + let size = 5; + sizeSliderFilter.checkSliderIsDisplayed().setValue(size); + searchFilters.clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsCollapsed() + .clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsExpanded() + .checkSizeSliderFilterIsDisplayed(); + expect(sizeSliderFilter.getValue()).toEqual(`${size}`); + }); + + it('[C276981] Should be able to clear value in Search Size Slider', () => { + let size = 5; + sizeSliderFilter.checkSliderIsDisplayed().setValue(size); + searchResults.sortBySize(false) + .tableIsLoaded(); + + browser.controlFlow().execute(async () => { + let firstResult = await dataTable.getNodeIdFirstElement(); + await this.alfrescoJsApi.core.nodesApi.getNode(firstResult).then(async (node) => { + await expect(node.entry.content.sizeInBytes <= size).toBe(true); + }); + }); + + sizeSliderFilter.checkSliderIsDisplayed() + .clickClearButton(); + + searchResults.sortBySize(false) + .tableIsLoaded(); + + browser.controlFlow().execute(async () => { + let firstResult = await dataTable.getNodeIdFirstElement(); + await this.alfrescoJsApi.core.nodesApi.getNode(firstResult).then(async (node) => { + await expect(node.entry.content.sizeInBytes >= size).toBe(true); + }); + }); + }); + + describe('Configuration change', () => { + let jsonFile; + + beforeEach(() => { + let searchConfiguration = new SearchConfiguration(); + jsonFile = searchConfiguration.getConfiguration(); + }); + + it('[C276983] Should be able to disable thumb label in Search Size Slider', () => { + jsonFile.categories[2].component.settings.thumbLabel = false; + + navigationBar.clickConfigEditorButton(); + configEditor.clickSearchConfiguration(); + configEditor.clickClearButton(); + configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton(); + + searchDialog.checkSearchIconIsVisible() + .clickOnSearchIcon() + .enterTextAndPressEnter('*'); + + searchFilters.checkSizeSliderFilterIsDisplayed() + .clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsExpanded(); + + sizeSliderFilter.checkSliderWithThumbLabelIsNotDisplayed(); + }); + + it('[C276985] Should be able to set min value for Search Size Slider', () => { + let minSize = 3; + jsonFile.categories[2].component.settings.min = minSize; + + navigationBar.clickConfigEditorButton(); + configEditor.clickSearchConfiguration(); + configEditor.clickClearButton(); + configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton(); + + searchDialog.checkSearchIconIsVisible() + .clickOnSearchIcon() + .enterTextAndPressEnter('*'); + + searchFilters.checkSizeSliderFilterIsDisplayed() + .clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsExpanded(); + + sizeSliderFilter.checkSliderIsDisplayed(); + + expect(sizeSliderFilter.getMinValue()).toEqual(`${minSize}`); + }); + + it('[C276986] Should be able to set max value for Search Size Slider', () => { + let maxSize = 50; + jsonFile.categories[2].component.settings.max = maxSize; + + navigationBar.clickConfigEditorButton(); + configEditor.clickSearchConfiguration(); + configEditor.clickClearButton(); + configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton(); + + searchDialog.checkSearchIconIsVisible() + .clickOnSearchIcon() + .enterTextAndPressEnter('*'); + + searchFilters.checkSizeSliderFilterIsDisplayed() + .clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsExpanded(); + + sizeSliderFilter.checkSliderIsDisplayed(); + + expect(sizeSliderFilter.getMaxValue()).toEqual(`${maxSize}`); + }); + + it('[C276987] Should be able to set steps for Search Size Slider', () => { + let step = 10; + jsonFile.categories[2].component.settings.step = step; + + navigationBar.clickConfigEditorButton(); + configEditor.clickSearchConfiguration(); + configEditor.clickClearButton(); + configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton(); + + searchDialog.checkSearchIconIsVisible() + .clickOnSearchIcon() + .enterTextAndPressEnter('*'); + + searchFilters.checkSizeSliderFilterIsDisplayed() + .clickSizeSliderFilterHeader() + .checkSizeSliderFilterIsExpanded(); + + let randomValue = 5; + sizeSliderFilter.checkSliderIsDisplayed() + .setValue(randomValue); + expect(sizeSliderFilter.getValue()).toEqual(`0`); + sizeSliderFilter.setValue(step); + expect(sizeSliderFilter.getValue()).toEqual(`${step}`); + }); + }); +}); diff --git a/e2e/pages/adf/content_services/search/components/search-slider.page.ts b/e2e/pages/adf/content_services/search/components/search-slider.page.ts index 9f0aec2473..cac441b1b6 100644 --- a/e2e/pages/adf/content_services/search/components/search-slider.page.ts +++ b/e2e/pages/adf/content_services/search/components/search-slider.page.ts @@ -21,31 +21,32 @@ import Util = require('../../../../../util/util'); export class SearchSliderPage { filter; - slider = by.css('mat-slider'); + slider = by.css('mat-slider[data-automation-id="slider-range"]'); + clearButton = by.css('button[data-automation-id="slider-btn-clear"]'); + sliderWithThumbLabel = by.css('mat-slider[data-automation-id="slider-range"][class*="mat-slider-thumb-label-showing"]'); constructor(filter) { this.filter = filter; } - setValue(value) { - this.clickSlider(); - browser.controlFlow().execute(async () => { - let actualValue; - do { - actualValue = await this.filter.element(this.slider).getAttribute('aria-valuenow'); - if (actualValue < value) { - await browser.actions().sendKeys(protractor.Key.ARROW_RIGHT).perform(); - } else if (actualValue > value) { - await browser.actions().sendKeys(protractor.Key.ARROW_LEFT).perform(); - } - }while (Number(actualValue) !== value); - }); - return this; + getMaxValue() { + return this.filter.element(this.slider).getAttribute('aria-valuemax'); } - clickSlider() { - Util.waitUntilElementIsClickable(this.filter.element(this.slider)); - this.filter.element(this.slider).click(); + getMinValue() { + return this.filter.element(this.slider).getAttribute('aria-valuemin'); + } + + getValue() { + return this.filter.element(this.slider).getAttribute('aria-valuenow'); + } + + setValue(value) { + + browser.actions().dragAndDrop( + this.filter.element(this.slider).element(by.css('div[class="mat-slider-thumb"]')), + {x: value * 10, y: 0} + ).perform(); return this; } @@ -53,4 +54,24 @@ export class SearchSliderPage { Util.waitUntilElementIsVisible(this.filter.element(this.slider)); return this; } + + checkSliderWithThumbLabelIsNotDisplayed() { + Util.waitUntilElementIsNotVisible(this.filter.element(this.sliderWithThumbLabel)); + return this; + } + + clickClearButton() { + Util.waitUntilElementIsClickable(this.filter.element(this.clearButton)); + this.filter.element(this.clearButton).click(); + return this; + } + + checkClearButtonIsEnabled() { + return this.filter.element(this.clearButton).isEnabled(); + } + + checkClearButtonIsDisplayed() { + Util.waitUntilElementIsVisible(this.filter.element(this.clearButton)); + return this; + } } diff --git a/e2e/pages/adf/searchFiltersPage.ts b/e2e/pages/adf/searchFiltersPage.ts index ab13b8b341..6d624a04fb 100644 --- a/e2e/pages/adf/searchFiltersPage.ts +++ b/e2e/pages/adf/searchFiltersPage.ts @@ -197,6 +197,7 @@ export class SearchFiltersPage { this.searchCategoriesPage.checkFilterIsDisplayed(this.sizeSliderFilter); return this; } + clickSizeSliderFilterHeader() { this.searchCategoriesPage.clickFilterHeader(this.sizeSliderFilter); return this; diff --git a/e2e/pages/adf/searchResultsPage.ts b/e2e/pages/adf/searchResultsPage.ts index 8c9a88e88f..87d3ff4478 100644 --- a/e2e/pages/adf/searchResultsPage.ts +++ b/e2e/pages/adf/searchResultsPage.ts @@ -121,6 +121,7 @@ export class SearchResultsPage { sortBySize(sortOrder) { this.sortBy(sortOrder, 'Size'); + return this; } sortAndCheckListIsOrderedByName(sortOrder) { diff --git a/lib/content-services/search/components/search-slider/search-slider.component.html b/lib/content-services/search/components/search-slider/search-slider.component.html index 8940014ecc..38a86c9c06 100644 --- a/lib/content-services/search/components/search-slider/search-slider.component.html +++ b/lib/content-services/search/components/search-slider/search-slider.component.html @@ -4,11 +4,12 @@ [max]="max" [step]="step" [thumbLabel]="thumbLabel" - (change)="onChangedHandler($event)"> + (change)="onChangedHandler($event)" + data-automation-id="slider-range">
-