diff --git a/e2e/actions/APS-cloud/apiservice.ts b/e2e/actions/APS-cloud/apiservice.ts index 6a354a8316..e416f6ab68 100644 --- a/e2e/actions/APS-cloud/apiservice.ts +++ b/e2e/actions/APS-cloud/apiservice.ts @@ -15,8 +15,9 @@ * limitations under the License. */ -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import TestConfig = require('../../test.config'); + export class ApiService { HOST_SSO = TestConfig.adf.hostSso; @@ -49,7 +50,6 @@ export class ApiService { async performBpmOperation(path, method, queryParams, postBody) { const uri = this.HOST_BPM + path; const pathParams = {}, formParams = {}; - const authNames = []; const contentTypes = ['application/json']; const accepts = ['application/json']; @@ -57,8 +57,8 @@ export class ApiService { 'Authorization': 'bearer ' + this.apiService.oauth2Auth.token }; - return this.apiService.bpmClient.callCustomApi(uri, method, pathParams, queryParams, headerParams, formParams, postBody, - authNames, contentTypes, accepts, {}) + return this.apiService.processClient.callCustomApi(uri, method, pathParams, queryParams, headerParams, formParams, postBody, + contentTypes, accepts, Object) .catch((error) => { throw (error); }); @@ -67,7 +67,6 @@ export class ApiService { async performIdentityOperation(path, method, queryParams, postBody) { const uri = this.HOST_IDENTITY + path; const pathParams = {}, formParams = {}; - const authNames = []; const contentTypes = ['application/json']; const accepts = ['application/json']; @@ -75,8 +74,8 @@ export class ApiService { 'Authorization': 'bearer ' + this.apiService.oauth2Auth.token }; - return this.apiService.bpmClient.callCustomApi(uri, method, pathParams, queryParams, headerParams, formParams, postBody, - authNames, contentTypes, accepts, {}) + return this.apiService.processClient.callCustomApi(uri, method, pathParams, queryParams, headerParams, formParams, postBody, + contentTypes, accepts, Object) .catch((error) => { throw (error); }); diff --git a/e2e/actions/APS/apps.actions.ts b/e2e/actions/APS/apps.actions.ts index 1d71bbb755..99459acb8c 100644 --- a/e2e/actions/APS/apps.actions.ts +++ b/e2e/actions/APS/apps.actions.ts @@ -25,7 +25,7 @@ import { browser } from 'protractor'; export class AppsActions { async getProcessTaskId(alfrescoJsApi, processId) { - let taskList = await alfrescoJsApi.activiti.taskApi.listTasks(); + let taskList = await alfrescoJsApi.activiti.taskApi.listTasks({}); let taskId = -1; taskList.data.forEach((task) => { diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index 3ab185e0d0..966e15f973 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -29,7 +29,7 @@ import resources = require('../../util/resources'); import CONSTANTS = require('../../util/constants'); import { Util } from '../../util/util'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts index 0c7a801cc3..e512df5f9b 100644 --- a/e2e/content-services/directives/create-folder-directive.e2e.ts +++ b/e2e/content-services/directives/create-folder-directive.e2e.ts @@ -23,7 +23,7 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, Key } from 'protractor'; describe('Create folder directive', function () { diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index 74c25fe467..47a52e595b 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/e2e/content-services/directives/create-library-directive.e2e.ts @@ -22,7 +22,7 @@ import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, Key } from 'protractor'; import { Util } from '../../util/util'; diff --git a/e2e/content-services/document-list/document-list-actions.e2e.ts b/e2e/content-services/document-list/document-list-actions.e2e.ts index c7f6300a05..74f10b3872 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -21,7 +21,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; 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 { UploadActions } from '../../actions/ACS/upload.actions'; import { FileModel } from '../../models/ACS/fileModel'; import { Util } from '../../util/util'; diff --git a/e2e/content-services/document-list/document-list-component.e2e.ts b/e2e/content-services/document-list/document-list-component.e2e.ts index 3c444ff3df..ff35981cab 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -24,7 +24,7 @@ import { ViewerPage } from '../../pages/adf/viewerPage'; 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 { UploadActions } from '../../actions/ACS/upload.actions'; import { ErrorPage } from '../../pages/adf/errorPage'; import { FileModel } from '../../models/ACS/fileModel'; diff --git a/e2e/content-services/document-list/document-list-pagination.e2e.ts b/e2e/content-services/document-list/document-list-pagination.e2e.ts index bef133cc1e..ff911b55c2 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -26,7 +26,7 @@ import { FolderModel } from '../../models/ACS/folderModel'; import TestConfig = require('../../test.config'); import { Util } from '../../util/util'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; diff --git a/e2e/content-services/lock-file.e2e.ts b/e2e/content-services/lock-file.e2e.ts index 1eda783196..2f3251373c 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -30,7 +30,7 @@ import { Util } from '../util/util'; 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 { UploadActions } from '../actions/ACS/upload.actions'; describe('Lock File', () => { diff --git a/e2e/content-services/notifications-component.e2e.ts b/e2e/content-services/notifications-component.e2e.ts index f4b603c200..21496ea342 100644 --- a/e2e/content-services/notifications-component.e2e.ts +++ b/e2e/content-services/notifications-component.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '../pages/adf/loginPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import TestConfig = require('../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NotificationPage } from '../pages/adf/notificationPage'; import { browser } from 'protractor'; diff --git a/e2e/content-services/permissions-component.e2e.ts b/e2e/content-services/permissions-component.e2e.ts index 81d0116839..cd80d93b67 100644 --- a/e2e/content-services/permissions-component.e2e.ts +++ b/e2e/content-services/permissions-component.e2e.ts @@ -21,7 +21,7 @@ import { ContentServicesPage } from '../pages/adf/contentServicesPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; 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 { FileModel } from '../models/ACS/fileModel'; import { UploadActions } from '../actions/ACS/upload.actions'; import { Util } from '../util/util'; diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index bd7fd78f6c..1f5ffab72b 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -27,7 +27,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index 3c4c030f95..64483aa5f0 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -26,7 +26,7 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; 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 { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; diff --git a/e2e/content-services/tag-component.e2e.ts b/e2e/content-services/tag-component.e2e.ts index cf9a9af3cb..d5c6fda406 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/e2e/content-services/tag-component.e2e.ts @@ -25,7 +25,7 @@ import { AppNavigationBarPage } from '../pages/adf/process-services/appNavigatio 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 { UploadActions } from '../actions/ACS/upload.actions'; import { Util } from '../util/util'; diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index f9b150e33e..a53605f4dc 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -27,7 +27,7 @@ import { FolderModel } from '../models/ACS/folderModel'; import TestConfig = require('../test.config'); import { Util } from '../util/util'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; describe('Trashcan - Pagination', () => { diff --git a/e2e/content-services/tree-view-component.e2e.ts b/e2e/content-services/tree-view-component.e2e.ts index 09343f4c30..69298ce622 100644 --- a/e2e/content-services/tree-view-component.e2e.ts +++ b/e2e/content-services/tree-view-component.e2e.ts @@ -23,7 +23,7 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import TestConfig = require('../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; describe('Tree View Component', () => { diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index 76be3e2b26..6a51a33b8d 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -30,7 +30,7 @@ import { FolderModel } from '../../models/ACS/folderModel'; 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 { DropActions } from '../../actions/drop.actions'; import { ConfigEditorPage } from '../../pages/adf/configEditorPage'; diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index 8a41e663c9..4f95b84857 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -31,7 +31,7 @@ import resources = require('../../util/resources'); import { Util } from '../../util/util'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { DropActions } from '../../actions/drop.actions'; diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index 0b1076e551..a3e98851a5 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -33,7 +33,7 @@ import { FolderModel } from '../../models/ACS/folderModel'; import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); -import AlfrescoApi = require('alfresco-js-api-node'); +import AlfrescoApi = require('@alfresco/js-api'); import CONSTANTS = require('../../util/constants'); describe('Upload - User permission', () => { diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index a953879c6c..78644f1f63 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -27,7 +27,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { Util } from '../../util/util'; import path = require('path'); diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index 556ab521d5..dd4d6deffb 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -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 { UploadActions } from '../../actions/ACS/upload.actions'; import { NodeActions } from '../../actions/ACS/node.actions'; diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index 0b70e01ed9..f649a73173 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -27,7 +27,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { Util } from '../../util/util'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts index 35d2d5027a..49af53ec45 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -27,7 +27,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { Util } from '../../util/util'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; diff --git a/e2e/core/card-view/aspect-oriented-config.e2e.ts b/e2e/core/card-view/aspect-oriented-config.e2e.ts index 346911a5bb..d6b9c7b4a3 100644 --- a/e2e/core/card-view/aspect-oriented-config.e2e.ts +++ b/e2e/core/card-view/aspect-oriented-config.e2e.ts @@ -29,7 +29,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { check } from '../../util/material'; diff --git a/e2e/core/card-view/metadata-permissions.e2e.ts b/e2e/core/card-view/metadata-permissions.e2e.ts index 281a6d04f4..ff95461dd5 100644 --- a/e2e/core/card-view/metadata-permissions.e2e.ts +++ b/e2e/core/card-view/metadata-permissions.e2e.ts @@ -26,7 +26,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { Util } from '../../util/util'; diff --git a/e2e/core/card-view/metadata-properties.e2e.ts b/e2e/core/card-view/metadata-properties.e2e.ts index 04601180fc..b087b87a30 100644 --- a/e2e/core/card-view/metadata-properties.e2e.ts +++ b/e2e/core/card-view/metadata-properties.e2e.ts @@ -25,7 +25,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 { UploadActions } from '../../actions/ACS/upload.actions'; import { check, uncheck } from '../../util/material'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; diff --git a/e2e/core/card-view/metadata-smoke-tests.e2e.ts b/e2e/core/card-view/metadata-smoke-tests.e2e.ts index 4008314255..623ce61199 100644 --- a/e2e/core/card-view/metadata-smoke-tests.e2e.ts +++ b/e2e/core/card-view/metadata-smoke-tests.e2e.ts @@ -29,7 +29,7 @@ import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import dateFormat = require('dateformat'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index 8b4e2f66f6..5cf971315a 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/e2e/core/datatable/data-table-component-selection.e2e.ts @@ -21,7 +21,7 @@ import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage'; import TestConfig = require('../../test.config'); import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; describe('Datatable component - selection', () => { diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index 1342a07bcc..91f9f1ff18 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -21,7 +21,7 @@ import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; describe('Datatable component', () => { diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index 48a872b126..d2782b176e 100644 --- a/e2e/core/error-component.e2e.ts +++ b/e2e/core/error-component.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '../pages/adf/loginPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import TestConfig = require('../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { ErrorPage } from '../pages/adf/errorPage'; import { browser } from '../../node_modules/protractor'; diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 73f57f96ab..bd3df3c73b 100644 --- a/e2e/core/header-component.e2e.ts +++ b/e2e/core/header-component.e2e.ts @@ -21,7 +21,7 @@ import { HeaderPage } from '@alfresco/adf-testing'; import { SettingsPage } from '../pages/adf/settingsPage'; 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('Header Component', () => { diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts index 397569e641..07a655d3ef 100644 --- a/e2e/core/icons-component.e2e.ts +++ b/e2e/core/icons-component.e2e.ts @@ -21,7 +21,7 @@ import { IconsPage } from '../pages/adf/iconsPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import TestConfig = require('../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Universal Icon component', function () { diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index 09b45ed3db..c43847590f 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/e2e/core/infinite-scrolling.e2e.ts @@ -24,7 +24,7 @@ import { FolderModel } from '../models/ACS/folderModel'; import TestConfig = require('../test.config'); import { Util } from '../util/util'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; describe('Enable infinite scrolling', () => { diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index dfbc22869c..226ab74a62 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -28,7 +28,7 @@ import TestConfig = require('../../test.config'); import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { SettingsPage } from '../../pages/adf/settingsPage'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { Util } from '../../util/util'; import { ErrorPage } from '../../pages/adf/errorPage'; diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index 3c53c8e60a..3f464b445a 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -27,7 +27,7 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { SettingsPage } from '../../pages/adf/settingsPage'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { Util } from '../../util/util'; import { UploadActions } from '../../actions/ACS/upload.actions'; diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index fd57e45abc..ec2622d02e 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -24,7 +24,7 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; import { FileModel } from '../models/ACS/fileModel'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; import { Util } from '../util/util'; diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index 88f942ea95..619e1056c7 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -27,7 +27,7 @@ import PeopleAPI = require('../restAPI/ACS/PeopleAPI'); 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 { browser } from 'protractor'; diff --git a/e2e/core/viewer/viewer-component.e2e.ts b/e2e/core/viewer/viewer-component.e2e.ts index a781c21edc..8f6c4eb104 100644 --- a/e2e/core/viewer/viewer-component.e2e.ts +++ b/e2e/core/viewer/viewer-component.e2e.ts @@ -32,7 +32,7 @@ import { FileModel } from '../../models/ACS/fileModel'; import { FolderModel } from '../../models/ACS/folderModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; @@ -118,7 +118,6 @@ xdescribe('Viewer', () => { await this.alfrescoJsApi.login(acsUser.id, acsUser.password); pngFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileInfo.location, pngFileInfo.name, site.entry.guid); - done(); }); diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index cd3d2ca719..e3b65f7d28 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -28,7 +28,7 @@ import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; describe('Content Services Viewer', () => { diff --git a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts index fdada17c5f..99fb46e612 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -26,7 +26,7 @@ import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; describe('Viewer', () => { diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index a8dc80fa12..ebfca1aa6b 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -28,7 +28,7 @@ import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; describe('Viewer - properties', () => { diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index 4a2d47d81b..047eab0933 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -24,7 +24,7 @@ import TestConfig = require('../test.config'); import { Tenant } from '../models/APS/tenant'; import { User } from '../models/APS/user'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Analytics Smoke Test', () => { diff --git a/e2e/process-services-cloud/task-details-cloud.e2e.ts b/e2e/process-services-cloud/task-details-cloud.e2e.ts index b97455d9a2..8eddb81580 100644 --- a/e2e/process-services-cloud/task-details-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-details-cloud.e2e.ts @@ -20,6 +20,7 @@ import CONSTANTS = require('../util/constants'); import { Util } from '../util/util'; import moment = require('moment'); +import AlfrescoApi = require('@alfresco/js-api'); import { Tasks } from '../actions/APS-cloud/tasks'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index 0bcdf41e62..81f41ea622 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -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'; diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index 344a6f4369..078c0cba16 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -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', () => { diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index 43cde10a09..0593698dce 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -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'; diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index b24f0b55b6..bf7d649b35 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -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'); diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index db629cdbe8..7b8d1f0045 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -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'; diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index 78270003f6..3463827786 100644 --- a/e2e/process-services/comment-component-tasks.e2e.ts +++ b/e2e/process-services/comment-component-tasks.e2e.ts @@ -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'; diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index e9b26da7ec..1d06b82313 100644 --- a/e2e/process-services/custom-process-filters-sorting.e2e.ts +++ b/e2e/process-services/custom-process-filters-sorting.e2e.ts @@ -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'; diff --git a/e2e/process-services/custom-process-filters.e2e.ts b/e2e/process-services/custom-process-filters.e2e.ts index ac1719e602..1c70e05501 100644 --- a/e2e/process-services/custom-process-filters.e2e.ts +++ b/e2e/process-services/custom-process-filters.e2e.ts @@ -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', () => { diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index af583ac982..e4cc079d46 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -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'; diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index e832b6ac1d..b2f0bcfbe0 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -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'; diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index 4d382b7440..a741cd0ecc 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -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'; diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index 85dde8fed7..c1147093c9 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -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', () => { diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index 27e6b8fb9f..f80945ea6a 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index be1239312b..6b7fef4e94 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -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'; diff --git a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts index a17496d3fb..90fc71def3 100644 --- a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts +++ b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts @@ -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'; diff --git a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts index 36f2d1465a..385bf8d31b 100644 --- a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts @@ -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'; diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 9e38f000e8..0da1fbf159 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -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'); diff --git a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts index aad4a7f061..0ef2d1bae0 100644 --- a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts @@ -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'; diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index f3f5c8bc2a..67f0df957f 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -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'; diff --git a/e2e/process-services/processList-component.e2e.ts b/e2e/process-services/processList-component.e2e.ts index a18b45c6e1..670f12cc63 100644 --- a/e2e/process-services/processList-component.e2e.ts +++ b/e2e/process-services/processList-component.e2e.ts @@ -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'; diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index 21f204a0b7..336d773e49 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -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'; diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index ff750759d1..e5919a711a 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -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'; diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index 1d81966318..0e77fd077e 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -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'); diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 84266f81be..9f1f168c49 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -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', () => { diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index 4cff2cce93..34ba464179 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -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'; diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index 80f15f9a01..1b12c915fd 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -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'); diff --git a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts index 4aa35759e9..fa99f0b788 100644 --- a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts @@ -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'; diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index 10c5879708..1f6c50acfb 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -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'; diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index 1c57495e29..8bc686ff9d 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -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', () => { diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index 3b13d1dbab..cb62537167 100644 --- a/e2e/process-services/task-details-no-form.e2e.ts +++ b/e2e/process-services/task-details-no-form.e2e.ts @@ -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'; diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 9dc418c4cc..ff00e21aef 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -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); }); diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index 639c89b02c..23e9d3667d 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -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'; diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index fe8cab099c..815198727b 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -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'; diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 7cb929de01..4d79b24446 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index 3a816596a4..877b6707a3 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index a0ea625a35..96bee87462 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index 3a64299dc8..210e578222 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 8d9a0b30c5..5a98f527df 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index 8d65c13aa1..53f063f669 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index e6f91f8b75..4394594e57 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index 2933cc3e79..e7508c37f1 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index d7d9f0f2f8..f3b04f0809 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 806b36b3e9..ce98f1bbbe 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index e86ad7d27e..cb0d6ccdbf 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 03117a5717..e407db01a2 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index 22a29e555a..ebb05d3647 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index 9b58219b6c..0f9c4822e4 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index 79f07abb52..72dfceadfd 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -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'; diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index 2fa82b5555..e0bc6abdc3 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -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'; diff --git a/e2e/search/components/search-checkList.e2e.ts b/e2e/search/components/search-checkList.e2e.ts index d99db09ac2..d970c7d760 100644 --- a/e2e/search/components/search-checkList.e2e.ts +++ b/e2e/search/components/search-checkList.e2e.ts @@ -28,7 +28,7 @@ import TestConfig = require('../../test.config'); import { SearchConfiguration } from '../search.config'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; import { Util } from '../../util/util'; diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index dc4c346a2d..98edcf298c 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -27,7 +27,7 @@ import { SearchConfiguration } from '../search.config'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { DateUtil } from '../../util/dateUtil'; diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index d68c3d9a6f..6e7f547619 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -25,7 +25,7 @@ import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index 7464a7bc23..52f69681c5 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -28,7 +28,7 @@ import TestConfig = require('../../test.config'); import { SearchConfiguration } from '../search.config'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { browser } from 'protractor'; import { Util } from '../../util/util'; diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 4b3b0e9767..9d9211fc4a 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -25,7 +25,7 @@ import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 72ecc48a35..f1a8cbf2b9 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -26,7 +26,7 @@ import { NodeActions } from '../../actions/ACS/node.actions'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { browser } from 'protractor'; diff --git a/e2e/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts index 6d969b9954..6b2b82eaab 100644 --- a/e2e/search/components/search-text.e2e.ts +++ b/e2e/search/components/search-text.e2e.ts @@ -22,7 +22,7 @@ import { FolderModel } from '../../models/ACS/folderModel'; import TestConfig = require('../../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { LoginPage } from '../../pages/adf/loginPage'; import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index eabf7e91f0..ed3aea85bf 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -30,7 +30,7 @@ import { FolderModel } from '../models/ACS/folderModel'; import TestConfig = require('../test.config'); import { Util } from '../util/util'; -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; describe('Search component - Search Bar', () => { diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index a3b3f4f074..022bbd1d98 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -31,7 +31,7 @@ import TestConfig = require('../test.config'); import { Util } from '../util/util'; import resources = require('../util/resources'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; import { browser } from 'protractor'; import { SearchConfiguration } from './search.config'; diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index a13e203528..daa2a5e70b 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -16,7 +16,7 @@ */ import TestConfig = require('../test.config'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { Util } from '../util/util'; import resources = require('../util/resources'); diff --git a/e2e/search/search-page-component.e2e.ts b/e2e/search/search-page-component.e2e.ts index 5178837194..c7663a9c8d 100644 --- a/e2e/search/search-page-component.e2e.ts +++ b/e2e/search/search-page-component.e2e.ts @@ -32,7 +32,7 @@ import TestConfig = require('../test.config'); import { Util } from '../util/util'; import resources = require('../util/resources'); -import AlfrescoApi = require('alfresco-js-api-node'); +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; describe('Search component - Search Page', () => { diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts index ca93d2f8ae..fc967a7d98 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts @@ -27,7 +27,7 @@ describe('Activiti TaskList Cloud Service', () => { let service: TaskListCloudService; let alfrescoApiMock: AlfrescoApiServiceMock; - function returFakeTaskListResults() { + function returnFakeTaskListResults() { return { oauth2Auth: { callCustomApi : () => { @@ -72,7 +72,7 @@ describe('Activiti TaskList Cloud Service', () => { it('should return the tasks', (done) => { let taskRequest: TaskQueryCloudRequestModel = { appName: 'fakeName' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returFakeTaskListResults); + spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnFakeTaskListResults); service.getTaskByRequest(taskRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); diff --git a/package-lock.json b/package-lock.json index 336dcd2e13..be258d4a77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5528,7 +5528,7 @@ }, "d": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz", + "resolved": "http://registry.npmjs.org/d/-/d-0.1.1.tgz", "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=", "requires": { "es5-ext": "~0.10.2" diff --git a/package.json b/package.json index 4e903dfc66..7c02d9e83b 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "@ngx-translate/core": "^11.0.0", "adf-monaco-extension": "0.0.8", "adf-tslint-rules": "0.0.6", - "alfresco-js-api-node": "2.7.0-beta5", "chart.js": "2.5.0", "classlist.js": "1.1.20150312", "core-js": "^2.5.4", diff --git a/protractor.conf.js b/protractor.conf.js index a3c2ccaa6f..787e6c0154 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -4,7 +4,7 @@ const jasmineReporters = require('jasmine-reporters'); const htmlReporter = require('protractor-html-reporter-2'); const retry = require('protractor-retry').retry; -const AlfrescoApi = require('alfresco-js-api-node'); +const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; const TestConfig = require('./e2e/test.config'); let argv = require('yargs').argv;