[ADF-NO-ISSUE] update e2e js-api 3 (#4124)

* update e2e js-api node

* fix protractor import

* use new client

* fix protractor conf comaptibility

* processClient fix

* new js-api

* fix new import

* fix identity call

* fix identity call

* remove aut param

* fix model

* fix model

* increase timeout CS bigFile

* Refactor task details e2e tests

* Fix e2e test

* Rebase branch
This commit is contained in:
Eugenio Romano
2019-03-15 00:06:55 +00:00
committed by GitHub
parent 8126dfc6cb
commit 88870cd4da
107 changed files with 201 additions and 250 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
import { ModelsActions } from '../actions/APS/models.actions';
@@ -30,7 +30,7 @@ import resources = require('../util/resources');
import { ViewerPage } from '../pages/adf/viewerPage';
import { AppsActions } from '../actions/APS/apps.actions';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
describe('Start Task - Task App', () => {
@@ -26,7 +26,7 @@ import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
import { by } from 'protractor';
@@ -27,7 +27,7 @@ import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import fs = require('fs');
import path = require('path');
@@ -24,7 +24,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
@@ -27,7 +27,7 @@ import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
@@ -25,7 +25,7 @@ import { FiltersPage } from '../pages/adf/process-services/filtersPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
@@ -25,7 +25,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
describe('New Process Filters', () => {
@@ -27,7 +27,7 @@ import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { Util } from '../util/util';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions';
import { UsersActions } from '../actions/users.actions';
@@ -26,7 +26,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
@@ -25,7 +25,7 @@ import { ProcessDetailsPage } from '../pages/adf/process-services/processDetails
import { ProcessListPage } from '../pages/adf/process-services/processListPage';
import { StartProcessPage } from '../pages/adf/process-services/startProcessPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
+1 -1
View File
@@ -23,7 +23,7 @@ import { AmountWidget } from '../pages/adf/process-services/widgets/amountWidget
import { NumberWidget } from '../pages/adf/process-services/widgets/numberWidget';
import TestConfig = require('../test.config');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
describe('Form Component', () => {
@@ -27,7 +27,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import { browser } from 'protractor';
@@ -28,7 +28,7 @@ import Task = require('../models/APS/Task');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import { browser } from 'protractor';
@@ -24,7 +24,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import { browser } from 'protractor';
@@ -22,7 +22,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
+1 -1
View File
@@ -27,7 +27,7 @@ import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import fs = require('fs');
import path = require('path');
@@ -28,7 +28,7 @@ import { Util } from '../util/util';
import path = require('path');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
import { FileModel } from '../models/ACS/fileModel';
@@ -27,7 +27,7 @@ import { AppNavigationBarPage } from '../pages/adf/process-services/appNavigatio
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import { ProcessListPage } from '../pages/adf/process-services/processListPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
@@ -21,7 +21,7 @@ import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/pr
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import { browser } from 'protractor';
@@ -24,7 +24,7 @@ import { ProcessDetailsPage } from '../pages/adf/process-services/processDetails
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
@@ -26,7 +26,7 @@ import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { Util } from '../util/util';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
+1 -1
View File
@@ -29,7 +29,7 @@ import Task = require('../models/APS/Task');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import fs = require('fs');
import path = require('path');
@@ -36,7 +36,7 @@ import { Tenant } from '../models/APS/tenant';
import { FileModel } from '../models/ACS/fileModel';
import dateFormat = require('dateformat');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import path = require('path');
describe('Start Process Component', () => {
@@ -30,7 +30,7 @@ import { FileModel } from '../models/ACS/fileModel';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
@@ -31,7 +31,7 @@ import { FileModel } from '../models/ACS/fileModel';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { Util } from '../util/util';
import fs = require('fs');
@@ -32,7 +32,7 @@ import { Util } from '../util/util';
import path = require('path');
import fs = require('fs');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
import { FileModel } from '../models/ACS/fileModel';
+1 -1
View File
@@ -26,7 +26,7 @@ import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
@@ -28,7 +28,7 @@ import { FiltersPage } from '../pages/adf/process-services/filtersPage';
import { StandaloneTask } from '../models/APS/standaloneTask';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
describe('Task Details - Form', () => {
@@ -26,7 +26,7 @@ import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions';
+75 -122
View File
@@ -17,7 +17,7 @@
import TestConfig = require('../test.config');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
import { Tenant } from '../models/APS/tenant';
import Task = require('../models/APS/Task');
@@ -79,8 +79,11 @@ describe('Task Details component', () => {
it('[C260506] Should display task details for standalone task - Task App', async () => {
processServices.goToTaskApp().clickTasksButton();
taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
taskPage.createNewTask().addName(tasks[1]).addDescription('Description')
.addForm(app.formName).clickStartButton();
taskPage.createNewTask()
.addName(tasks[1])
.addDescription('Description')
.addForm(app.formName)
.clickStartButton();
expect(taskPage.taskDetails().getTitle()).toEqual('Activities');
let allTasks = await browser.controlFlow().execute(async () => {
@@ -91,21 +94,14 @@ describe('Task Details component', () => {
taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(taskModel.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : taskModel.getDescription());
expect(taskPage.taskDetails().getDescription()).toEqual(taskModel.getDescription());
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(taskModel.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : taskModel.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(taskModel.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : taskModel.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(taskModel.getParentTaskName() === null ? CONSTANTS.TASK_DETAILS.NO_PARENT : taskModel.getParentTaskName());
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(taskModel.getParentTaskId() === null ? '' : taskModel.getParentTaskId());
expect(taskPage.taskDetails().getDuration())
.toEqual(taskModel.getDuration() === null ? '' : taskModel.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(taskModel.getEndDate() === null ? '' : dateFormat(taskModel.getEndDate(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getCategory()).toEqual(CONSTANTS.TASK_DETAILS.NO_CATEGORY);
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT);
expect(taskPage.taskDetails().getParentTaskId()).toEqual('');
expect(taskPage.taskDetails().getDuration()).toEqual('');
expect(taskPage.taskDetails().getEndDate()).toEqual('');
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.RUNNING);
let taskForm = await browser.controlFlow().execute(async () => {
@@ -114,15 +110,17 @@ describe('Task Details component', () => {
formModel = new FormModel(taskForm);
expect(taskPage.taskDetails().getFormName())
.toEqual(formModel.getName() === null ? CONSTANTS.TASK_DETAILS.NO_FORM : formModel.getName());
expect(taskPage.taskDetails().getFormName()).toEqual(formModel.getName());
});
it('[C263946] Should display task details for standalone task - Custom App', async () => {
processServices.goToApp(appModel.name).clickTasksButton();
taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
taskPage.createNewTask().addName(tasks[1]).addDescription('Description')
.addForm(app.formName).clickStartButton();
taskPage.createNewTask()
.addName(tasks[1])
.addDescription('Description')
.addForm(app.formName)
.clickStartButton();
expect(taskPage.taskDetails().getTitle()).toEqual('Activities');
let allTasks = await browser.controlFlow().execute(async () => {
@@ -134,21 +132,14 @@ describe('Task Details component', () => {
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(taskModel.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : taskModel.getDescription());
expect(taskPage.taskDetails().getDescription()).toEqual(taskModel.getDescription());
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(taskModel.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : taskModel.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(taskModel.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : taskModel.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(taskModel.getParentTaskName() === null ? CONSTANTS.TASK_DETAILS.NO_PARENT : taskModel.getParentTaskName());
expect(taskPage.taskDetails().getDuration())
.toEqual(taskModel.getDuration() === null ? '' : taskModel.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(taskModel.getEndDate() === null ? '' : dateFormat(taskModel.getEndDate(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(taskModel.getParentTaskId() === null ? '' : taskModel.getParentTaskId());
expect(taskPage.taskDetails().getCategory()).toEqual(taskModel.getCategory());
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT);
expect(taskPage.taskDetails().getDuration()).toEqual('' );
expect(taskPage.taskDetails().getEndDate()).toEqual('');
expect(taskPage.taskDetails().getParentTaskId()).toEqual('');
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.RUNNING);
let taskForm = await browser.controlFlow().execute(async () => {
@@ -157,8 +148,7 @@ describe('Task Details component', () => {
formModel = new FormModel(taskForm);
expect(taskPage.taskDetails().getFormName())
.toEqual(formModel.getName() === null ? CONSTANTS.TASK_DETAILS.NO_FORM : formModel.getName());
expect(taskPage.taskDetails().getFormName()).toEqual(formModel.getName());
});
it('[C286706] Should display task details for task - Task App', async () => {
@@ -180,21 +170,14 @@ describe('Task Details component', () => {
taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(taskModel.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : taskModel.getDescription());
expect(taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION);
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(taskModel.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : taskModel.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(taskModel.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : taskModel.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(appModel.definition.models[0].name);
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(taskModel.getParentTaskId() === null ? '' : taskModel.getParentTaskId());
expect(taskPage.taskDetails().getDuration())
.toEqual(taskModel.getDuration() === null ? '' : taskModel.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(taskModel.getEndDate() === null ? '' : dateFormat(taskModel.getEndDate(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getCategory()).toEqual(CONSTANTS.TASK_DETAILS.NO_CATEGORY);
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(appModel.definition.models[0].name);
expect(taskPage.taskDetails().getDuration()).toEqual('' );
expect(taskPage.taskDetails().getEndDate()).toEqual('');
expect(taskPage.taskDetails().getParentTaskId()).toEqual('');
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.RUNNING);
let taskForm = await browser.controlFlow().execute(async () => {
@@ -226,21 +209,14 @@ describe('Task Details component', () => {
taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(taskModel.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : taskModel.getDescription());
expect(taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION);
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(taskModel.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : taskModel.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(taskModel.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : taskModel.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(appModel.definition.models[0].name);
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(taskModel.getParentTaskId() === null ? '' : taskModel.getParentTaskId());
expect(taskPage.taskDetails().getDuration())
.toEqual(taskModel.getDuration() === null ? '' : taskModel.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(taskModel.getEndDate() === null ? '' : dateFormat(taskModel.getEndDate(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getCategory()).toEqual(CONSTANTS.TASK_DETAILS.NO_CATEGORY);
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(appModel.definition.models[0].name);
expect(taskPage.taskDetails().getDuration()).toEqual('' );
expect(taskPage.taskDetails().getEndDate()).toEqual('');
expect(taskPage.taskDetails().getParentTaskId()).toEqual('');
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.RUNNING);
let taskForm = await browser.controlFlow().execute(async () => {
@@ -275,26 +251,18 @@ describe('Task Details component', () => {
return this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' }));
});
let checklistTask = new TaskModel(allTasks.data[0]);
let taskModel = new TaskModel(allTasks.data[0]);
taskPage.tasksListPage().checkContentIsDisplayed(checklistTask.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(checklistTask.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(checklistTask.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(checklistTask.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : taskModel.getDescription());
expect(taskPage.taskDetails().getAssignee()).toEqual(checklistTask.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(checklistTask.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : checklistTask.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(checklistTask.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : checklistTask.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(checklistTask.getParentTaskName() === null ? CONSTANTS.TASK_DETAILS.NO_PARENT : checklistTask.getParentTaskName());
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(checklistTask.getParentTaskId() === null ? '' : checklistTask.getParentTaskId());
expect(taskPage.taskDetails().getDuration())
.toEqual(checklistTask.getDuration() === null ? '' : checklistTask.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(checklistTask.getEndDate() === null ? '' : dateFormat(checklistTask.getEndDate(), TASK_DATA_FORMAT));
taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION);
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory()).toEqual(CONSTANTS.TASK_DETAILS.NO_CATEGORY);
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT);
expect(taskPage.taskDetails().getDuration()).toEqual('');
expect(taskPage.taskDetails().getEndDate()).toEqual('');
expect(taskPage.taskDetails().getParentTaskId()).toEqual(taskModel.getParentTaskId());
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.RUNNING);
});
@@ -320,26 +288,18 @@ describe('Task Details component', () => {
return this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' }));
});
let checklistTask = new TaskModel(allTasks.data[0]);
let taskModel = new TaskModel(allTasks.data[0]);
taskPage.tasksListPage().checkContentIsDisplayed(checklistTask.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(checklistTask.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(checklistTask.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(checklistTask.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : taskModel.getDescription());
expect(taskPage.taskDetails().getAssignee()).toEqual(checklistTask.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(checklistTask.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : checklistTask.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(checklistTask.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : checklistTask.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(checklistTask.getParentTaskName() === null ? CONSTANTS.TASK_DETAILS.NO_PARENT : checklistTask.getParentTaskName());
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(checklistTask.getParentTaskId() === null ? '' : checklistTask.getParentTaskId());
expect(taskPage.taskDetails().getDuration())
.toEqual(checklistTask.getDuration() === null ? '' : checklistTask.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(checklistTask.getEndDate() === null ? '' : dateFormat(checklistTask.getEndDate(), TASK_DATA_FORMAT));
taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION);
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory()).toEqual(taskModel.getCategory());
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT);
expect(taskPage.taskDetails().getDuration()).toEqual('');
expect(taskPage.taskDetails().getEndDate()).toEqual('');
expect(taskPage.taskDetails().getParentTaskId()).toEqual(taskModel.getParentTaskId());
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.RUNNING);
});
@@ -361,25 +321,18 @@ describe('Task Details component', () => {
return this.alfrescoJsApi.activiti.taskApi.getTask(taskId.id);
});
let completedTask = new TaskModel(getTaskResponse);
taskPage.tasksListPage().checkContentIsDisplayed(completedTask.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(completedTask.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(completedTask.getId());
expect(taskPage.taskDetails().getDescription())
.toEqual(completedTask.getDescription() === null ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : completedTask.getDescription());
expect(taskPage.taskDetails().getAssignee()).toEqual(completedTask.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory())
.toEqual(completedTask.getCategory() === null ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : completedTask.getCategory());
expect(taskPage.taskDetails().getDueDate())
.toEqual(completedTask.getDueDate() === null ? CONSTANTS.TASK_DETAILS.NO_DATE : completedTask.getDueDate());
expect(taskPage.taskDetails().getParentName())
.toEqual(completedTask.getParentTaskName() === null ? CONSTANTS.TASK_DETAILS.NO_PARENT : completedTask.getParentTaskName());
expect(taskPage.taskDetails().getParentTaskId())
.toEqual(completedTask.getParentTaskId() === null ? '' : completedTask.getParentTaskId());
expect(taskPage.taskDetails().getDuration())
.toEqual(completedTask.getDuration() === null ? '' : completedTask.getDuration() + ' ms');
expect(taskPage.taskDetails().getEndDate())
.toEqual(completedTask.getEndDate() === null ? '' : dateFormat(completedTask.getEndDate(), TASK_DATA_FORMAT));
let taskModel = new TaskModel(getTaskResponse);
taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName());
expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT));
expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId());
expect(taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION);
expect(taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName());
expect(taskPage.taskDetails().getCategory()).toEqual(CONSTANTS.TASK_DETAILS.NO_CATEGORY);
expect(taskPage.taskDetails().getDueDate()).toEqual(CONSTANTS.TASK_DETAILS.NO_DATE);
expect(taskPage.taskDetails().getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT);
expect(taskPage.taskDetails().getDuration()).toEqual(taskPage.taskDetails().getDuration());
expect(taskPage.taskDetails().getEndDate()).toEqual(taskPage.taskDetails().getEndDate());
expect(taskPage.taskDetails().getParentTaskId()).toEqual('');
expect(taskPage.taskDetails().getStatus()).toEqual(CONSTANTS.TASK_STATUS.COMPLETED);
});
@@ -28,7 +28,7 @@ import { AppNavigationBarPage } from '../pages/adf/process-services/appNavigatio
import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles';
import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import { browser } from 'protractor';
@@ -253,7 +253,7 @@ describe('Task', () => {
it('[C260350] Should display a new filter when a filter is added', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'New Task Filter';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -277,7 +277,7 @@ describe('Task', () => {
it('[C286447] Should display the task filter icon when a custom filter is added', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'New Task Filter with icon';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-cloud';
@@ -317,7 +317,7 @@ describe('Task', () => {
it('[C260353] Should display changes on a filter when this filter is edited', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'New Task Filter';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -334,7 +334,7 @@ describe('Task', () => {
taskFiltersDemoPage.customTaskFilter('New Task Filter').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Task Filter Edited';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -356,7 +356,7 @@ describe('Task', () => {
it('[C286448] Should display changes on a task filter when this filter icon is edited', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Task Filter Edited icon';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -373,7 +373,7 @@ describe('Task', () => {
taskFiltersDemoPage.customTaskFilter('Task Filter Edited icon').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Task Filter Edited icon';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-cloud';
@@ -397,7 +397,7 @@ describe('Task', () => {
it('[C260354] Should not display task filter when this filter is deleted', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'New Task Filter';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -25,7 +25,7 @@ import { TasksListPage } from '../pages/adf/process-services/tasksListPage';
import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage';
import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import { browser } from 'protractor';
@@ -106,7 +106,7 @@ describe('Task Filters Sorting', () => {
// });
it('[C277254] Should display tasks under new filter from newest to oldest when they are completed', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Newest first';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -129,7 +129,7 @@ describe('Task Filters Sorting', () => {
it('[C277255] Should display tasks under new filter from oldest to newest when they are completed', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Newest last';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -151,7 +151,7 @@ describe('Task Filters Sorting', () => {
it('[C277256] Should display tasks under new filter from closest due date to farthest when they are completed', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Due first';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -173,7 +173,7 @@ describe('Task Filters Sorting', () => {
it('[C277257] Should display tasks under new filter from farthest due date to closest when they are completed', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Due last';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -195,7 +195,7 @@ describe('Task Filters Sorting', () => {
it('[C277258] Should display tasks under new filter from newest to oldest when they are open ', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Newest first Open';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -217,7 +217,7 @@ describe('Task Filters Sorting', () => {
it('[C277259] Should display tasks under new filter from oldest to newest when they are open', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Newest last Open';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -239,7 +239,7 @@ describe('Task Filters Sorting', () => {
it('[C277260] Should display tasks under new filter from closest due date to farthest when they are open', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Due first Open';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -261,7 +261,7 @@ describe('Task Filters Sorting', () => {
it('[C277261] Should display tasks under new filter from farthest due date to closest when they are open', () => {
browser.controlFlow().execute(async () => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
let newFilter = new UserProcessInstanceFilterRepresentation();
newFilter.name = 'Due last Open';
newFilter.appId = appId;
newFilter.icon = 'glyphicon-filter';
@@ -25,7 +25,7 @@ import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import AlfrescoApi = require('alfresco-js-api-node');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../../actions/APS/apps.actions';
import { UsersActions } from '../../actions/users.actions';
import { browser } from 'protractor';