diff --git a/e2e/pages/adf/content-services/search/components/search-checkList.ts b/e2e/pages/adf/content-services/search/components/search-checkList.ts index 56164d2939..8c9a4efbbf 100644 --- a/e2e/pages/adf/content-services/search/components/search-checkList.ts +++ b/e2e/pages/adf/content-services/search/components/search-checkList.ts @@ -64,15 +64,17 @@ export class SearchCheckListPage { checkSearchFilterInputIsDisplayed() { Util.waitUntilElementIsVisible(this.filter.all(this.inputBy).first()); + return this; } searchInFilter(option) { - let inputElement = this.filter.all(this.inputBy).first(); Util.waitUntilElementIsClickable(this.filter); + let inputElement = this.filter.all(this.inputBy).first(); Util.waitUntilElementIsClickable(inputElement); inputElement.clear(); this.filter.all(this.inputBy).first().sendKeys(option); + return this; } checkShowLessButtonIsNotDisplayed() { @@ -120,7 +122,7 @@ export class SearchCheckListPage { } getBucketNumberOfFilterType(option) { - let fileTypeFilter = this.filter.element(by.css('mat-checkbox[data-automation-id*=".' + option + '"] span')); + let fileTypeFilter = this.filter.all(by.css('mat-checkbox[data-automation-id*=".' + option + '"] span')).first(); Util.waitUntilElementIsVisible(fileTypeFilter); let bucketNumber = fileTypeFilter.getText().then((valueOfBucket) => { let numberOfBucket = valueOfBucket.split('(')[1]; diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index abff053840..83fbf9ac6c 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -20,6 +20,9 @@ import { SearchDialog } from '../pages/adf/dialog/searchDialog'; import { SearchFiltersPage } from '../pages/adf/searchFiltersPage'; import { PaginationPage } from '../pages/adf/paginationPage'; import { ContentListPage } from '../pages/adf/dialog/contentListPage'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ConfigEditorPage } from '../pages/adf/configEditorPage'; +import { SearchResultsPage } from '../pages/adf/searchResultsPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FileModel } from '../models/ACS/fileModel'; @@ -31,6 +34,7 @@ import resources = require('../util/resources'); import AlfrescoApi = require('alfresco-js-api-node'); import { UploadActions } from '../actions/ACS/upload.actions'; import { browser } from 'protractor'; +import { SearchConfiguration } from './search.config'; describe('Search Filters', () => { @@ -40,6 +44,9 @@ describe('Search Filters', () => { let uploadActions = new UploadActions(); let paginationPage = new PaginationPage(); let contentList = new ContentListPage(); + let navigationBar = new NavigationBarPage(); + let configEditor = new ConfigEditorPage(); + let searchResults = new SearchResultsPage(); let acsUser = new AcsUserModel(); @@ -149,4 +156,24 @@ describe('Search Filters', () => { }); }); + it('[C291802] Should be able to filter facet fields with "Contains"', () => { + let searchConfiguration = new SearchConfiguration(); + let jsonFile = searchConfiguration.getConfiguration(); + navigationBar.clickConfigEditorButton(); + configEditor.clickSearchConfiguration(); + configEditor.clickClearButton(); + jsonFile['filterWithContains'] = true; + configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)); + configEditor.clickSaveButton(); + + searchDialog.clickOnSearchIcon() + .enterTextAndPressEnter('*'); + + searchResults.tableIsLoaded(); + + searchFiltersPage.creatorCheckListFiltersPage() + .searchInFilter('dminis') + .checkCheckListOptionIsDisplayed('Administrator'); + }); + }); diff --git a/e2e/search/search.config.ts b/e2e/search/search.config.ts index 33ce0375f6..aeb87fce04 100644 --- a/e2e/search/search.config.ts +++ b/e2e/search/search.config.ts @@ -60,11 +60,11 @@ export class SearchConfiguration { 'facetFields': { 'expanded': true, 'fields': [ - {'field': 'content.mimetype', 'mincount': 1, 'label': '1:Type'}, - {'field': 'content.size', 'mincount': 1, 'label': '2:Size'}, - {'field': 'creator', 'mincount': 1, 'label': '3:Creator'}, - {'field': 'modifier', 'mincount': 1, 'label': '4:Modifier'}, - {'field': 'created', 'mincount': 1, 'label': '5:Created'} + {'field': 'content.mimetype', 'mincount': 1, 'label': 'SEARCH.FACET_FIELDS.TYPE'}, + {'field': 'content.size', 'mincount': 1, 'label': 'SEARCH.FACET_FIELDS.SIZE'}, + {'field': 'creator', 'mincount': 1, 'label': 'SEARCH.FACET_FIELDS.CREATOR'}, + {'field': 'modifier', 'mincount': 1, 'label': 'SEARCH.FACET_FIELDS.MODIFIER'}, + {'field': 'created', 'mincount': 1, 'label': 'SEARCH.FACET_FIELDS.CREATED'} ] }, 'facetQueries': {