inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[APPS-2136] migrate search-datetime-range to date-fns (#9004)

Browse Source 
* strongly typed forms

* migrate to date-fns

* [ci:force] mark moment pipes for deprecation

* [ci:force] try migrate the metadata smoke e2e

* [ci:force] remove dead code

* cleanup dead code and switch e2e to date-fns

* [ci:force] migrate tests

* revert metadata

* [ci:force] migrate e2e

* [ci:force] delete date util
This commit is contained in:
Denys Vuika
2023-10-18 07:56:10 +01:00
committed by GitHub
parent af24aceb65
commit 7d5fbecf3f
22 changed files with 350 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
e2e/core/pages/content-services.page.ts
View File

@@ -15,23 +15,13 @@
* limitations under the License.
*/
import {
DropActions,
BrowserActions,
BrowserVisibility,
DateUtil,
DocumentListPage,
DropdownPage,
Logger
} from '@alfresco/adf-testing';
import { DropActions, BrowserActions, BrowserVisibility, DocumentListPage, DropdownPage, Logger } from '@alfresco/adf-testing';
import { $$, browser, by, element, protractor, $ } from 'protractor';
import { FolderDialogPage } from './dialog/folder-dialog.page';
import { NavigationBarPage } from './navigation-bar.page';
import * as path from 'path';
export class ContentServicesPage {
columns = {
name: 'Display name',
size: 'Size',
@@ -94,28 +84,28 @@ export class ContentServicesPage {
await BrowserVisibility.waitUntilElementIsVisible(disabledDelete);
}
async deleteContent(content): Promise<void> {
async deleteContent(content: string): Promise<void> {
await this.contentList.clickOnActionMenu(content);
await BrowserActions.click(this.deleteContentElement);
await this.checkContentIsNotDisplayed(content);
}
async metadataContent(content): Promise<void> {
async metadataContent(content: string): Promise<void> {
await this.contentList.clickOnActionMenu(content);
await BrowserActions.click(this.metadataAction);
}
async versionManagerContent(content): Promise<void> {
async versionManagerContent(content: string): Promise<void> {
await this.contentList.clickOnActionMenu(content);
await BrowserActions.click(this.versionManagerAction);
}
async clickFileHyperlink(fileName): Promise<void> {
async clickFileHyperlink(fileName: string): Promise<void> {
const hyperlink = this.contentList.dataTablePage().getFileHyperlink(fileName);
await BrowserActions.click(hyperlink);
}
async checkFileHyperlinkIsEnabled(fileName): Promise<void> {
async checkFileHyperlinkIsEnabled(fileName: string): Promise<void> {
const hyperlink = this.contentList.dataTablePage().getFileHyperlink(fileName);
await BrowserVisibility.waitUntilElementIsVisible(hyperlink);
}
@@ -129,38 +119,6 @@ export class ContentServicesPage {
return this.contentList.dataTablePage().getAllRowsColumnValues(this.columns.nodeId);
}
checkElementsDateSortedAsc(elements) {
let sorted = true;
let i = 0;
while (elements.length > 1 && sorted === true && i < (elements.length - 1)) {
const left = DateUtil.parse(elements[i], 'DD-MM-YY');
const right = DateUtil.parse(elements[i + 1], 'DD-MM-YY');
if (left > right) {
sorted = false;
}
i++;
}
return sorted;
}
checkElementsDateSortedDesc(elements) {
let sorted = true;
let i = 0;
while (elements.length > 1 && sorted === true && i < (elements.length - 1)) {
const left = DateUtil.parse(elements[i], 'DD-MM-YY');
const right = DateUtil.parse(elements[i + 1], 'DD-MM-YY');
if (left < right) {
sorted = false;
}
i++;
}
return sorted;
}
// @deprecated prefer waitTillContentLoaded
async checkDocumentListElementsAreDisplayed(): Promise<void> {
await this.checkAcsContainer();
@@ -368,16 +326,16 @@ export class ContentServicesPage {
await DropActions.dropFile(this.dragAndDrop, file);
}
async checkLockIsDisplayedForElement(name): Promise<void> {
async checkLockIsDisplayedForElement(name: string): Promise<void> {
const lockButton = $(`div.adf-datatable-cell[data-automation-id="${name}"] button`);
await BrowserVisibility.waitUntilElementIsVisible(lockButton);
}
async getColumnValueForRow(file, columnName): Promise<string> {
async getColumnValueForRow(file: string, columnName: string): Promise<string> {
return this.contentList.dataTablePage().getColumnValueForRow(this.columns.name, file, columnName);
}
async checkEmptyFolderTextToBe(text): Promise<void> {
async checkEmptyFolderTextToBe(text: string): Promise<void> {
await BrowserVisibility.waitUntilElementIsVisible(this.emptyFolder);
await expect(await this.emptyFolder.getText()).toContain(text);
}
@@ -386,7 +344,7 @@ export class ContentServicesPage {
await expect(await BrowserActions.getAttribute(this.emptyFolderImage, 'src')).toContain(url);
}
async getRowIconImageUrl(fileName): Promise<string> {
async getRowIconImageUrl(fileName: string): Promise<string> {
const iconRow = $(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${fileName}"] img`);
return BrowserActions.getAttribute(iconRow, 'src');
}
@@ -415,12 +373,16 @@ export class ContentServicesPage {
}
async checkDocumentCardPropertyIsShowed(elementName: string, propertyName: string): Promise<void> {
const elementProperty = $(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${elementName}"][title="${propertyName}"]`);
const elementProperty = $(
`.app-document-list-container div.adf-datatable-cell[data-automation-id="${elementName}"][title="${propertyName}"]`
);
await BrowserVisibility.waitUntilElementIsVisible(elementProperty);
}
async getAttributeValueForElement(elementName: string, propertyName: string): Promise<string> {
const elementSize = $(`.app-document-list-container div.adf-datatable-cell[data-automation-id="${elementName}"][title="${propertyName}"] span`);
const elementSize = $(
`.app-document-list-container div.adf-datatable-cell[data-automation-id="${elementName}"][title="${propertyName}"] span`
);
return BrowserActions.getText(elementSize);
}
@@ -429,24 +391,10 @@ export class ContentServicesPage {
await BrowserVisibility.waitUntilElementIsVisible(elementMenu);
}
async navigateToCardFolder(folderName: string): Promise<void> {
await BrowserActions.closeMenuAndDialogs();
const folderCard = $(`.app-document-list-container div.adf-image-table-cell.adf-datatable-cell[data-automation-id="${folderName}"]`);
await BrowserActions.click(folderCard);
const folderSelected = $(`.adf-datatable-row.adf-is-selected div[data-automation-id="${folderName}"].adf-datatable-cell--image`);
await BrowserVisibility.waitUntilElementIsVisible(folderSelected);
await browser.actions().sendKeys(protractor.Key.ENTER).perform();
}
async selectGridSortingFromDropdown(sortingOption: string): Promise<void> {
await this.sortingDropdown.selectDropdownOption(sortingOption);
}
async checkRowIsDisplayed(rowName: string): Promise<void> {
const row = this.contentList.dataTablePage().getCellElementByValue(this.columns.name, rowName);
await BrowserVisibility.waitUntilElementIsVisible(row);
}
async checkSelectedSiteIsDisplayed(siteName: string): Promise<void> {
await this.siteListDropdown.checkOptionIsSelected(siteName);
}

3
e2e/core/pages/dialog/folder-dialog.page.ts
View File

@@ -19,7 +19,6 @@ import { $$ } from 'protractor';
import { BrowserActions } from '@alfresco/adf-testing';
export class FolderDialogPage {
folderDialog = $$('adf-folder-dialog').first();
folderNameField = this.folderDialog.$('#adf-folder-name-input');
createUpdateButton = this.folderDialog.$('#adf-folder-create-button');
@@ -29,7 +28,7 @@ export class FolderDialogPage {
await BrowserActions.click(this.createUpdateButton);
}
async addFolderName(folderName): Promise<void> {
async addFolderName(folderName: string): Promise<void> {
await BrowserActions.clearSendKeys(this.folderNameField, folderName);
}
}

6
e2e/core/pages/dialog/upload-toggles.page.ts
View File

@@ -19,7 +19,6 @@ import { $, browser } from 'protractor';
import { BrowserActions, BrowserVisibility, TogglePage } from '@alfresco/adf-testing';
export class UploadTogglesPage {
togglePage = new TogglePage();
multipleFileUploadToggle = $('#adf-multiple-upload-switch');
uploadFolderToggle = $('#adf-folder-upload-switch');
@@ -44,11 +43,6 @@ export class UploadTogglesPage {
await this.togglePage.enableToggle(this.uploadFolderToggle);
}
async checkMultipleFileUploadToggleIsEnabled(): Promise<void> {
const enabledToggle = $('mat-slide-toggle[id="adf-multiple-upload-switch"][class*="mat-checked"]');
await BrowserVisibility.waitUntilElementIsVisible(enabledToggle);
}
async checkMaxSizeToggleIsEnabled(): Promise<void> {
const enabledToggle = $('mat-slide-toggle[id="adf-max-size-filter-upload-switch"][class*="mat-checked"]');
await BrowserVisibility.waitUntilElementIsVisible(enabledToggle);

5
e2e/core/pages/metadata-view.page.ts
View File

@@ -31,7 +31,6 @@ export class MetadataViewPage {
size = $(`[data-automation-id='card-textitem-value-content.sizeInBytes']`);
description = $(`span[data-automation-id='card-textitem-value-properties.cm:description']`);
author = $(`[data-automation-id='card-textitem-value-properties.cm:author']`);
titleProperty = $(`span[data-automation-id='card-textitem-value-properties.cm:title'] span`);
editIcon = $(`button[data-automation-id='meta-data-card-toggle-edit']`);
informationButton = $(`button[data-automation-id='meta-data-card-toggle-expand']`);
informationSpan = $(`span[data-automation-id='meta-data-card-toggle-expand-label']`);
@@ -96,10 +95,6 @@ export class MetadataViewPage {
return BrowserActions.getInputValue(this.author);
}
async getTitleProperty(): Promise<string> {
return BrowserActions.getText(this.titleProperty);
}
async editIconIsDisplayed(): Promise<void> {
await BrowserVisibility.waitUntilElementIsVisible(this.editIcon);
}

51
e2e/core/pages/trashcan.page.ts
View File

@@ -1,51 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* 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 { BrowserActions, BrowserVisibility, DocumentListPage } from '@alfresco/adf-testing';
import { browser, $$, $ } from 'protractor';
export class TrashcanPage {
private contentList = new DocumentListPage($('adf-document-list'));
private restoreButton = $(`button[title='Restore']`);
async numberOfResultsDisplayed(): Promise<number> {
const rows = $$('adf-document-list div[class*="adf-datatable-body"] adf-datatable-row[class*="adf-datatable-row"]');
return rows.count();
}
async waitForTableBody(): Promise<void> {
const tableBody = $$('adf-document-list .adf-datatable-body').first();
await BrowserVisibility.waitUntilElementIsVisible(tableBody);
}
async checkTrashcanIsEmpty(): Promise<void> {
await BrowserVisibility.waitUntilElementIsVisible($('adf-empty-content'));
}
getDocumentList(): DocumentListPage {
return this.contentList;
}
async clickRestore(): Promise<void> {
await BrowserActions.click(this.restoreButton);
await browser.sleep(2000);
}
async checkRestoreButtonIsNotDisplayed(): Promise<void> {
await BrowserVisibility.waitUntilElementIsNotVisible(this.restoreButton);
}
}

2
e2e/models/ACS/file.model.ts
View File

@@ -33,7 +33,7 @@ export class FileModel {
lastPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_text;
secondPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.second_page_text;
lastPageNumber = browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_number;
createdAt = '';
createdAt: Date = null;
password = '';
createdByUser = new CreatedByModel();
modifiedByUser = new CreatedByModel();

10
e2e/process-services/pages/task-details.page.ts
View File

@@ -81,7 +81,7 @@ export class TaskDetailsPage {
return BrowserActions.getText(this.taskDetailsTitle);
}
async checkSelectedForm(formName): Promise<void> {
async checkSelectedForm(formName: string): Promise<void> {
await this.attachFormDropdown.checkOptionIsSelected(formName);
}
@@ -263,7 +263,7 @@ export class TaskDetailsPage {
await BrowserActions.clearSendKeys(this.addPeopleField, user);
}
async selectUserToInvolve(user): Promise<void> {
async selectUserToInvolve(user: string): Promise<void> {
const row = this.getRowsUser(user);
await BrowserActions.click(row);
}
@@ -282,15 +282,14 @@ export class TaskDetailsPage {
return $(`div[data-automation-id="adf-people-full-name-${user.replace(' ', '-')}"]`);
}
async removeInvolvedUser(user): Promise<void> {
async removeInvolvedUser(user: string): Promise<void> {
const row = this.getRowsUser(user).element(by.xpath('ancestor::adf-datatable-row[contains(@class, "adf-datatable-row")]'));
await BrowserActions.click(row.$('button[data-automation-id="action_menu_0"]'));
await BrowserVisibility.waitUntilElementIsVisible(this.removeInvolvedPeople);
await BrowserActions.click(this.removeInvolvedPeople);
}
async getInvolvedUserEmail(user): Promise<string> {
async getInvolvedUserEmail(user: string): Promise<string> {
return BrowserActions.getText($(`div[data-automation-id="adf-people-email-${user.replace(' ', '-')}"]`));
}
@@ -401,5 +400,4 @@ export class TaskDetailsPage {
await BrowserVisibility.waitUntilElementIsVisible(this.saveFormButton);
await BrowserActions.click(this.saveFormButton);
}
}

13
e2e/process-services/pages/tasks.page.ts
View File

@@ -21,12 +21,11 @@ import { TaskDetailsPage } from './task-details.page';
import { FiltersPage } from './filters.page';
import { ChecklistDialog } from './dialog/create-checklist-dialog.page';
import { TasksListPage } from './tasks-list.page';
import { element, by, $ } from 'protractor';
import { BrowserVisibility, BrowserActions, FormFields } from '@alfresco/adf-testing';
import { $, by, element } from 'protractor';
import { BrowserActions, BrowserVisibility, FormFields } from '@alfresco/adf-testing';
export class TasksPage {
createButton = $('button[data-automation-id="create-button"');
newTaskButton = $('button[data-automation-id="btn-start-task"]');
addChecklistButton = $('button[class*="adf-add-to-checklist-button"]');
rowByRowName = by.xpath('ancestor::mat-chip');
checklistContainer = $('div[class*="checklist-menu"]');
@@ -42,10 +41,10 @@ export class TasksPage {
return new StartTaskDialogPage();
}
async createTask({ name, description = '', dueDate = '', formName = 'None'}): Promise<void> {
async createTask({ name, description = '', dueDate = '', formName = 'None' }): Promise<void> {
await this.clickOnCreateButton();
await BrowserActions.clickExecuteScript('button[data-automation-id="btn-start-task"]');
const dialog = new StartTaskDialogPage();
const dialog = new StartTaskDialogPage();
await dialog.addName(name);
await dialog.addDescription(description);
await dialog.addDueDate(dueDate);
@@ -88,8 +87,7 @@ export class TasksPage {
getChecklistByName(name: string) {
const elem = this.getRowsName(name);
const row = elem.element(this.rowByRowName);
return row;
return elem.element(this.rowByRowName);
}
async checkChecklistIsDisplayed(name: string): Promise<void> {
@@ -150,5 +148,4 @@ export class TasksPage {
async clickSortByNameDesc(): Promise<any> {
return this.tasksListPage().getDataTable().sortByColumn('DESC', 'name');
}
}

248
e2e/process-services/tasks/custom-tasks-filters.e2e.ts
View File

@@ -15,23 +15,24 @@
* limitations under the License.
*/
import { createApiService,
import {
createApiService,
ApplicationsUtil,
ArrayUtil,
DateUtil,
LoginPage,
PaginationPage,
ProcessUtil, TaskUtil,
UsersActions
ProcessUtil,
TaskUtil,
UsersActions,
UserModel
} from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { TaskListDemoPage } from './../pages/task-list-demo.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TaskActionsApi, TaskRepresentation, TasksApi } from '@alfresco/js-api';
import { AppDefinitionRepresentation, ProcessInstanceRepresentation, TaskActionsApi, TaskRepresentation, TasksApi } from '@alfresco/js-api';
import { addDays, format, subDays } from 'date-fns';
describe('Start Task - Custom App', () => {
const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const secondApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST;
@@ -49,25 +50,66 @@ describe('Start Task - Custom App', () => {
const taskActionsApi = new TaskActionsApi(apiService.getInstance());
const tasksApi = new TasksApi(apiService.getInstance());
let processUserModel;
let appRuntime; let secondAppRuntime;
let appModel;
const completedTasks = [];
const paginationTasksName = ['t01', 't02', 't03', 't04', 't05', 't06', 't07', 't08', 't09', 't10', 't11', 't12', 't13', 'taskOne', 'taskTwo', 'taskOne'];
let processUserModel: UserModel;
let appRuntime: AppDefinitionRepresentation;
let secondAppRuntime: AppDefinitionRepresentation;
let appModel: AppDefinitionRepresentation;
const completedTasks: TaskRepresentation[] = [];
const paginationTasksName = [
't01',
't02',
't03',
't04',
't05',
't06',
't07',
't08',
't09',
't10',
't11',
't12',
't13',
'taskOne',
'taskTwo',
'taskOne'
];
const completedTasksName = ['completed01', 'completed02', 'completed03'];
const allTasksName = ['t01', 'taskOne', 'taskTwo', 'taskOne', 't13', 't12', 't11', 't10', 't09', 't08', 't07', 't06', 't05', 't04', 't03', 't02',
'User Task', 'User Task', 'User Task', 'User Task'];
const invalidAppId = '1234567890'; const invalidName = 'invalidName'; const invalidTaskId = '0000';
const allTasksName = [
't01',
'taskOne',
'taskTwo',
'taskOne',
't13',
't12',
't11',
't10',
't09',
't08',
't07',
't06',
't05',
't04',
't03',
't02',
'User Task',
'User Task',
'User Task',
'User Task'
];
const invalidAppId = '1234567890';
const invalidName = 'invalidName';
const invalidTaskId = '0000';
const noTasksFoundMessage = 'No Tasks Found';
const nrOfTasks = 20;
let currentPage = 1;
const totalNrOfPages = 'of 4';
const currentDateStandardFormat = DateUtil.formatDate('YYYY-MM-DDTHH:mm:ss.SSSZ');
const DATE_FORMAT = `yyyy-MM-dd'T'HH:mm:ss.SSSXXX`;
const currentDateStandardFormat = format(new Date(), DATE_FORMAT);
const beforeDate = format(subDays(new Date(), 1), 'MM/dd/yyyy');
const currentDate = DateUtil.formatDate('MM/DD/YYYY');
const currentDate = format(new Date(), 'MM/dd/yyyy');
const afterDate = format(addDays(new Date(), 1), 'MM/dd/yyyy');
let taskWithDueDate;
let processDefinitionId;
let taskWithDueDate: TaskRepresentation;
let processDefinitionId: ProcessInstanceRepresentation;
const itemsPerPage = {
five: '5',
@@ -106,17 +148,21 @@ describe('Start Task - Custom App', () => {
}
for (let i = 0; i < 3; i++) {
completedTasks[i] = await tasksApi.createNewTask(new TaskRepresentation({
name: completedTasksName[i],
dueDate: new Date(DateUtil.formatDate('YYYY-MM-DDTHH:mm:ss.SSSZ', new Date(), i + 2))
}));
completedTasks[i] = await tasksApi.createNewTask(
new TaskRepresentation({
name: completedTasksName[i],
dueDate: addDays(new Date(), i + 2)
})
);
await taskActionsApi.completeTask(completedTasks[i].id);
}
taskWithDueDate = await tasksApi.createNewTask(new TaskRepresentation({
name: paginationTasksName[0],
dueDate: new Date(currentDateStandardFormat)
}));
taskWithDueDate = await tasksApi.createNewTask(
new TaskRepresentation({
name: paginationTasksName[0],
dueDate: new Date(currentDateStandardFormat)
})
);
await loginPage.login(processUserModel.username, processUserModel.password);
});
@@ -132,9 +178,12 @@ describe('Start Task - Custom App', () => {
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfTasks + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(nrOfTasks);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName)).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName)).toEqual(true);
});
await expect(await paginationPage.getCurrentPage()).toEqual('Page 1');
await expect(await paginationPage.getTotalPages()).toEqual('of 1');
@@ -150,9 +199,12 @@ describe('Start Task - Custom App', () => {
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfTasks + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(nrOfTasks);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName)).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName)).toEqual(true);
});
await paginationPage.checkNextPageButtonIsDisabled();
await paginationPage.checkPreviousPageButtonIsDisabled();
});
@@ -164,9 +216,12 @@ describe('Start Task - Custom App', () => {
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 5))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 5))).toEqual(true);
});
await paginationPage.clickOnNextPage();
@@ -176,30 +231,43 @@ describe('Start Task - Custom App', () => {
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 6-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(5, 10))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(5, 10))).toEqual(true);
});
await paginationPage.clickOnNextPage();
currentPage++;
await taskListSinglePage.taskList().getDataTable().waitTillContentLoaded();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
await expect(await paginationPage.getPaginationRange()).toEqual(
'Showing 11-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks
);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(10, 15))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(10, 15))).toEqual(true);
});
await paginationPage.clickOnNextPage();
currentPage++;
await taskListSinglePage.taskList().getDataTable().waitTillContentLoaded();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks);
await expect(await paginationPage.getPaginationRange()).toEqual(
'Showing 16-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks
);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(15, 20))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(15, 20))).toEqual(true);
});
});
it('[C286364] 10 Items per page', async () => {
@@ -209,18 +277,24 @@ describe('Start Task - Custom App', () => {
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.tenValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 10))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 10))).toEqual(true);
});
await paginationPage.clickOnNextPage();
currentPage++;
await taskListSinglePage.taskList().getDataTable().waitTillContentLoaded();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.tenValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(10, 20))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(10, 20))).toEqual(true);
});
});
it('[C286363] 15 Items per page', async () => {
@@ -228,24 +302,32 @@ describe('Start Task - Custom App', () => {
await taskListSinglePage.typeItemsPerPage(itemsPerPage.fifteenValue);
await taskListSinglePage.taskList().getDataTable().waitTillContentLoaded();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue * currentPage + ' of ' + nrOfTasks);
await expect(await paginationPage.getPaginationRange()).toEqual(
'Showing 1-' + itemsPerPage.fifteenValue * currentPage + ' of ' + nrOfTasks
);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fifteenValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 15))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 15))).toEqual(true);
});
currentPage++;
await paginationPage.clickOnNextPage();
await taskListSinglePage.taskList().getDataTable().waitTillContentLoaded();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 16-' + nrOfTasks + ' of ' + nrOfTasks);
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(nrOfTasks - itemsPerPage.fifteenValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(15, 20))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(15, 20))).toEqual(true);
});
});
it('[C286366] Pagination is not displayed when no task is displayed', async () => {
await taskListSinglePage.typeAppId(secondAppRuntime.id);
await taskListSinglePage.typeAppId(secondAppRuntime.id.toString());
await expect(await taskListSinglePage.getAppId()).toEqual(secondAppRuntime.id.toString());
await taskListSinglePage.paginationPage().checkPaginationIsNotDisplayed();
@@ -272,9 +354,12 @@ describe('Start Task - Custom App', () => {
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 5))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(0, 5))).toEqual(true);
});
currentPage++;
@@ -288,9 +373,12 @@ describe('Start Task - Custom App', () => {
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(5, 10))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(5, 10))).toEqual(true);
});
currentPage++;
await taskListSinglePage.typePage(currentPage);
@@ -302,9 +390,12 @@ describe('Start Task - Custom App', () => {
await paginationPage.checkPageSelectorIsDisplayed();
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(10, 15))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(10, 15))).toEqual(true);
});
currentPage++;
await taskListSinglePage.typePage(currentPage);
@@ -317,9 +408,12 @@ describe('Start Task - Custom App', () => {
await expect(await taskListSinglePage.taskList().getDataTable().numberOfRows()).toBe(itemsPerPage.fiveValue);
await taskListSinglePage.taskList().getAllRowsNameColumn('Name').then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(15, 20))).toEqual(true);
});
await taskListSinglePage
.taskList()
.getAllRowsNameColumn('Name')
.then(async (list) => {
await expect(ArrayUtil.arrayContainsArray(list, allTasksName.slice(15, 20))).toEqual(true);
});
});
it('[C286405] Type invalid values to page field', async () => {
@@ -385,7 +479,7 @@ describe('Start Task - Custom App', () => {
});
it('[C280515] Should be able to see only the tasks of a specific app when typing the apps id in the appId field', async () => {
await taskListSinglePage.typeAppId(appRuntime.id);
await taskListSinglePage.typeAppId(appRuntime.id.toString());
await expect(await taskListSinglePage.getAppId()).toEqual(appRuntime.id.toString());
await taskListSinglePage.taskList().checkContentIsDisplayed(app.taskName, 'Name');
@@ -472,8 +566,12 @@ describe('Start Task - Custom App', () => {
});
it('[C286622] Should be able to see only tasks that are part of a specific process when processDefinitionId is set', async () => {
const processDefinitionIds = [processDefinitionId.processDefinitionId, processDefinitionId.processDefinitionId,
processDefinitionId.processDefinitionId, processDefinitionId.processDefinitionId];
const processDefinitionIds = [
processDefinitionId.processDefinitionId,
processDefinitionId.processDefinitionId,
processDefinitionId.processDefinitionId,
processDefinitionId.processDefinitionId
];
await navigationBarPage.clickTaskListButton();
await taskListSinglePage.clickResetButton();

13
e2e/search/components/search-date-range.e2e.ts
View File

@@ -15,11 +15,12 @@
* limitations under the License.
*/
import { BrowserActions, DataTableComponentPage, DateUtil, LoginPage } from '@alfresco/adf-testing';
import { BrowserActions, DataTableComponentPage, LoginPage } from '@alfresco/adf-testing';
import { browser, ElementFinder } from 'protractor';
import { SearchBarPage } from '../pages/search-bar.page';
import { SearchFiltersPage } from '../pages/search-filters.page';
import { SearchResultsPage } from '../pages/search-results.page';
import { format, parse, addDays } from 'date-fns';
describe('Search Date Range Filter', () => {
const loginPage = new LoginPage();
@@ -77,7 +78,7 @@ describe('Search Date Range Filter', () => {
await datePickerToday.selectTodayDate();
await datePickerToday.checkDatePickerIsNotDisplayed();
let fromDate = await dateRangeFilter.getFromDate();
fromDate = DateUtil.formatDate('DD-MM-YY', DateUtil.parse(fromDate, 'DD-MMM-YY'));
fromDate = format(parse(fromDate, 'd-MMM-yy', new Date()), 'dd-MM-yy');
await dateRangeFilter.checkApplyButtonIsDisabled();
@@ -87,7 +88,7 @@ describe('Search Date Range Filter', () => {
await toDatePicker.selectTodayDate();
await toDatePicker.checkDatePickerIsNotDisplayed();
let toDate = await dateRangeFilter.getToDate();
toDate = DateUtil.formatDate('DD-MM-YY', DateUtil.parse(toDate, 'DD-MMM-YY'), 1);
toDate = format(addDays(parse(toDate, 'dd-MMM-yy', new Date()), 1), 'dd-MM-yy');
await dateRangeFilter.checkApplyButtonIsEnabled();
await dateRangeFilter.clickApplyButton();
@@ -97,10 +98,10 @@ describe('Search Date Range Filter', () => {
const results = (await dataTable.geCellElementDetail('Created')) as ElementFinder[];
for (const currentResult of results) {
const currentDate = await BrowserActions.getAttribute(currentResult, 'title');
const currentDateFormatted = DateUtil.parse(currentDate, 'MMM DD, YYYY, h:mm:ss a');
const currentDateFormatted = parse(currentDate, 'MMM dd, yyyy, h:mm:ss a', new Date());
await expect(currentDateFormatted <= DateUtil.parse(toDate, 'DD-MM-YY')).toBe(true);
await expect(currentDateFormatted >= DateUtil.parse(fromDate, 'DD-MM-YY')).toBe(true);
await expect(currentDateFormatted <= parse(toDate, 'dd-MM-yy', new Date())).toBe(true);
await expect(currentDateFormatted >= parse(fromDate, 'dd-MM-yy', new Date())).toBe(true);
}
});
});

37
e2e/search/components/search-number-range.e2e.ts
View File

@@ -15,9 +15,10 @@
* limitations under the License.
*/
import { createApiService, BrowserActions,
import {
createApiService,
BrowserActions,
DataTableComponentPage,
DateUtil,
LocalStorageUtil,
LoginPage,
UploadActions,
@@ -31,9 +32,10 @@ import { SearchFiltersPage } from '../pages/search-filters.page';
import { FileModel } from '../../models/ACS/file.model';
import { browser, ElementFinder } from 'protractor';
import { SearchConfiguration } from '../search.config';
import { parse } from 'date-fns';
import { NodeEntry } from '@alfresco/js-api';
describe('Search Number Range Filter', () => {
const loginPage = new LoginPage();
const searchBarPage = new SearchBarPage();
const searchFilters = new SearchFiltersPage();
@@ -54,7 +56,8 @@ describe('Search Number Range Filter', () => {
location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path
});
let file2Bytes; let file0Bytes;
let file2Bytes: NodeEntry;
let file0Bytes: NodeEntry;
const apiService = createApiService();
const usersActions = new UsersActions(apiService);
@@ -85,7 +88,7 @@ describe('Search Number Range Filter', () => {
await uploadActions.deleteFileOrFolder(file0Bytes.entry.id);
await navigationBarPage.clickLogoutButton();
});
});
beforeEach(async () => {
await searchFilters.checkSizeRangeFilterIsDisplayed();
@@ -95,7 +98,7 @@ describe('Search Number Range Filter', () => {
afterEach(async () => {
await browser.refresh();
});
});
it('[C276921] Should display default values for Number Range widget', async () => {
await sizeRangeFilter.checkFromFieldIsDisplayed();
@@ -173,7 +176,7 @@ describe('Search Number Range Filter', () => {
await searchResults.dataTable.waitTillContentLoaded();
await searchResults.sortBySize('DESC');
const results = await dataTable.geCellElementDetail('Size') as ElementFinder[];
const results = (await dataTable.geCellElementDetail('Size')) as ElementFinder[];
for (const currentResult of results) {
const currentSize = await BrowserActions.getAttribute(currentResult, 'title');
@@ -203,7 +206,7 @@ describe('Search Number Range Filter', () => {
await searchResults.sortBySize('DESC');
const results = await dataTable.geCellElementDetail('Size') as ElementFinder[];
const results = (await dataTable.geCellElementDetail('Size')) as ElementFinder[];
for (const currentResult of results) {
const currentSize = await BrowserActions.getAttribute(currentResult, 'title');
if (currentSize && currentSize.trim() !== '') {
@@ -217,7 +220,7 @@ describe('Search Number Range Filter', () => {
await searchResults.dataTable.waitTillContentLoaded();
await searchResults.sortBySize('DESC');
const resultsSize = await dataTable.geCellElementDetail('Size') as ElementFinder[];
const resultsSize = (await dataTable.geCellElementDetail('Size')) as ElementFinder[];
for (const currentResult of resultsSize) {
const currentSize = await BrowserActions.getAttribute(currentResult, 'title');
if (currentSize && currentSize.trim() !== '') {
@@ -225,7 +228,7 @@ describe('Search Number Range Filter', () => {
}
}
const resultsDisplay = await dataTable.geCellElementDetail('Display name') as ElementFinder[];
const resultsDisplay = (await dataTable.geCellElementDetail('Display name')) as ElementFinder[];
for (const currentResult of resultsDisplay) {
const name = await BrowserActions.getAttribute(currentResult, 'title');
if (name && name.trim() !== '') {
@@ -263,7 +266,7 @@ describe('Search Number Range Filter', () => {
await searchResults.sortBySize('DESC');
const results = await dataTable.geCellElementDetail('Size') as ElementFinder[];
const results = (await dataTable.geCellElementDetail('Size')) as ElementFinder[];
for (const currentResult of results) {
const currentSize = await BrowserActions.getAttribute(currentResult, 'title');
if (currentSize && currentSize.trim() !== '') {
@@ -302,7 +305,7 @@ describe('Search Number Range Filter', () => {
await sizeRangeFilter.clickApplyButton();
await searchResults.sortBySize('DESC');
const results = await dataTable.geCellElementDetail('Size') as ElementFinder[];
const results = (await dataTable.geCellElementDetail('Size')) as ElementFinder[];
for (const currentResult of results) {
const currentSize = await BrowserActions.getAttribute(currentResult, 'title');
if (currentSize && currentSize.trim() !== '') {
@@ -315,7 +318,7 @@ describe('Search Number Range Filter', () => {
await expect(await sizeRangeFilter.getFromNumber()).toEqual('');
await expect(await sizeRangeFilter.getToNumber()).toEqual('');
const resultsSize = await dataTable.geCellElementDetail('Size') as ElementFinder[];
const resultsSize = (await dataTable.geCellElementDetail('Size')) as ElementFinder[];
for (const currentResult of resultsSize) {
const currentSize = await BrowserActions.getAttribute(currentResult, 'title');
if (currentSize && currentSize.trim() !== '') {
@@ -393,7 +396,7 @@ describe('Search Number Range Filter', () => {
await searchFilters.clickSizeRangeFilterHeader();
await searchFilters.checkSizeRangeFilterIsExpanded();
const fromYear = (new Date()).getFullYear();
const fromYear = new Date().getFullYear();
const toYear = fromYear + 1;
await sizeRangeFilter.checkToFieldIsDisplayed();
@@ -406,15 +409,15 @@ describe('Search Number Range Filter', () => {
await searchResults.sortByCreated('DESC');
const results = await dataTable.geCellElementDetail('Created') as ElementFinder[];
const results = (await dataTable.geCellElementDetail('Created')) as ElementFinder[];
for (const currentResult of results) {
const currentDate = await BrowserActions.getAttribute(currentResult, 'title');
const currentDateFormatted = DateUtil.parse(currentDate, 'MMM DD, YYYY, h:mm:ss a');
const currentDateFormatted = parse(currentDate, 'MMM dd, yyyy, h:mm:ss a', new Date());
await expect(currentDateFormatted.getFullYear() <= toYear).toBe(true);
await expect(currentDateFormatted.getFullYear() >= fromYear).toBe(true);
}
});
});
it('[C277139] Should be able to set To field to be exclusive', async () => {
await navigationBarPage.navigateToContentServices();

34
e2e/search/pages/search-results.page.ts
View File

@@ -17,14 +17,11 @@
import { BrowserVisibility, DataTableComponentPage, SearchSortingPickerPage } from '@alfresco/adf-testing';
import { $ } from 'protractor';
import { ContentServicesPage } from '../../core/pages/content-services.page';
export class SearchResultsPage {
noResultsMessage = $('.app-no-result-message');
dataTable = new DataTableComponentPage();
searchSortingPicker = new SearchSortingPickerPage();
contentServices = new ContentServicesPage();
getNodeHighlight(content: string) {
return this.dataTable.getCellByRowContentAndColumn('Display name', content, 'Search');
@@ -50,28 +47,6 @@ export class SearchResultsPage {
await BrowserVisibility.waitUntilElementIsVisible(this.noResultsMessage);
}
async checkNoResultMessageIsNotDisplayed(): Promise<void> {
await BrowserVisibility.waitUntilElementIsNotVisible(this.noResultsMessage);
}
async navigateToFolder(content: string): Promise<void> {
await this.contentServices.openFolder(content);
}
async deleteContent(content: string): Promise<void> {
await this.contentServices.deleteContent(content);
}
async sortByName(sortOrder: string): Promise<void> {
await this.searchSortingPicker.sortBy(sortOrder, 'Name');
await this.dataTable.waitTillContentLoaded();
}
async sortByAuthor(sortOrder: string): Promise<void> {
await this.searchSortingPicker.sortBy(sortOrder, 'Author');
await this.dataTable.waitTillContentLoaded();
}
async sortByCreated(sortOrder: string): Promise<void> {
await this.searchSortingPicker.sortBy(sortOrder, 'Created');
await this.dataTable.waitTillContentLoaded();
@@ -81,13 +56,4 @@ export class SearchResultsPage {
await this.searchSortingPicker.sortBy(sortOrder, 'Size');
await this.dataTable.waitTillContentLoaded();
}
async checkListIsOrderedByNameAsc(): Promise<any> {
return this.contentServices.contentList.dataTablePage().checkListIsSorted('ASC', 'Display name');
}
async checkListIsOrderedByNameDesc(): Promise<any> {
return this.contentServices.contentList.dataTablePage().checkListIsSorted('DESC', 'Display name');
}
}

26
e2e/search/search-component.e2e.ts
View File

@@ -17,7 +17,8 @@
import { browser } from 'protractor';
import { createApiService,
import {
createApiService,
BrowserActions,
LocalStorageUtil,
LoginPage,
@@ -34,10 +35,9 @@ import { FileModel } from '../models/ACS/file.model';
import { FolderModel } from '../models/ACS/folder.model';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import { SearchConfiguration } from './search.config';
import { NodesApi } from '@alfresco/js-api';
import { NodeEntry, NodesApi } from '@alfresco/js-api';
describe('Search component - Search Bar', () => {
const search = {
inactive: {
firstChar: 'x',
@@ -65,25 +65,29 @@ describe('Search component - Search Bar', () => {
const firstFolderName = StringUtil.generateRandomString(16);
const secondFolderName = StringUtil.generateRandomString(16);
const thirdFolderName = StringUtil.generateRandomString(16);
const filesToDelete = [];
const filesToDelete: NodeEntry[] = [];
const firstFileModel = new FileModel({
name: filename, shortName: filename.substring(0, 8)
name: filename,
shortName: filename.substring(0, 8)
});
const firstFolderModel = new FolderModel({
name: firstFolderName, shortName: firstFolderName.substring(0, 8)
name: firstFolderName,
shortName: firstFolderName.substring(0, 8)
});
const secondFolder = new FolderModel({
name: secondFolderName, shortName: secondFolderName.substring(0, 8)
name: secondFolderName,
shortName: secondFolderName.substring(0, 8)
});
const thirdFolder = new FolderModel({
name: thirdFolderName, shortName: thirdFolderName.substring(0, 8)
name: thirdFolderName,
shortName: thirdFolderName.substring(0, 8)
});
const term = 'Zoizo';
let fileHighlightUploaded;
let fileHighlightUploaded: NodeEntry;
beforeAll(async () => {
await apiService.loginWithProfile('admin');
@@ -116,7 +120,6 @@ describe('Search component - Search Bar', () => {
afterAll(async () => {
for (const currentNode of filesToDelete) {
await uploadActions.deleteFileOrFolder(currentNode.entry.id);
}
await navigationBarPage.clickLogoutButton();
});
@@ -249,7 +252,7 @@ describe('Search component - Search Bar', () => {
await searchResultPage.checkContentIsDisplayed(firstFileModel.name);
});
it('[C290137] Should be able to search by \'%\'', async () => {
it("[C290137] Should be able to search by '%'", async () => {
await openSearchBar();
await searchBarPage.enterTextAndPressEnter('%');
@@ -268,7 +271,6 @@ describe('Search component - Search Bar', () => {
await searchBarPage.enterTextAndPressEnter(term);
await searchResultPage.dataTable.waitTillContentLoaded();
});
it('[C299212] Should be able to configure the highlight option for search results', async () => {

16
e2e/search/search-filters.e2e.ts
View File

@@ -35,9 +35,9 @@ import {
import { browser } from 'protractor';
import { SearchConfiguration } from './search.config';
import { getYear } from 'date-fns';
import { NodeEntry } from '@alfresco/js-api';
describe('Search Filters', () => {
const loginPage = new LoginPage();
const searchBarPage = new SearchBarPage();
const searchFiltersPage = new SearchFiltersPage();
@@ -59,7 +59,8 @@ describe('Search Filters', () => {
const uniqueFileName3 = fileNamePrefix + StringUtil.generateRandomString(5);
const fileModel = new FileModel({
name: filename, shortName: filename.substring(0, 8)
name: filename,
shortName: filename.substring(0, 8)
});
const pngFileModel = new FileModel({
@@ -82,7 +83,11 @@ describe('Search Filters', () => {
name: `${uniqueFileName3}.txt`
});
let fileUploaded; let fileTypePng; let fileTypeTxt1; let fileTypeJpg; let fileTypeTxt2;
let fileUploaded: NodeEntry;
let fileTypePng: NodeEntry;
let fileTypeTxt1: NodeEntry;
let fileTypeJpg: NodeEntry;
let fileTypeTxt2: NodeEntry;
const filter = { type: 'TYPE-PNG Image' };
@@ -90,9 +95,7 @@ describe('Search Filters', () => {
beforeAll(async () => {
await apiService.loginWithProfile('admin');
await usersActions.createUser(acsUser);
await apiService.login(acsUser.username, acsUser.password);
fileUploaded = await uploadActions.uploadFile(fileModel.location, fileModel.name, '-my-');
@@ -104,7 +107,6 @@ describe('Search Filters', () => {
await loginPage.login(acsUser.username, acsUser.password);
await browser.sleep(browser.params.testConfig.timeouts.index_search); // wait search index previous file/folder uploaded
});
beforeEach(async () => {
@@ -140,7 +142,6 @@ describe('Search Filters', () => {
group: 'Size facet queries'
};
await LocalStorageUtil.setConfigField('search', JSON.stringify(jsonFile));
await searchBarPage.clickOnSearchIcon();
@@ -257,7 +258,6 @@ describe('Search Filters', () => {
});
describe('Change config', () => {
it('[C291802] Should be able to filter facet fields with "Contains"', async () => {
await navigationBarPage.navigateToContentServices();

18
e2e/search/search-multiselect.e2e.ts
View File

@@ -23,7 +23,7 @@ import { SearchFiltersPage } from './pages/search-filters.page';
import { FileModel } from '../models/ACS/file.model';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants');
import { SitesApi } from '@alfresco/js-api';
import { NodeEntry, SiteEntry, SitesApi } from '@alfresco/js-api';
describe('Search Component - Multi-Select Facet', () => {
const loginPage = new LoginPage();
@@ -52,10 +52,14 @@ describe('Search Component - Multi-Select Facet', () => {
name: `${randomName}.txt`
});
let site; let userOption;
let site: SiteEntry;
let userOption: string;
describe('', () => {
let jpgFile; let jpgFileSite; let txtFile; let txtFileSite;
let jpgFile: NodeEntry;
let jpgFileSite: NodeEntry;
let txtFile: NodeEntry;
let txtFileSite: NodeEntry;
const acsUser = new UserModel();
const jpgFileInfo = new FileModel({
@@ -67,11 +71,8 @@ describe('Search Component - Multi-Select Facet', () => {
await createSite(acsUser);
jpgFile = await uploadActions.uploadFile(jpgFileInfo.location, jpgFileInfo.name, '-my-');
jpgFileSite = await uploadActions.uploadFile(jpgFileInfo.location, jpgFileInfo.name, site.entry.guid);
txtFile = await uploadActions.uploadFile(txtFileInfo.location, txtFileInfo.name, '-my-');
txtFileSite = await uploadActions.uploadFile(txtFileInfo.location, txtFileInfo.name, site.entry.guid);
await browser.sleep(browser.params.testConfig.timeouts.index_search);
@@ -132,7 +133,8 @@ describe('Search Component - Multi-Select Facet', () => {
});
describe('', () => {
let jpgFile; let txtFile;
let jpgFile: NodeEntry;
let txtFile: NodeEntry;
const userUploadingTxt = new UserModel();
const userUploadingImg = new UserModel();
@@ -195,7 +197,7 @@ describe('Search Component - Multi-Select Facet', () => {
});
describe('', () => {
let txtFile;
let txtFile: NodeEntry;
const acsUser = new UserModel();
beforeAll(async () => {