From 098b9881ebf2952b0a77d8d48cb7294f7afd5f49 Mon Sep 17 00:00:00 2001 From: Cristina Jalba Date: Thu, 23 Apr 2020 11:49:41 +0300 Subject: [PATCH] [ACA-3023]Refactor APS1 PO and ACS API calls of ADF testing package (#5629) * Change the uploadFile method from ADF testing package * Fix lint * no message * Fix a part of the tests * Fix last tests * Fix test * Fix tests * Fix test --- .../comments/comment-component.e2e.ts | 2 +- .../directives/delete-directive.e2e.ts | 14 +++---- .../directives/download-directive.e2e.ts | 8 ++-- .../directives/edit-folder-directive.e2e.ts | 2 +- .../directives/favorite-directive.e2e.ts | 2 +- .../restore-content-directive.e2e.ts | 6 +-- .../document-list-actions.e2e.ts | 4 +- .../document-list-component.e2e.ts | 20 ++++----- .../document-list-copy-move-actions.e2e.ts | 4 +- .../document-list-gallery.e2e.ts | 6 +-- .../document-list-thumbnails-tooltips.e2e.ts | 6 +-- e2e/content-services/lock-file.e2e.ts | 4 +- .../metadata/aspect-oriented-config.e2e.ts | 2 +- .../metadata/metadata-permissions.e2e.ts | 2 +- .../metadata/metadata-properties.e2e.ts | 2 +- .../metadata/metadata-smoke-tests.e2e.ts | 2 +- .../permissions/permissions-component.e2e.ts | 7 ++-- .../permissions/site-permissions.e2e.ts | 4 +- .../share-file/share-file.e2e.ts | 2 +- .../share-file/unshare-file.e2e.ts | 2 +- .../social/social.component.e2e.ts | 2 +- .../sso-download-directive-component.e2e.ts | 4 +- .../upload/uploader-component.e2e.ts | 2 +- .../version/version-actions.e2e.ts | 2 +- .../version/version-permissions.e2e.ts | 10 ++--- .../version/version-properties.e2e.ts | 2 +- .../version/version-smoke-tests.e2e.ts | 2 +- e2e/core/pagination-empty-current-page.e2e.ts | 2 +- .../viewer-archive.component.e2e.ts | 2 +- .../file-extensions/viewer-component.e2e.ts | 4 +- .../viewer-excel.component.e2e.ts | 2 +- .../viewer-image.component.e2e.ts | 4 +- .../viewer-powerpoint.component.e2e.ts | 2 +- .../viewer-text.component.e2e.ts | 2 +- .../viewer-word.component.e2e.ts | 2 +- e2e/core/viewer/info-drawer.component.e2e.ts | 2 +- .../viewer-content-services-component.e2e.ts | 12 +++--- .../viewer-custom-toolbar-info-drawer.e2e.ts | 2 +- e2e/core/viewer/viewer-extension.e2e.ts | 2 +- e2e/core/viewer/viewer-properties.e2e.ts | 4 +- e2e/core/viewer/viewer-share-content.ts | 4 +- e2e/models/ACS/file.model.ts | 2 +- ...cess-task-attach-content-file-cloud.e2e.ts | 4 +- .../start-task-form-cloud.e2e.ts | 4 +- .../attach-file-content-service.e2e.ts | 4 +- .../attach-file-widget.e2e.ts | 4 +- .../widgets/attach-file-widget.e2e.ts | 2 +- .../components/search-number-range.e2e.ts | 4 +- e2e/search/components/search-slider.e2e.ts | 2 +- .../components/search-sorting-picker.e2e.ts | 4 +- e2e/search/search-filters.e2e.ts | 8 ++-- e2e/search/search-multiselect.e2e.ts | 10 ++--- e2e/search/search-page-component.e2e.ts | 2 +- e2e/util/resources.js | 42 +++++++++++++++++++ .../actions/upload.actions.ts | 7 +--- .../widget/attach-file-widget-cloud.page.ts | 2 +- .../pages/start-process.page.ts | 4 ++ 57 files changed, 160 insertions(+), 116 deletions(-) diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index 914c8f415e..ef01f59526 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -38,7 +38,7 @@ describe('Comment Component', () => { const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/content-services/directives/delete-directive.e2e.ts b/e2e/content-services/directives/delete-directive.e2e.ts index 54800f4fa6..94057b5226 100644 --- a/e2e/content-services/directives/delete-directive.e2e.ts +++ b/e2e/content-services/directives/delete-directive.e2e.ts @@ -42,37 +42,37 @@ describe('Delete Directive', () => { const txtFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); const file0BytesModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const secondPdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }); const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const secondPngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_path }); const folderInfo = new FolderModel({ name: 'myFolder', - location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_path }); const folderSecond = new FolderModel({ diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index aff5a25831..0e79a25b75 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/e2e/content-services/directives/download-directive.e2e.ts @@ -35,22 +35,22 @@ describe('Version component actions', () => { const txtFileComma = new FileModel({ name: 'comma,name', - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); const txtFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); const file0BytesModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); const folderInfo = new FolderModel({ name: 'myFolder', - location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_path }); const folderSecond = new FolderModel({ diff --git a/e2e/content-services/directives/edit-folder-directive.e2e.ts b/e2e/content-services/directives/edit-folder-directive.e2e.ts index 240181f5c7..7e164688fc 100644 --- a/e2e/content-services/directives/edit-folder-directive.e2e.ts +++ b/e2e/content-services/directives/edit-folder-directive.e2e.ts @@ -41,7 +41,7 @@ describe('Edit folder directive', () => { const pdfFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const uploadActions = new UploadActions(this.alfrescoJsApi); diff --git a/e2e/content-services/directives/favorite-directive.e2e.ts b/e2e/content-services/directives/favorite-directive.e2e.ts index ec6be0e37c..f08d077fb2 100644 --- a/e2e/content-services/directives/favorite-directive.e2e.ts +++ b/e2e/content-services/directives/favorite-directive.e2e.ts @@ -43,7 +43,7 @@ describe('Favorite directive', () => { }); const pdfFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const uploadActions = new UploadActions(this.alfrescoJsApi); diff --git a/e2e/content-services/directives/restore-content-directive.e2e.ts b/e2e/content-services/directives/restore-content-directive.e2e.ts index d9af17cf4c..18bdbdb22f 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/e2e/content-services/directives/restore-content-directive.e2e.ts @@ -44,17 +44,17 @@ describe('Restore content directive', () => { const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const testFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const folderName = StringUtil.generateRandomString(5); 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 a2d29cbe49..509d20c840 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -63,11 +63,11 @@ describe('Document List Component - Actions', () => { const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const testFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const files = { 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 9b706be750..0afe8ea155 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -62,19 +62,19 @@ describe('Document List Component', () => { let folderName; const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const docxFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_path }); const timeAgoFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const mediumFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }); let pdfUploadedNode, docxUploadedNode, timeAgoUploadedNode, mediumDateUploadedNode; @@ -161,17 +161,17 @@ describe('Document List Component', () => { const fakeFileA = new FileModel({ name: 'A', - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const fakeFileB = new FileModel({ name: 'B', - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const fakeFileC = new FileModel({ name: 'C', - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); let fileANode, fileBNode, fileCNode; @@ -301,11 +301,11 @@ describe('Document List Component', () => { it('[C269086] Should display Islocked field for files', async () => { const testFileA = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const testFileB = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }); acsUser = new AcsUserModel(); await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); @@ -358,7 +358,7 @@ describe('Document List Component', () => { const file0BytesModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); let file; diff --git a/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts b/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts index 442e6a4fa9..96cc5d1eb5 100644 --- a/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts @@ -51,12 +51,12 @@ describe('Document List Component', () => { const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const testFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); beforeAll(async () => { diff --git a/e2e/content-services/document-list/document-list-gallery.e2e.ts b/e2e/content-services/document-list/document-list-gallery.e2e.ts index 813895bb7d..4cb7dad271 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/e2e/content-services/document-list/document-list-gallery.e2e.ts @@ -49,17 +49,17 @@ describe('Document List Component', () => { const pdfFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const testFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const docxFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_path }); const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; let filePdfNode, fileTestNode, fileDocxNode, folderNode, filePDFSubNode; diff --git a/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts b/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts index f3f8f2b518..80dd22e97a 100644 --- a/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts +++ b/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts @@ -62,17 +62,17 @@ describe('Document List Component', () => { const pdfFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const testFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); const docxFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_path }); const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; let filePdfNode, fileTestNode, fileDocxNode, folderNode; diff --git a/e2e/content-services/lock-file.e2e.ts b/e2e/content-services/lock-file.e2e.ts index 3879ff877d..0b1a2058f2 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -41,12 +41,12 @@ describe('Lock File', () => { const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const pngFileToLock = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_path }); let nodeId, site, documentLibrary, lockedFileNodeId; diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index 794f8f5e5a..c7bef450cf 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -39,7 +39,7 @@ describe('Aspect oriented config', () => { const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); let uploadActions; diff --git a/e2e/content-services/metadata/metadata-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index 528c35bcfc..bce8d42a15 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -51,7 +51,7 @@ describe('permissions', () => { const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index 0a96c2280f..f82bf3e8ce 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -50,7 +50,7 @@ describe('CardView Component - properties', () => { const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index 5eb4451582..4bd2bf7cee 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -52,7 +52,7 @@ describe('Metadata component', () => { const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); this.alfrescoJsApi = new AlfrescoApi({ diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 5652e99e6e..ac1784a0ab 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -47,8 +47,9 @@ describe('Permissions Component', () => { let fileOwnerUser, filePermissionUser, file; const fileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); + const fileLocation = browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location; const testFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, @@ -319,7 +320,7 @@ describe('Permissions Component', () => { await contentList.checkActionMenuIsNotDisplayed(); await contentServicesPage.metadataContent('RoleConsumer' + fileModel.name); await notificationHistoryPage.checkNotifyContains('You don\'t have access to do this.'); - await contentServicesPage.uploadFile(fileModel.location); + await contentServicesPage.uploadFile(fileLocation); await notificationHistoryPage.checkNotifyContains('You don\'t have the create permission to upload the content'); }); @@ -363,7 +364,7 @@ describe('Permissions Component', () => { await metadataViewPage.clickUpdatePropertyIcon('properties.cm:title'); await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('newTitle1'); await metadataViewPage.clickCloseButton(); - await contentServicesPage.uploadFile(fileModel.location); + await contentServicesPage.uploadFile(fileLocation); await notificationHistoryPage.checkNotifyContains('You don\'t have the create permission to upload the content'); }); diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index 421bcf1232..0659b9e932 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -54,7 +54,7 @@ describe('Permissions Component', () => { const fileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); const testFileModel = new FileModel({ @@ -225,7 +225,7 @@ describe('Permissions Component', () => { await notificationHistoryPage.checkNotifyContains('You don\'t have access to do this.'); - await contentServicesPage.uploadFile(fileModel.location); + await contentServicesPage.uploadFile(testFileModel.location); await notificationHistoryPage.checkNotifyContains('You don\'t have the create permission to upload the content'); diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index 491bd450cb..bd6907d7af 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -50,7 +50,7 @@ describe('Share file', () => { const uploadActions = new UploadActions(this.alfrescoJsApi); const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); let nodeId; diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index 0834231b8b..89a4be9306 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -55,7 +55,7 @@ describe('Unshare file', () => { let testSite; const pngFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); beforeAll(async () => { diff --git a/e2e/content-services/social/social.component.e2e.ts b/e2e/content-services/social/social.component.e2e.ts index ec9c06ddd1..d31c92dbeb 100644 --- a/e2e/content-services/social/social.component.e2e.ts +++ b/e2e/content-services/social/social.component.e2e.ts @@ -48,7 +48,7 @@ describe('Social component', () => { const emptyFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); beforeAll(async () => { diff --git a/e2e/content-services/sso/sso-download-directive-component.e2e.ts b/e2e/content-services/sso/sso-download-directive-component.e2e.ts index dfcfdf7687..f3f9168f51 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -45,12 +45,12 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList const firstPdfFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }); const pngFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); let pdfUploadedFile, pngUploadedFile, folder; diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index b9b0ba9a8a..73ef2d746d 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -43,7 +43,7 @@ describe('Upload component', () => { const firstPdfFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }); const docxFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index a4f104ad6e..d71f9950a5 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -37,7 +37,7 @@ describe('Version component actions', () => { const txtFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); const fileModelVersionTwo = new FileModel({ diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index 3b8064ad97..1dfc50826e 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -51,12 +51,12 @@ describe('Version component permissions', () => { const lockFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_path }); const differentCreatorFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_path }); this.alfrescoJsApi = new AlfrescoApi({ @@ -120,7 +120,7 @@ describe('Version component permissions', () => { const sameCreatorFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); beforeAll(async () => { @@ -194,7 +194,7 @@ describe('Version component permissions', () => { describe('Contributor', () => { const sameCreatorFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); beforeAll(async () => { @@ -250,7 +250,7 @@ describe('Version component permissions', () => { describe('Collaborator', () => { const sameCreatorFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); beforeAll(async () => { diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index d32fd943c9..a62553278b 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -35,7 +35,7 @@ describe('Version Properties', () => { const txtFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); const fileModelVersionTwo = new FileModel({ diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts index 78f2097ae7..45435a77d2 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -36,7 +36,7 @@ describe('Version component', () => { const txtFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); const fileModelVersionTwo = new FileModel({ diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index d935e55924..d6dfc7ccca 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -55,7 +55,7 @@ describe('Pagination - returns to previous page when current is empty', () => { const pngFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts index 0d75ab7c9b..d89c8adcd1 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts @@ -41,7 +41,7 @@ describe('Viewer', () => { const archiveFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts index ddc11cb271..13545fc069 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -43,12 +43,12 @@ describe('Viewer', () => { const pngFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const otherFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts index c8a08e7417..b824f27ca3 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -33,7 +33,7 @@ describe('Viewer', () => { const excelFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_path }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts index 8c73eaaa0d..685bbd0ad1 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -38,12 +38,12 @@ describe('Viewer', () => { const imgFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_path }); const imgRenditionFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts index 7e866d3795..125357c37c 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -39,7 +39,7 @@ describe('Viewer', () => { const pptFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts index 38093ae7e7..cfa98aba40 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -38,7 +38,7 @@ describe('Viewer', () => { const textFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts index adc5aa4ffe..86d91addfa 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -41,7 +41,7 @@ describe('Viewer', () => { const wordFolderInfo = new FolderModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index 4ec0bdde43..da0dc5afa5 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -41,7 +41,7 @@ describe('Info Drawer', () => { const pngFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index 64f4573646..6732cacecc 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -44,27 +44,27 @@ describe('Content Services Viewer', () => { 'secondPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text, 'lastPageNumber': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number, 'password': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_path }); const docxFile = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_path, 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.first_page_text }); const jpgFile = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_path, 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name }); const mp4File = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_path, 'name': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_name }); const unsupportedFile = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_path, 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name }); const pptFile = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_path, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_name, 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PPT.first_page_text }); 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 4c75d27311..18adbf4857 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -39,7 +39,7 @@ describe('Viewer', () => { const txtFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/viewer-extension.e2e.ts b/e2e/core/viewer/viewer-extension.e2e.ts index 61539f638a..0248cf7d01 100644 --- a/e2e/core/viewer/viewer-extension.e2e.ts +++ b/e2e/core/viewer/viewer-extension.e2e.ts @@ -43,7 +43,7 @@ describe('Viewer', () => { let jsFileUploaded; const jsFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_path }); beforeAll(async () => { diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index 5901944799..674176520c 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -34,12 +34,12 @@ describe('Viewer - properties', () => { const pngFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const fileForOverlay = new FileModel({ 'name': 'fileForOverlay.png', - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index 2fef2cd9eb..a0aabfa9ef 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -44,12 +44,12 @@ describe('Viewer', () => { const pngFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const wordFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_path }); let pngFileShared, wordFileUploaded; diff --git a/e2e/models/ACS/file.model.ts b/e2e/models/ACS/file.model.ts index 1592467ea1..5986a7caf0 100644 --- a/e2e/models/ACS/file.model.ts +++ b/e2e/models/ACS/file.model.ts @@ -26,7 +26,7 @@ export class FileModel { id = StringUtil.generateRandomString(); name = StringUtil.generateRandomString(); shortName = this.name; - location = browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location; + location = browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path; tooltip = this.name; version = ''; firstPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.first_page_text; diff --git a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts index ad7ef02f12..0a86dccd84 100644 --- a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts @@ -58,12 +58,12 @@ describe('Process Task - Attach content file', () => { const pdfFileOne = { 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }; const pdfFileTwo = { 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }; const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); diff --git a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts index 3f59785770..085ffcd818 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -88,11 +88,11 @@ describe('Start Task Form', () => { const pdfFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name }); const pdfFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }); const testFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_path }); let identityService: IdentityService; diff --git a/e2e/process-services/attach-file-content-service.e2e.ts b/e2e/process-services/attach-file-content-service.e2e.ts index 91bc489065..afe98af25b 100644 --- a/e2e/process-services/attach-file-content-service.e2e.ts +++ b/e2e/process-services/attach-file-content-service.e2e.ts @@ -55,12 +55,12 @@ describe('Attach File - Content service', () => { const pdfFileOne = { name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: browser.params.testConfig.main.rootPath + browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path }; const pdfFileTwo = { name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path }; const externalFile = 'Project Overview.ppt'; diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index 0b5e33894e..006dcd0dac 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -44,7 +44,7 @@ describe('Start Task - Task App', () => { const pdfFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name }); const wordFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: browser.params.testConfig.main.rootPath + browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_path }); const appFields = app.form_fields; @@ -71,7 +71,7 @@ describe('Start Task - Task App', () => { await newTask.selectForm(app.formName); await newTask.clickStartButton(); - await widget.attachFileWidget().attachFile(appFields.attachFile_id, browser.params.testConfig.main.rootPath + pdfFile.location); + await widget.attachFileWidget().attachFile(appFields.attachFile_id, pdfFile.location); await widget.attachFileWidget().checkFileIsAttached(appFields.attachFile_id, pdfFile.name); await widget.attachFileWidget().viewFile(pdfFile.name); diff --git a/e2e/process-services/widgets/attach-file-widget.e2e.ts b/e2e/process-services/widgets/attach-file-widget.e2e.ts index 336258f55f..7ea3d3785b 100644 --- a/e2e/process-services/widgets/attach-file-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-file-widget.e2e.ts @@ -69,7 +69,7 @@ describe('Attach widget - File', () => { await newTask.selectForm(app.formName); await newTask.clickStartButton(); - await widget.attachFileWidget().attachFile(appFields.attachFile_id, browser.params.testConfig.main.rootPath + pdfFile.location); + await widget.attachFileWidget().attachFile(appFields.attachFile_id, pdfFile.location); await widget.attachFileWidget().checkFileIsAttached(appFields.attachFile_id, pdfFile.name); }); diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index f1d61466af..fe81cfeebf 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -40,12 +40,12 @@ describe('Search Number Range Filter', () => { const file2BytesModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_path }); const file0BytesModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path }); let file2Bytes, file0Bytes; diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 65c7d0a8eb..3854b58347 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -40,7 +40,7 @@ describe('Search Slider Filter', () => { const file2BytesModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_path }); let file2Bytes; diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 7fb120e4fb..6f3008fe21 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -46,12 +46,12 @@ describe('Search Sorting Picker', () => { const pngAModel = { 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }; const pngDModel = { 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_path }; let pngA, pngD; diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index 5f73001db2..2f2f25901f 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -63,21 +63,21 @@ describe('Search Filters', () => { const pngFileModel = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path }); const txtFileModel1 = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path, 'name': `${uniqueFileName1}.txt` }); const jpgFileModel = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_path, 'name': `${uniqueFileName2}.jpg` }); const txtFileModel2 = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path, 'name': `${uniqueFileName3}.txt` }); diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index 041a2f1187..91143e7d8c 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -46,11 +46,11 @@ describe('Search Component - Multi-Select Facet', () => { const randomName = StringUtil.generateRandomString(); const jpgFileInfo = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_path, 'name': `${randomName}.jpg` }); const txtFileInfo = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path, 'name': `${randomName}.txt` }); @@ -136,11 +136,11 @@ describe('Search Component - Multi-Select Facet', () => { const randomName = StringUtil.generateRandomString(); const jpgFileInfo = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_path, 'name': `${randomName}.jpg` }); const txtFileInfo = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path, 'name': `${randomName}.txt` }); @@ -198,7 +198,7 @@ describe('Search Component - Multi-Select Facet', () => { const randomName = StringUtil.generateRandomString(); const txtFileInfo = new FileModel({ - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_path, 'name': `${randomName}.txt` }); diff --git a/e2e/search/search-page-component.e2e.ts b/e2e/search/search-page-component.e2e.ts index ee8c81b90c..6f9553999a 100644 --- a/e2e/search/search-page-component.e2e.ts +++ b/e2e/search/search-page-component.e2e.ts @@ -71,7 +71,7 @@ describe('Search component - Search Page', () => { firstFileModel = new FileModel({ 'name': search.active.firstFile, - 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path }); await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); diff --git a/e2e/util/resources.js b/e2e/util/resources.js index dc05d00fdb..b2f06d3a5e 100644 --- a/e2e/util/resources.js +++ b/e2e/util/resources.js @@ -465,10 +465,12 @@ exports.Files = { ADF_DOCUMENTS: { JS: { file_location: "/resources/adf/a_js_file.js", + file_path: path.join(__dirname, '../resources/adf/a_js_file.js'), file_name: "a_js_file.js" }, PDF: { file_location: "/resources/adf/allFileTypes/a_file_supported.pdf", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_file_supported.pdf'), file_name: "a_file_supported.pdf", short_file_name: "a_file", first_page_text: "one", @@ -478,14 +480,17 @@ exports.Files = { }, PDF_B: { file_location: "/resources/adf/allFileTypes/b_file_supported.pdf", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/b_file_supported.pdf'), file_name: "b_file_supported.pdf" }, PDF_ALL: { file_location: "/resources/adf/allFileTypes/pdf_all_properties.pdf", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/pdf_all_properties.pdf'), file_name: "pdf_all_properties.pdf" }, PDF_PROTECTED: { file_location: "/resources/adf/allFileTypes/a_file_protected.pdf", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_file_protected.pdf'), file_name: "a_file_protected.pdf", first_page_text: "A Journey into Test Frameworks", second_page_text: "After looking into Spock’s GitHub", @@ -495,18 +500,22 @@ exports.Files = { }, LARGE_FILE: { file_location: "/resources/adf/BigFile.zip", + file_path: path.join(__dirname, '../resources/adf/BigFile.zip'), file_name: "BigFile.zip" }, MEDIUM_FILE: { file_location: "/resources/adf/MediumFile.zip", + file_path: path.join(__dirname, '../resources/adf/MediumFile.zip'), file_name: "MediumFile.zip" }, EXCEL: { file_location: "/resources/adf/allFileTypes/a_excel_file.xlsx", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_excel_file.xlsx'), file_name: "a_excel_file.xlsx" }, DOCX: { file_location: "/resources/adf/allFileTypes/a_file_supported.docx", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_file_supported.docx'), file_name: "a_file_supported.docx", first_page_text: "A Journey into Test Frameworks", second_page_text: "After looking into Spock’s GitHub", @@ -515,127 +524,158 @@ exports.Files = { }, FOLDER_ONE: { folder_location: "/resources/adf/folderOne", + folder_path: path.join(__dirname, '../resources/adf/folderOne'), folder_name: "folderOne" }, FOLDER_TWO: { folder_location: "/resources/adf/folderTwo", + folder_path: path.join(__dirname, '../resources/adf/folderTwo'), folder_name: "folderTwo" }, FOLDER_EXCLUDED: { folder_location: "/resources/adf/folderExcluded", + folder_path: path.join(__dirname, '../resources/adf/folderExcluded'), folder_name: "folderExcluded" }, FILE_INSIDE_FOLDER_ONE: { file_location: "/resources/adf/folderOne/share_profile_pic.png", + file_path: path.join(__dirname, '../resources/adf/folderOne/share_profile_pic.png'), file_name: "share_profile_pic.png" }, FILE_INSIDE_FOLDER_TWO: { file_location: "/resources/adf/folderOne/a_file.txt", + file_path: path.join(__dirname, '../resources/adf/folderOne/a_file.txt'), file_name: "a_file.txt" }, JPG: { file_location: "/resources/adf/allFileTypes/a_jpg_file.jpg", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_jpg_file.jpg'), file_name: "a_jpg_file.jpg" }, MP4: { file_location: "/resources/adf/allFileTypes/a_mp4_file.mp4", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_mp4_file.mp4'), file_name: "a_mp4_file.mp4" }, MP4_B: { file_location: "/resources/adf/allFileTypes/b_mp4_file.mp4", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/b_mp4_file.mp4'), file_name: "b_mp4_file.mp4" }, PNG: { file_location: "/resources/adf/allFileTypes/a_png_file.png", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_png_file.png'), file_name: "a_png_file.png" }, PNG_B: { file_location: "/resources/adf/allFileTypes/b_png_file.png", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/b_png_file.png'), file_name: "b_png_file.png" }, PNG_C: { file_location: "/resources/adf/allFileTypes/c_png_file.png", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/c_png_file.png'), file_name: "c_png_file.png" }, PNG_D: { file_location: "/resources/adf/allFileTypes/d_png_file.png", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/d_png_file.png'), file_name: "d_png_file.png" }, PPT: { file_location: "/resources/adf/allFileTypes/a_ppt_file.pptx", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_ppt_file.pptx'), file_name: "a_ppt_file.pptx", first_page_text: "PPTX test file" }, TEST: { file_location: "/resources/adf/allFileTypes/testExtension.test", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/testExtension.test'), file_name: "testExtension.test" }, TXT: { file_location: "/resources/adf/allFileTypes/a_txt_file.rtf", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/a_txt_file.rtf'), file_name: "a_txt_file.rtf" }, TXT_400B: { file_location: "/resources/adf/allFileTypes/file400Bytes.txt", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/file400Bytes.txt'), file_name: "file400Bytes.txt" }, TXT_0B: { file_location: "/resources/adf/allFileTypes/zeroBytesFile.txt", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/zeroBytesFile.txt'), file_name: "zeroBytesFile.txt" }, PAGES: { file_location: "/resources/adf/allFileTypes/file_unsupported.pages", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/file_unsupported.pages'), file_name: "file_unsupported.pages" }, UNSUPPORTED: { file_location: "/resources/adf/allFileTypes/file_unsupported.3DS", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/file_unsupported.3DS'), file_name: "file_unsupported.3DS" }, INI: { file_location: "/resources/adf/allFileTypes/desktop.ini", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/desktop.ini'), file_name: "desktop.ini" }, ARCHIVE_FOLDER: { folder_location: "/resources/adf/allFileTypes/documents/archive", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/archive'), folder_name: "archive" }, EXCEL_FOLDER: { folder_location: "/resources/adf/allFileTypes/documents/excel", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/excel'), folder_name: "excel" }, OTHER_FOLDER: { folder_location: "/resources/adf/allFileTypes/documents/other", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/other'), folder_name: "other" }, PPT_FOLDER: { folder_location: "/resources/adf/allFileTypes/documents/ppt", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/ppt'), folder_name: "ppt" }, TEXT_FOLDER: { folder_location: "/resources/adf/allFileTypes/documents/text", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/text'), folder_name: "text" }, FILE_ACCEPTED_INSIDE_TEXT_FOLDER: { file_location: "/resources/adf/allFileTypes/documents/text/a_odt_file.odt", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/text/a_odt_file.odt'), file_name: "a_odt_file.odt" }, FILE_EXCLUDED_INSIDE_TEXT_FOLDER: { file_location: "/resources/adf/allFileTypes/documents/text/a_cpio_file.cpio", + file_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/text/a_cpio_file.cpio'), file_name: "a_cpio_file.cpio" }, WORD_FOLDER: { folder_location: "/resources/adf/allFileTypes/documents/word", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/documents/word'), folder_name: "word" }, IMG_FOLDER: { folder_location: "/resources/adf/allFileTypes/images", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/images'), folder_name: "images" }, IMG_RENDITION_FOLDER: { folder_location: "/resources/adf/allFileTypes/images-rendition", + folder_path: path.join(__dirname, '../resources/adf/allFileTypes/images-rendition'), folder_name: "images-rendition" }, ADF_FOLDER: { folder_location: "/resources/adf", + folder_path: path.join(__dirname, '../resources/adf'), folder_name: "adf" }, }, @@ -643,10 +683,12 @@ exports.Files = { PROFILE_IMAGES: { ECM: { file_location: "/resources/adf/share_profile_pic.jpg", + file_path: path.join(__dirname, '../resources/adf/share_profile_pic.jpg'), file_name: "share_profile_pic.jpg" }, BPM: { file_location: "/resources/adf/activiti_profile_pic.png", + file_path: path.join(__dirname, '../resources/adf/activiti_profile_pic.png'), file_name: "activiti_profile_pic.png" } } diff --git a/lib/testing/src/lib/content-services/actions/upload.actions.ts b/lib/testing/src/lib/content-services/actions/upload.actions.ts index 54575edad4..57d03b64ef 100644 --- a/lib/testing/src/lib/content-services/actions/upload.actions.ts +++ b/lib/testing/src/lib/content-services/actions/upload.actions.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { browser } from 'protractor'; import * as path from 'path'; import * as fs from 'fs'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -29,8 +28,7 @@ export class UploadActions { } async uploadFile(fileLocation, fileName, parentFolderId): Promise { - const pathFile = path.join(browser.params.rootPath + '/e2e' + fileLocation); - const file = fs.createReadStream(pathFile); + const file = fs.createReadStream(fileLocation); return this.alfrescoJsApi.upload.uploadFile( file, @@ -70,8 +68,7 @@ export class UploadActions { } async uploadFolder(sourcePath, folder) { - const absolutePath = 'e2e/' + sourcePath; - const files = fs.readdirSync(path.join(browser.params.rootPath, absolutePath)); + const files = fs.readdirSync(sourcePath); let uploadedFiles; const promises = []; diff --git a/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts b/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts index 4671f4765a..f6d6609233 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts @@ -37,7 +37,7 @@ export class AttachFileWidgetCloudPage { await browser.setFileDetector(new remote.FileDetector()); const uploadButton = this.widget.element(by.css(`a input`)); await BrowserVisibility.waitUntilElementIsPresent(uploadButton); - await uploadButton.sendKeys(browser.params.rootPath + '/e2e' + fileLocation); + await uploadButton.sendKeys(fileLocation); await BrowserVisibility.waitUntilElementIsPresent(uploadButton); } diff --git a/lib/testing/src/lib/process-services/pages/start-process.page.ts b/lib/testing/src/lib/process-services/pages/start-process.page.ts index 51a81d4a01..5424d927dd 100644 --- a/lib/testing/src/lib/process-services/pages/start-process.page.ts +++ b/lib/testing/src/lib/process-services/pages/start-process.page.ts @@ -96,6 +96,10 @@ export class StartProcessPage { await BrowserActions.click(this.cancelProcessButton); } + async isCancelProcessButtonEnabled(): Promise { + return this.cancelProcessButton.isEnabled(); + } + async clickFormStartProcessButton(): Promise { await BrowserActions.click(this.formStartProcessButton); }