From 3fc939066694d3e710aa5f839f11d2e38abdcb11 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Thu, 10 Oct 2019 10:22:11 +0100 Subject: [PATCH] [ADF-4909] e2e - Move the resources as part of protractor params (#5086) * Move the resources as part of protractor params * Revert replace mistakes * Remove the resources imports * fix resources import --- .../comments/comment-component.e2e.ts | 5 +- .../directives/download-directive.e2e.ts | 15 +++--- .../directives/edit-folder-directive.e2e.ts | 5 +- .../directives/favorite-directive.e2e.ts | 5 +- .../restore-content-directive.e2e.ts | 13 +++--- .../document-list-actions.e2e.ts | 9 ++-- .../document-list-component.e2e.ts | 39 ++++++++-------- .../document-list-copy-move-actions.e2e.ts | 9 ++-- .../document-list-gallery.e2e.ts | 13 +++--- .../document-list-properties.e2e.ts | 5 +- .../document-list-thumbnails-tooltips.e2e.ts | 13 +++--- e2e/content-services/lock-file.e2e.ts | 9 ++-- .../metadata/aspect-oriented-config.e2e.ts | 8 +--- .../metadata/metadata-permissions.e2e.ts | 5 +- .../metadata/metadata-properties.e2e.ts | 5 +- .../metadata/metadata-smoke-tests.e2e.ts | 14 ++---- .../permissions/permissions-component.e2e.ts | 13 +++--- .../permissions/site-permissions.e2e.ts | 13 +++--- .../share-file/share-file.e2e.ts | 5 +- .../share-file/unshare-file.e2e.ts | 5 +- .../social/social.component.e2e.ts | 5 +- .../sso-download-directive-component.e2e.ts | 9 ++-- e2e/content-services/tag-component.e2e.ts | 3 +- .../upload/cancel-upload.e2e.ts | 13 +++--- .../upload/excluded-file.e2e.ts | 17 +++---- .../upload/upload-dialog.e2e.ts | 21 ++++----- e2e/content-services/upload/upload-dialog.ts | 24 ++++------ .../upload/uploader-component.e2e.ts | 32 +++++-------- .../upload/user-permission.e2e.ts | 18 +++----- .../version/version-actions.e2e.ts | 17 +++---- .../version/version-permissions.e2e.ts | 29 ++++++------ .../version/version-properties.e2e.ts | 9 ++-- .../version/version-smoke-tests.e2e.ts | 28 ++++++----- .../datatable/data-table-component.e2e.ts | 6 +-- e2e/core/pagination-empty-current-page.e2e.ts | 8 +--- e2e/core/user-info-component.e2e.ts | 13 ++---- .../viewer-archive.component.e2e.ts | 6 +-- .../file-extensions/viewer-component.e2e.ts | 9 ++-- .../viewer-excel.component.e2e.ts | 5 +- .../viewer-image.component.e2e.ts | 9 ++-- .../viewer-powerpoint.component.e2e.ts | 5 +- .../viewer-text.component.e2e.ts | 5 +- .../viewer-word.component.e2e.ts | 5 +- e2e/core/viewer/info-drawer.component.e2e.ts | 5 +- .../viewer-content-services-component.e2e.ts | 46 +++++++++---------- .../viewer-custom-toolbar-info-drawer.e2e.ts | 5 +- e2e/core/viewer/viewer-extension.e2e.ts | 5 +- e2e/core/viewer/viewer-properties.e2e.ts | 7 ++- e2e/core/viewer/viewer-share-content.ts | 9 ++-- e2e/models/ACS/fileModel.ts | 12 ++--- .../apps-section-cloud.e2e.ts | 7 ++- .../edit-process-filters-component.e2e.ts | 3 +- .../edit-task-filters-component.e2e.ts | 4 +- .../form-field/dropdown-widget.e2e.ts | 5 +- ...people-group-cloud-filter-component.e2e.ts | 9 ++-- .../process-custom-filters.e2e.ts | 7 ++- .../process-filter-results.e2e.ts | 11 ++--- .../process-filters-cloud.e2e.ts | 5 +- .../process-header-cloud.e2e.ts | 6 +-- .../process-list-cloud-action-menu.e2e.ts | 6 +-- .../process-list-cloud-component.e2e.ts | 6 +-- .../process-list-selection-cloud.e2e.ts | 6 +-- .../start-process-cloud.e2e.ts | 3 +- .../start-task-form-cloud.e2e.ts | 21 ++++----- .../start-task-custom-app-cloud.e2e.ts | 3 +- .../start-task/start-task-group-cloud.e2e.ts | 3 +- .../task-filters-cloud.e2e.ts | 3 +- .../task-form-cloud-component.e2e.ts | 12 ++--- .../task-header-cloud.e2e.ts | 4 +- .../task-list-cloud-action-menu.e2e.ts | 5 +- .../task-list-properties.e2e.ts | 9 ++-- .../task-list-selection.e2e.ts | 3 +- .../tasks-custom-filters.e2e.ts | 5 +- e2e/process-services/apps-section.e2e.ts | 10 ++-- .../attach-file-widget.e2e.ts | 10 +--- .../attach-form-component.e2e.ts | 3 +- .../checklist-component.e2e.ts | 7 +-- .../comment-component-processes.e2e.ts | 5 +- .../comment-component-tasks.e2e.ts | 6 +-- .../custom-process-filters-sorting.e2e.ts | 5 +- .../custom-tasks-filters.e2e.ts | 8 +--- .../dynamic-table-date-picker.e2e.ts | 7 +-- .../empty-process-list-component.e2e.ts | 6 +-- .../form-people-widget.e2e.ts | 5 +- .../form-widgets-component.e2e.ts | 9 +--- ...ination-processlist-addingProcesses.e2e.ts | 5 +- .../pagination-tasklist-addingTasks.e2e.ts | 6 +-- e2e/process-services/people-component.e2e.ts | 7 +-- .../process-attachmentList-actionMenu.e2e.ts | 9 ++-- .../process-filters-component.e2e.ts | 4 +- .../process-instance-details.e2e.ts | 4 +- .../processList-component.e2e.ts | 7 +-- .../processlist-pagination.e2e.ts | 5 +- .../sort-tasklist-pagination.e2e.ts | 5 +- e2e/process-services/standalone-task.e2e.ts | 7 +-- .../start-process-component.e2e.ts | 14 ++---- .../start-task-custom-app.e2e.ts | 11 ++--- .../start-task-task-app.e2e.ts | 15 ++---- .../task-attachmentList-actionMenu.e2e.ts | 12 ++--- e2e/process-services/task-audit.e2e.ts | 7 +-- e2e/process-services/task-details-form.e2e.ts | 7 +-- .../task-details-no-form.e2e.ts | 7 +-- e2e/process-services/task-details.e2e.ts | 5 +- .../task-filters-component.e2e.ts | 7 +-- .../task-filters-sorting.e2e.ts | 4 +- .../task-list-pagination.e2e.ts | 6 +-- .../widgets/amount-widget.e2e.ts | 6 +-- .../widgets/attach-folder-widget.e2e.ts | 5 +- .../widgets/checkbox-widget.e2e.ts | 5 +- .../widgets/date-time-widget.e2e.ts | 5 +- .../widgets/date-widget.e2e.ts | 5 +- .../widgets/document-template-widget.e2e.ts | 3 +- .../widgets/dropdown-widget.e2e.ts | 5 +- .../widgets/dynamic-table-widget.e2e.ts | 9 ++-- .../widgets/header-widget.e2e.ts | 5 +- .../widgets/hyperlink-widget.e2e.ts | 5 +- .../widgets/multi-line-widget.e2e.ts | 5 +- .../widgets/number-widget.e2e.ts | 6 +-- .../widgets/people-widget.e2e.ts | 5 +- .../widgets/radio-buttons-widget.e2e.ts | 5 +- .../widgets/text-widget.e2e.ts | 5 +- .../widget-visibility-condition.e2e.ts | 5 +- .../components/search-number-range.e2e.ts | 9 ++-- e2e/search/components/search-slider.e2e.ts | 5 +- .../components/search-sorting-picker.e2e.ts | 9 ++-- e2e/search/search-filters.e2e.ts | 11 ++--- e2e/search/search-multiselect.e2e.ts | 11 ++--- e2e/search/search-page-component.e2e.ts | 3 +- protractor.conf.ts | 4 +- 129 files changed, 421 insertions(+), 689 deletions(-) diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index a39b3b8b24..4e1a126d9f 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -23,7 +23,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import CONSTANTS = require('../../util/constants'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -39,8 +38,8 @@ describe('Comment Component', () => { let userFullName, nodeId; const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index 4e141763b6..a04d8953d2 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/e2e/content-services/directives/download-directive.e2e.ts @@ -20,7 +20,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { LoginPage, UploadActions, BrowserVisibility, FileBrowserUtil } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { FolderModel } from '../../models/ACS/folderModel'; @@ -36,27 +35,27 @@ describe('Version component actions', () => { const txtFileComma = new FileModel({ name: 'comma,name', - location: resources.Files.ADF_DOCUMENTS.TXT.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); const txtFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TXT.file_name, - location: resources.Files.ADF_DOCUMENTS.TXT.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); const file0BytesModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); const folderInfo = new FolderModel({ name: 'myFolder', - location: resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location }); const folderSecond = new FolderModel({ name: 'myrSecondFolder', - location: resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location }); this.alfrescoJsApi = new AlfrescoApi({ diff --git a/e2e/content-services/directives/edit-folder-directive.e2e.ts b/e2e/content-services/directives/edit-folder-directive.e2e.ts index 424c218520..737cabfe6f 100644 --- a/e2e/content-services/directives/edit-folder-directive.e2e.ts +++ b/e2e/content-services/directives/edit-folder-directive.e2e.ts @@ -23,7 +23,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, protractor } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); describe('Edit folder directive', () => { @@ -41,8 +40,8 @@ describe('Edit folder directive', () => { }); const pdfFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); 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 79af6d474e..97d847fd18 100644 --- a/e2e/content-services/directives/favorite-directive.e2e.ts +++ b/e2e/content-services/directives/favorite-directive.e2e.ts @@ -22,7 +22,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage'; import { TrashcanPage } from '../../pages/adf/trashcanPage'; @@ -43,8 +42,8 @@ describe('Favorite directive', () => { hostEcm: browser.params.testConfig.adf_acs.host }); const pdfFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); 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 c6cc4b91a2..49f4512d07 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/e2e/content-services/directives/restore-content-directive.e2e.ts @@ -21,7 +21,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { TrashcanPage } from '../../pages/adf/trashcanPage'; import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions } from '@alfresco/adf-testing'; @@ -44,18 +43,18 @@ describe('Restore content directive', () => { }); const pdfFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const testFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); 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 7a13ff530e..3e6f11094e 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -26,7 +26,6 @@ import { import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; import { Util } from '../../util/util'; @@ -62,12 +61,12 @@ describe('Document List Component - Actions', () => { const nrOfFiles = 5; const pdfFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const testFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); 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 ac4785e191..7aa6bcb031 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -19,7 +19,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { ViewerPage } from '../../pages/adf/viewerPage'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; @@ -63,20 +62,20 @@ describe('Document List Component', () => { let folderName; const pdfFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const docxFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: resources.Files.ADF_DOCUMENTS.DOCX.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location }); const timeAgoFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const mediumFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF_B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); let pdfUploadedNode, docxUploadedNode, timeAgoUploadedNode, mediumDateUploadedNode; @@ -163,17 +162,17 @@ describe('Document List Component', () => { const fakeFileA = new FileModel({ name: 'A', - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const fakeFileB = new FileModel({ name: 'B', - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const fakeFileC = new FileModel({ name: 'C', - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); let fileANode, fileBNode, fileCNode; @@ -252,8 +251,8 @@ describe('Document List Component', () => { it('[C272775] Should be able to upload a file in new folder', async () => { const testFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); acsUser = new AcsUserModel(); /* cspell:disable-next-line */ @@ -306,12 +305,12 @@ describe('Document List Component', () => { it('[C269086] Should display Islocked field for files', async () => { const testFileA = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const testFileB = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF_B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); acsUser = new AcsUserModel(); await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); @@ -365,8 +364,8 @@ describe('Document List Component', () => { describe('Column Template', () => { const file0BytesModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); 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 37161de136..2c6655951f 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 @@ -26,7 +26,6 @@ import { import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; @@ -50,13 +49,13 @@ describe('Document List Component', () => { let folderName, sameNameFolder; const pdfFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const testFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); 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 0caddcc5c2..914ed80403 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/e2e/content-services/document-list/document-list-gallery.e2e.ts @@ -18,7 +18,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; @@ -49,18 +48,18 @@ describe('Document List Component', () => { let funnyUser; const pdfFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const testFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const docxFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: resources.Files.ADF_DOCUMENTS.DOCX.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location }); 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-properties.e2e.ts b/e2e/content-services/document-list/document-list-properties.e2e.ts index a4bbbce8cb..d90885624a 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/e2e/content-services/document-list/document-list-properties.e2e.ts @@ -20,7 +20,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { DropActions } from '../../actions/drop.actions'; import { FileModel } from '../../models/ACS/fileModel'; @@ -40,8 +39,8 @@ describe('Document List Component - Properties', () => { let acsUser = null; const pngFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); describe('Allow drop files property', () => { 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 19b783cefa..df18f0858a 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 @@ -18,7 +18,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; @@ -62,18 +61,18 @@ describe('Document List Component', () => { describe('Thumbnails and tooltips', () => { const pdfFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PDF.file_name, - location: resources.Files.ADF_DOCUMENTS.PDF.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const testFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const docxFile = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.DOCX.file_name, - location: resources.Files.ADF_DOCUMENTS.DOCX.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location }); 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 6b12386f17..88e4df6d69 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -23,7 +23,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FileModel } from '../models/ACS/fileModel'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Lock File', () => { @@ -41,13 +40,13 @@ describe('Lock File', () => { const uploadActions = new UploadActions(this.alfrescoJsApi); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const pngFileToLock = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG_B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location }); 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 e6ee12e860..91dd22f05e 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -19,13 +19,9 @@ import { LoginPage, UploadActions, LocalStorageUtil } from '@alfresco/adf-testin import { ViewerPage } from '../../pages/adf/viewerPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; - import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; - import { browser } from 'protractor'; -import resources = require('../../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { check } from '../../util/material'; @@ -43,8 +39,8 @@ describe('Aspect oriented config', () => { const acsUser = new AcsUserModel(); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); let uploadActions; diff --git a/e2e/content-services/metadata/metadata-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index c20281352d..ad9fa0959d 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -22,7 +22,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import CONSTANTS = require('../../util/constants'); @@ -52,8 +51,8 @@ describe('permissions', () => { let site; const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); 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 b582b8bc94..24818cc462 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -21,7 +21,6 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { check, uncheck } from '../../util/material'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -51,8 +50,8 @@ describe('CardView Component - properties', () => { const acsUser = new AcsUserModel(); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); 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 1090fa4c13..0798ce7570 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -19,14 +19,10 @@ import { LoginPage, LocalStorageUtil, BrowserActions, UploadActions } from '@alf import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; - import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; - import { browser } from 'protractor'; -import resources = require('../../util/resources'); import dateFormat = require('dateformat'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -56,8 +52,8 @@ describe('Metadata component', () => { const folderName = 'Metadata Folder'; const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); this.alfrescoJsApi = new AlfrescoApi({ @@ -176,7 +172,7 @@ describe('Metadata component', () => { await metadataViewPage.enterPropertyText('name', 'exampleText'); await metadataViewPage.clickClearPropertyIcon('name'); - await expect(await metadataViewPage.getPropertyText('name')).toEqual(resources.Files.ADF_DOCUMENTS.PNG.file_name); + await expect(await metadataViewPage.getPropertyText('name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); await metadataViewPage.clickEditPropertyIcons('name'); await metadataViewPage.enterPropertyText('name', 'exampleText.png'); @@ -208,9 +204,9 @@ describe('Metadata component', () => { await metadataViewPage.editIconClick(); await metadataViewPage.clickEditPropertyIcons('name'); - await metadataViewPage.enterPropertyText('name', resources.Files.ADF_DOCUMENTS.PNG.file_name); + await metadataViewPage.enterPropertyText('name', browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); await metadataViewPage.clickUpdatePropertyIcon('name'); - await expect(await metadataViewPage.getPropertyText('name')).toEqual(resources.Files.ADF_DOCUMENTS.PNG.file_name); + await expect(await metadataViewPage.getPropertyText('name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); }); it('[C260181] Should be possible edit all the metadata aspect', async () => { diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index f97e204a27..7b0a1ee323 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -18,7 +18,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions } from '@alfresco/adf-testing'; @@ -48,18 +47,18 @@ describe('Permissions Component', () => { const uploadDialog = new UploadDialog(); let fileOwnerUser, filePermissionUser, file; const fileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); const testFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const groupBody = { diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index aae1fa9eab..6461298ecd 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -19,7 +19,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage'; import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; @@ -53,18 +52,18 @@ describe('Permissions Component', () => { let publicSite, privateSite, folderName; const fileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); const testFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.TEST.file_name, - location: resources.Files.ADF_DOCUMENTS.TEST.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); let siteFolder, privateSiteFile; diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index d48c1cd795..e58c452bbc 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -29,7 +29,6 @@ import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Share file', () => { @@ -48,8 +47,8 @@ describe('Share file', () => { const acsUser = new AcsUserModel(); const uploadActions = new UploadActions(this.alfrescoJsApi); const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); 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 3f96e2499c..ad12024c05 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -29,7 +29,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -55,8 +54,8 @@ describe('Unshare file', () => { let nodeId; let testSite; const pngFileModel = new FileModel({ - name: resources.Files.ADF_DOCUMENTS.PNG.file_name, - location: resources.Files.ADF_DOCUMENTS.PNG.file_location + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { diff --git a/e2e/content-services/social/social.component.e2e.ts b/e2e/content-services/social/social.component.e2e.ts index 08608e40de..01bad15221 100644 --- a/e2e/content-services/social/social.component.e2e.ts +++ b/e2e/content-services/social/social.component.e2e.ts @@ -19,7 +19,6 @@ import { LoginPage, LikePage, RatePage, UploadActions } from '@alfresco/adf-test import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { SocialPage } from '../../pages/adf/demo-shell/socialPage'; import { browser } from 'protractor'; @@ -48,8 +47,8 @@ describe('Social component', () => { let emptyFile; const emptyFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); 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 a2e2082700..8cd1c0c532 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -30,7 +30,6 @@ import { } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/fileModel'; import { ViewerPage } from '../../pages/adf/viewerPage'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList, implicitFlow true', () => { @@ -45,13 +44,13 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList let implicitFlow; const firstPdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); const pngFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); let pdfUploadedFile, pngUploadedFile, folder; diff --git a/e2e/content-services/tag-component.e2e.ts b/e2e/content-services/tag-component.e2e.ts index caa3436393..15bd241944 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/e2e/content-services/tag-component.e2e.ts @@ -20,7 +20,6 @@ import { FileModel } from '../models/ACS/fileModel'; import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { TagPage } from '../pages/adf/tagPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -36,7 +35,7 @@ describe('Tag component', () => { hostEcm: browser.params.testConfig.adf_acs.host }); const uploadActions = new UploadActions(this.alfrescoJsApi); - const pdfFileModel = new FileModel({ name: resources.Files.ADF_DOCUMENTS.PDF.file_name }); + const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name }); const deleteFile = new FileModel({ name: StringUtil.generateRandomString() }); const sameTag = StringUtil.generateRandomString().toLowerCase(); diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index e3af97b35b..06f647972c 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/e2e/content-services/upload/cancel-upload.e2e.ts @@ -22,7 +22,6 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -41,16 +40,16 @@ describe('Upload component', async () => { const navigationBarPage = new NavigationBarPage(); const firstPdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); const pngFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const largeFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, - 'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location }); beforeAll(async () => { diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index 831495ebac..f58f4bb9de 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -16,17 +16,12 @@ */ import { element, by, browser } from 'protractor'; - import { LoginPage, LocalStorageUtil } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; - import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; - -import resources = require('../../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { DropActions } from '../../actions/drop.actions'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -41,18 +36,18 @@ describe('Upload component - Excluded Files', () => { const navigationBarPage = new NavigationBarPage(); const iniExcludedFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.INI.file_name, - 'location': resources.Files.ADF_DOCUMENTS.INI.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.INI.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.INI.file_location }); const txtFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); const pngFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index f452ee8406..2892dd9261 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/e2e/content-services/upload/upload-dialog.e2e.ts @@ -22,7 +22,6 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; @@ -41,24 +40,24 @@ describe('Upload component', () => { const uploadActions = new UploadActions(this.alfrescoJsApi); const firstPdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); const docxFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name, - 'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location }); const pdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const pngFileModelTwo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location }); const pngFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location]; const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name]; diff --git a/e2e/content-services/upload/upload-dialog.ts b/e2e/content-services/upload/upload-dialog.ts index 0abb129ed1..0e08d5e103 100644 --- a/e2e/content-services/upload/upload-dialog.ts +++ b/e2e/content-services/upload/upload-dialog.ts @@ -22,7 +22,6 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -44,30 +43,29 @@ describe('Upload component', () => { const uploadActions = new UploadActions(this.alfrescoJsApi); const firstPdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); const docxFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name, - 'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location }); const pdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const pngFileModelTwo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location }); const pngFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location]; const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name]; beforeAll(async () => { - await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); @@ -75,12 +73,10 @@ describe('Upload component', () => { await contentServicesPage.goToDocumentList(); const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-'); Object.assign(firstPdfFileModel, pdfUploadedFile.entry); - }); afterAll(async () => { await navigationBarPage.clickLogoutButton(); - }); beforeEach(async () => { diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index b9e32b1b65..80f9a8f0e5 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -23,7 +23,6 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { DropActions } from '../../actions/drop.actions'; @@ -43,44 +42,37 @@ describe('Upload component', () => { const navigationBarPage = new NavigationBarPage(); const firstPdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); const docxFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name, - 'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location }); const pdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const pngFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const fileWithSpecificSize = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_400B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_400B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_400B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_400B.file_location }); const emptyFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); beforeAll(async () => { - await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); - await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); - await this.alfrescoJsApi.login(acsUser.id, acsUser.password); - await loginPage.loginToContentServicesUsingUserModel(acsUser); - const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-'); - Object.assign(firstPdfFileModel, pdfUploadedFile.entry); - }); afterAll(async () => { diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index 0f6aafb34d..30c627b5b1 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -16,19 +16,13 @@ */ import { browser } from 'protractor'; - import { StringUtil, LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; - import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; - -import resources = require('../../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; - import CONSTANTS = require('../../util/constants'); describe('Upload - User permission', () => { @@ -42,18 +36,18 @@ describe('Upload - User permission', () => { const notificationHistoryPage = new NotificationHistoryPage(); const emptyFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); const pngFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const pdfFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); beforeAll(async () => { diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index e2fe26eac6..b617e34028 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -16,16 +16,11 @@ */ import { browser, by, element } from 'protractor'; - import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; - import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; - -import resources = require('../../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -43,19 +38,19 @@ describe('Version component actions', () => { const acsUser = new AcsUserModel(); const txtFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); const fileModelVersionTwo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); let uploadActions; const bigFileToCancel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, - 'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location }); beforeAll(async () => { diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index 1869d9a9a2..36399ac751 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { element, by } from 'protractor'; - +import { element, by, browser } from 'protractor'; import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; @@ -24,8 +23,6 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NodeActions } from '../../actions/ACS/node.actions'; import CONSTANTS = require('../../util/constants'); @@ -48,18 +45,18 @@ describe('Version component permissions', () => { const fileCreatorUser = new AcsUserModel(); const newVersionFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location }); const lockFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_C.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_C.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_location }); const differentCreatorFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location }); this.alfrescoJsApi = new AlfrescoApi({ @@ -122,8 +119,8 @@ describe('Version component permissions', () => { describe('Manager', () => { const sameCreatorFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { @@ -197,8 +194,8 @@ describe('Version component permissions', () => { describe('Contributor', () => { const sameCreatorFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { @@ -253,8 +250,8 @@ describe('Version component permissions', () => { describe('Collaborator', () => { const sameCreatorFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index b08e80da82..d3cf675069 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -21,7 +21,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -35,13 +34,13 @@ describe('Version Properties', () => { const acsUser = new AcsUserModel(); const txtFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); const fileModelVersionTwo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts index bbf856fa67..977580283e 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -16,13 +16,11 @@ */ import { browser } from 'protractor'; - import { LoginPage, UploadActions, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -37,33 +35,33 @@ describe('Version component', () => { const acsUser = new AcsUserModel(); const txtFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); const fileModelVersionTwo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const fileModelVersionThree = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location }); const fileModelVersionFor = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_C.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_C.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_location }); const fileModelVersionFive = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location }); this.alfrescoJsApi = new AlfrescoApi({ - provider: 'ECM', - hostEcm: browser.params.testConfig.adf_acs.host - }); + provider: 'ECM', + hostEcm: browser.params.testConfig.adf_acs.host + }); const uploadActions = new UploadActions(this.alfrescoJsApi); diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index aa99ab8e45..2f89cea625 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -20,11 +20,9 @@ import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage'; import { DataTableComponentPage } from '@alfresco/adf-testing'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { browser } from 'protractor'; - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { DropActions } from '../../actions/drop.actions'; -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; describe('Datatable component', () => { @@ -39,8 +37,8 @@ describe('Datatable component', () => { const notificationHistoryPage = new NotificationHistoryPage(); const dragAndDrop = new DropActions(); const pngFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 22b926f2dd..0bf35ebace 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -19,16 +19,12 @@ import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../pages/adf/contentServicesPage'; import { PaginationPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../pages/adf/viewerPage'; - import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; import { FileModel } from '../models/ACS/fileModel'; - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '@alfresco/adf-testing'; - import { Util } from '../util/util'; -import resources = require('../util/resources'); import { browser } from 'protractor'; describe('Pagination - returns to previous page when current is empty', () => { @@ -61,8 +57,8 @@ describe('Pagination - returns to previous page when current is empty', () => { }; const pngFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); beforeAll(async () => { diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index e65bb4a5c2..60360cf0b4 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -17,15 +17,10 @@ import { LoginPage } from '@alfresco/adf-testing'; import { UserInfoPage } from '@alfresco/adf-testing'; - import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FileModel } from '../models/ACS/fileModel'; - import PeopleAPI = require('../restAPI/ACS/PeopleAPI'); - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -38,12 +33,12 @@ describe('User Info component', () => { const navigationBarPage = new NavigationBarPage(); const acsAvatarFileModel = new FileModel({ - 'name': resources.Files.PROFILE_IMAGES.ECM.file_name, - 'location': resources.Files.PROFILE_IMAGES.ECM.file_location + 'name': browser.params.resources.Files.PROFILE_IMAGES.ECM.file_name, + 'location': browser.params.resources.Files.PROFILE_IMAGES.ECM.file_location }); const apsAvatarFileModel = new FileModel({ - 'name': resources.Files.PROFILE_IMAGES.BPM.file_name, - 'location': resources.Files.PROFILE_IMAGES.BPM.file_location + 'name': browser.params.resources.Files.PROFILE_IMAGES.BPM.file_name, + 'location': browser.params.resources.Files.PROFILE_IMAGES.BPM.file_location }); 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 5632a07662..2c06bdbf88 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts @@ -16,12 +16,10 @@ */ import { browser } from 'protractor'; - import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -43,8 +41,8 @@ describe('Viewer', () => { const uploadActions = new UploadActions(this.alfrescoJsApi); const archiveFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location }); 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 87ed1e3d00..8c2b0d9ede 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FileModel } from '../../..//models/ACS/fileModel'; import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; @@ -44,13 +43,13 @@ describe('Viewer', () => { let pngFileUploaded; const pngFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const otherFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location }); 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 75da6998a8..0abab8b4fb 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -34,8 +33,8 @@ describe('Viewer', () => { const acsUser = new AcsUserModel(); const excelFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location }); 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 872fc215e3..1e07e355a9 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -39,13 +38,13 @@ describe('Viewer', () => { const acsUser = new AcsUserModel(); const imgFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location }); const imgRenditionFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location }); 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 1b8b307d78..486c5d405c 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -19,7 +19,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -40,8 +39,8 @@ describe('Viewer', () => { const acsUser = new AcsUserModel(); const pptFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location }); 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 eb4dd464c8..8df72fe988 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -39,8 +38,8 @@ describe('Viewer', () => { const acsUser = new AcsUserModel(); const textFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location }); 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 721283e7f5..852046949b 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); -import resources = require('../../../util/resources'); import { FolderModel } from '../../../models/ACS/folderModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -42,8 +41,8 @@ describe('Viewer', () => { const acsUser = new AcsUserModel(); const wordFolderInfo = new FolderModel({ - 'name': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name, - 'location': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location }); beforeAll(async () => { diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index a1c7258651..a0ce5fab7f 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -21,7 +21,6 @@ import { ViewerPage } from '../../pages/adf/viewerPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../util/constants'); -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -42,8 +41,8 @@ describe('Info Drawer', () => { let pngFileUploaded; const pngFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); 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 e28dfced3f..7f3bdb2a9e 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -16,11 +16,9 @@ */ import { browser } from 'protractor'; - import { LoginPage, UploadActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -36,40 +34,40 @@ describe('Content Services Viewer', () => { let zoom; const pdfFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'firstPageText': resources.Files.ADF_DOCUMENTS.PDF.first_page_text, - 'secondPageText': resources.Files.ADF_DOCUMENTS.PDF.second_page_text, - 'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF.last_page_number + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF.first_page_text, + 'secondPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF.second_page_text, + 'lastPageNumber': browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_number }); const protectedFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name, - 'firstPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text, - 'secondPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text, - 'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number, - 'password': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password, - 'location': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name, + 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text, + '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 }); const docxFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location, - 'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, - 'firstPageText': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, + 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text }); const jpgFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, - 'name': resources.Files.ADF_DOCUMENTS.JPG.file_name + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name }); const mp4File = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.MP4.file_location, - 'name': resources.Files.ADF_DOCUMENTS.MP4.file_name + 'location': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_name }); const unsupportedFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location, - 'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name + 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name }); const pptFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.PPT.file_location, - 'name': resources.Files.ADF_DOCUMENTS.PPT.file_name, - 'firstPageText': resources.Files.ADF_DOCUMENTS.PPT.first_page_text + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_name, + 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PPT.first_page_text }); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', 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 70a64c44e5..45c94711ed 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -19,7 +19,6 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions } from '@alfresco/adf-testing'; import { ViewerPage } from '../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -40,8 +39,8 @@ describe('Viewer', () => { let txtFileUploaded; const txtFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); beforeAll(async () => { diff --git a/e2e/core/viewer/viewer-extension.e2e.ts b/e2e/core/viewer/viewer-extension.e2e.ts index 679c27c9c9..aa830323f4 100644 --- a/e2e/core/viewer/viewer-extension.e2e.ts +++ b/e2e/core/viewer/viewer-extension.e2e.ts @@ -22,7 +22,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage'; import CONSTANTS = require('../../util/constants'); -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -44,8 +43,8 @@ describe('Viewer', () => { let jsFileUploaded; const jsFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.JS.file_name, - 'location': resources.Files.ADF_DOCUMENTS.JS.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_location }); beforeAll(async () => { diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index ab0f3af141..a81fa2e937 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage, UploadActions, DataTableComponentPage } from '@alfresco/adf- import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -35,13 +34,13 @@ describe('Viewer - properties', () => { const dataTable = new DataTableComponentPage(); const pngFile = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const fileForOverlay = new FileModel({ 'name': 'fileForOverlay.png', - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); 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 947b4cf13a..9b5db74a65 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -21,7 +21,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import CONSTANTS = require('../../util/constants'); -import resources = require('../../util/resources'); import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -45,13 +44,13 @@ describe('Viewer', () => { const shareDialog = new ShareDialog(); const pngFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const wordFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, - 'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location }); let pngFileShared, wordFileUploaded; diff --git a/e2e/models/ACS/fileModel.ts b/e2e/models/ACS/fileModel.ts index 074d166810..aad8e08330 100644 --- a/e2e/models/ACS/fileModel.ts +++ b/e2e/models/ACS/fileModel.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import resources = require('../../util/resources'); +import { browser } from 'protractor'; import ContentModel = require('./contentModel'); import ContentPropertiesModel = require('./contentProperties'); import { CreatedByModel } from './createdByModel'; @@ -26,13 +26,13 @@ export class FileModel { id = StringUtil.generateRandomString(); name = StringUtil.generateRandomString(); shortName = this.name; - location = resources.Files.ADF_DOCUMENTS.PDF.file_location; + location = browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location; tooltip = this.name; version = ''; - firstPageText = resources.Files.ADF_DOCUMENTS.PDF.first_page_text; - lastPageText = resources.Files.ADF_DOCUMENTS.PDF.last_page_text; - secondPageText = resources.Files.ADF_DOCUMENTS.PDF.second_page_text; - lastPageNumber = resources.Files.ADF_DOCUMENTS.PDF.last_page_number; + firstPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.first_page_text; + lastPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_text; + secondPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.second_page_text; + lastPageNumber = browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_number; createdAt = ''; password = ''; createdByUser = new CreatedByModel(); diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index 8b0283ee10..4553d6870c 100644 --- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts +++ b/e2e/process-services-cloud/apps-section-cloud.e2e.ts @@ -26,7 +26,6 @@ import { } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import resources = require('../util/resources'); describe('Applications list', () => { @@ -34,7 +33,7 @@ describe('Applications list', () => { const navigationBarPage = new NavigationBarPage(); const settingsPage = new SettingsPage(); const appListCloudPage = new AppListCloudPage(); - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; let identityService: IdentityService; let applicationsService: ApplicationsService; let testUser; @@ -83,8 +82,8 @@ describe('Applications list', () => { await appListCloudPage.checkApsContainer(); await appListCloudPage.checkAppIsDisplayed(simpleApp); - await appListCloudPage.checkAppIsDisplayed(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name); - await appListCloudPage.checkAppIsDisplayed(resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name); + await appListCloudPage.checkAppIsDisplayed(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name); + await appListCloudPage.checkAppIsDisplayed(browser.params.resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name); await expect(await appListCloudPage.countAllApps()).toEqual(3); }); diff --git a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts index be93e914c3..433d70f08e 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -21,7 +21,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Edit process filters cloud', () => { @@ -33,7 +32,7 @@ describe('Edit process filters cloud', () => { const processCloudDemoPage = new ProcessCloudDemoPage(); const settingsPage = new SettingsPage(); - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; let identityService: IdentityService; let groupIdentityService: GroupIdentityService; let testUser, groupInfo; diff --git a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts index 15afb150dd..3705d103b3 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -29,8 +29,6 @@ import { import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import resources = require('../util/resources'); - describe('Edit task filters cloud', () => { describe('Edit Task Filters', () => { @@ -45,7 +43,7 @@ describe('Edit task filters cloud', () => { let testUser, groupInfo; const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(); diff --git a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts index 4d98e627b0..ac14c26fdd 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts @@ -33,7 +33,6 @@ import { import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; -import resources = require('../../util/resources'); import { browser } from 'protractor'; describe('Form Field Component - Dropdown Widget', () => { @@ -60,7 +59,7 @@ describe('Form Field Component - Dropdown Widget', () => { let queryService: QueryService; let runningProcessInstance, testUser, groupInfo, tasklist, task; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; beforeAll(async () => { @@ -75,7 +74,7 @@ describe('Form Field Component - Dropdown Widget', () => { processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); diff --git a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts index 57a8a7d021..c3b0671538 100644 --- a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts @@ -20,7 +20,6 @@ import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-s import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { LoginSSOPage, IdentityService, GroupIdentityService, ApiService } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('People Groups Cloud Component', () => { @@ -93,7 +92,7 @@ describe('People Groups Cloud Component', () => { it('[C305041] Should filter the People Single Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.checkPeopleCloudSingleSelectionIsSelected(); await peopleGroupCloudComponentPage.clickPeopleFilerByApp(); - await peopleGroupCloudComponentPage.enterPeopleAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); + await peopleGroupCloudComponentPage.enterPeopleAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name); await peopleCloudComponent.searchAssignee(testUser.firstName); await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`); await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`); @@ -104,7 +103,7 @@ describe('People Groups Cloud Component', () => { it('[C305041] Should filter the People Multiple Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.clickPeopleCloudMultipleSelection(); await peopleGroupCloudComponentPage.clickPeopleFilerByApp(); - await peopleGroupCloudComponentPage.enterPeopleAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); + await peopleGroupCloudComponentPage.enterPeopleAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name); await peopleCloudComponent.searchAssignee(testUser.firstName); await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`); await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`); @@ -122,7 +121,7 @@ describe('People Groups Cloud Component', () => { it('[C305041] Should filter the Groups Single Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.clickGroupCloudSingleSelection(); await peopleGroupCloudComponentPage.clickGroupFilerByApp(); - await peopleGroupCloudComponentPage.enterGroupAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); + await peopleGroupCloudComponentPage.enterGroupAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name); await groupCloudComponentPage.searchGroups(hrGroup.name); await groupCloudComponentPage.checkGroupIsDisplayed(hrGroup.name); await groupCloudComponentPage.selectGroupFromList(hrGroup.name); @@ -132,7 +131,7 @@ describe('People Groups Cloud Component', () => { it('[C305041] Should filter the Groups Multiple Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection(); await peopleGroupCloudComponentPage.clickGroupFilerByApp(); - await peopleGroupCloudComponentPage.enterGroupAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); + await peopleGroupCloudComponentPage.enterGroupAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name); await groupCloudComponentPage.searchGroups(testGroup.name); await groupCloudComponentPage.checkGroupIsDisplayed(testGroup.name); await groupCloudComponentPage.selectGroupFromList(testGroup.name); diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index c0b0fda319..c29ab0af33 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -23,7 +23,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); import { browser } from 'protractor'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; @@ -55,7 +54,7 @@ describe('Process list cloud', () => { let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo, anotherProcessInstance; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; beforeAll(async () => { @@ -70,10 +69,10 @@ describe('Process list cloud', () => { processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); const anotherProcessDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp); processInstancesService = new ProcessInstancesService(apiService); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index 83a08b11e0..e386c419ac 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process-filter-results.e2e.ts @@ -23,7 +23,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); import { browser } from 'protractor'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; @@ -60,8 +59,8 @@ describe('Process filters cloud', () => { let completedProcess, runningProcessInstance, suspendProcessInstance, testUser, anotherUser, groupInfo, anotherProcessInstance, processDefinition, anotherProcessDefinition, differentAppUserProcessInstance, simpleAppProcessDefinition; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; beforeAll(async () => { @@ -79,7 +78,7 @@ describe('Process filters cloud', () => { await apiService.login(anotherUser.email, anotherUser.password); processDefinitionService = new ProcessDefinitionsService(apiService); simpleAppProcessDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); differentAppUserProcessInstance = await processInstancesService.createProcessInstance(simpleAppProcessDefinition.entry.key, simpleApp, { @@ -89,10 +88,10 @@ describe('Process filters cloud', () => { await apiService.login(testUser.email, testUser.password); processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); anotherProcessDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp); runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { 'name': StringUtil.generateRandomString(), diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index b3dc44ba75..d7d7633865 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -31,7 +31,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Process filters cloud', () => { @@ -55,7 +54,7 @@ describe('Process filters cloud', () => { let queryService: QueryService; let runningProcess, completedProcess, testUser, groupInfo; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; beforeAll(async () => { await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); @@ -69,7 +68,7 @@ describe('Process filters cloud', () => { processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); processInstancesService = new ProcessInstancesService(apiService); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 6219227fac..f7ae234b92 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts @@ -36,14 +36,12 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas import { ProcessHeaderCloudPage } from '@alfresco/adf-testing'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import resources = require('../util/resources'); - describe('Process Header cloud component', () => { describe('Process Header cloud component', () => { - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; - const subProcessApp = resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const subProcessApp = browser.params.resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name; const formatDate = 'MMM D, YYYY'; const processHeaderCloudPage = new ProcessHeaderCloudPage(); diff --git a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts index 33cce8b60d..38fba4ecc9 100644 --- a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts +++ b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts @@ -21,10 +21,8 @@ import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/p import { AppListCloudPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; - import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; import { ProcessInstancesService } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Process list cloud', () => { @@ -42,7 +40,7 @@ describe('Process list cloud', () => { let groupIdentityService: GroupIdentityService; let testUser, groupInfo, editProcess, deleteProcess; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); beforeAll(async () => { @@ -57,7 +55,7 @@ describe('Process list cloud', () => { await apiService.login(testUser.email, testUser.password); processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); diff --git a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts index 17263352ac..800f861af7 100644 --- a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts @@ -26,10 +26,8 @@ import { } from '@alfresco/adf-testing'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; - import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; -import resources = require('../util/resources'); describe('Process list cloud', () => { @@ -47,7 +45,7 @@ describe('Process list cloud', () => { let groupIdentityService: GroupIdentityService; let testUser, groupInfo; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; let jsonFile; let runningProcess; @@ -63,7 +61,7 @@ describe('Process list cloud', () => { processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); processInstancesService = new ProcessInstancesService(apiService); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); diff --git a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts index ae74abe637..bcb88c9d8b 100644 --- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts @@ -21,10 +21,8 @@ import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/p import { AppListCloudPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; - import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; import { ProcessInstancesService } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Process list cloud', () => { @@ -42,7 +40,7 @@ describe('Process list cloud', () => { let groupIdentityService: GroupIdentityService; let testUser, groupInfo; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const noOfProcesses = 3; const processInstances = []; @@ -59,7 +57,7 @@ describe('Process list cloud', () => { await apiService.login(testUser.email, testUser.password); processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); for (let i = 0; i < noOfProcesses; i++) { diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index f083d1e15b..5dabb25160 100644 --- a/e2e/process-services-cloud/start-process-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-process-cloud.e2e.ts @@ -21,7 +21,6 @@ import { browser, protractor } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { StringUtil, BrowserActions } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Start Process', () => { @@ -41,7 +40,7 @@ describe('Start Process', () => { const processNameBiggerThen255Characters = StringUtil.generateRandomString(256); const lengthValidationError = 'Length exceeded, 255 characters max.'; const requiredError = 'Process Name is required'; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; let identityService: IdentityService; let groupIdentityService: GroupIdentityService; let testUser, groupInfo; 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 2d942140da..0bb1dd159f 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -39,7 +39,6 @@ import { ProcessInstancesService, ProcessDefinitionsService } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage'; @@ -85,15 +84,15 @@ describe('Start Task Form', () => { let processInstancesService: ProcessInstancesService; let processDefinition, uploadLocalFileProcess, uploadContentFileProcess, uploadDefaultFileProcess, cancelUploadFileProcess, completeUploadFileProcess; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; - const pdfFile = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name }); + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const pdfFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name }); const pdfFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PDF.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location }); const testFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TEST.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TEST.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location }); let identityService: IdentityService; @@ -114,7 +113,7 @@ describe('Start Task Form', () => { processDefinitionService = new ProcessDefinitionsService(apiService); processInstancesService = new ProcessInstancesService(apiService); processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.uploadFileProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.uploadFileProcess, candidateBaseApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); @@ -192,7 +191,7 @@ describe('Start Task Form', () => { await tasksCloudDemoPage.openNewTaskForm(); await startTask.checkFormIsDisplayed(); await startTask.addName(standaloneTaskName); - await startTask.selectFormDefinition(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform); + await startTask.selectFormDefinition(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform); await startTask.clickStartButton(); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(standaloneTaskName); await tasksCloudDemoPage.taskListCloudComponent().selectRow(standaloneTaskName); @@ -225,8 +224,8 @@ describe('Start Task Form', () => { await tasksCloudDemoPage.openNewTaskForm(); await startTask.checkFormIsDisplayed(); await startTask.checkFormDefinitionIsNotDisplayed('uploadfileform'); - await startTask.checkFormDefinitionIsDisplayed(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform); - await startTask.checkFormDefinitionIsDisplayed(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.formtotestvalidations); + await startTask.checkFormDefinitionIsDisplayed(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform); + await startTask.checkFormDefinitionIsDisplayed(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.formtotestvalidations); }); }); diff --git a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts index 5d7fc81060..afac75a4c2 100644 --- a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts @@ -31,7 +31,6 @@ import { SettingsPage, GroupIdentityService } from '@alfresco/adf-testing'; -import resources = require('../../util/resources'); describe('Start Task', () => { @@ -57,7 +56,7 @@ describe('Start Task', () => { const requiredError = 'Field required'; const dateValidationError = 'Date format DD/MM/YYYY'; let apsUser, testUser, activitiUser, groupInfo; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; let identityService: IdentityService; let groupIdentityService: GroupIdentityService; diff --git a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts b/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts index f81f944834..d2c0490538 100644 --- a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts @@ -31,7 +31,6 @@ import { SettingsPage, GroupIdentityService, RolesService } from '@alfresco/adf-testing'; -import resources = require('../../util/resources'); describe('Start Task - Group Cloud Component', () => { @@ -51,7 +50,7 @@ describe('Start Task - Group Cloud Component', () => { const bothGroupsTaskName = StringUtil.generateRandomString(5); const oneGroupTaskName = StringUtil.generateRandomString(5); let apsUser, testUser, hrGroup, testGroup; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; let identityService: IdentityService; let groupIdentityService: GroupIdentityService; diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index 5989387f04..c67d081835 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -19,7 +19,6 @@ import { browser } from 'protractor'; import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import resources = require('../util/resources'); describe('Task filters cloud', () => { @@ -36,7 +35,7 @@ describe('Task filters cloud', () => { const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const newTask = StringUtil.generateRandomString(5), completedTask = StringUtil.generateRandomString(5); - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; beforeAll(async() => { diff --git a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts index 5279355704..0a6fc3a332 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -32,8 +32,6 @@ import { import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import resources = require('../util/resources'); - describe('Task form cloud component', () => { const loginSSOPage = new LoginSSOPage(); @@ -53,8 +51,8 @@ describe('Task form cloud component', () => { let groupIdentityService: GroupIdentityService; let completedTask, createdTask, assigneeTask, toBeCompletedTask, formValidationsTask, testUser, formTaskId; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); @@ -105,13 +103,13 @@ describe('Task form cloud component', () => { for (let i = 0; i < 3; i++) { visibilityConditionTasks[i] = await tasksService.createStandaloneTaskWithForm(StringUtil.generateRandomString(), - simpleApp, resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityFields.id); + simpleApp, browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityFields.id); await tasksService.claimTask(visibilityConditionTasks[i].entry.id, simpleApp); } for (let i = 3; i < 6; i++) { visibilityConditionTasks[i] = await tasksService.createStandaloneTaskWithForm(StringUtil.generateRandomString(), - simpleApp, resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityVars.id); + simpleApp, browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityVars.id); await tasksService.claimTask(visibilityConditionTasks[i].entry.id, simpleApp); } @@ -128,7 +126,7 @@ describe('Task form cloud component', () => { processDefinitionService = new ProcessDefinitionsService(apiService); let processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateUserProcess, candidateBaseApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateUserProcess, candidateBaseApp); processInstancesService = new ProcessInstancesService(apiService); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index dcf620d549..3dbec184fc 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -19,11 +19,9 @@ import CONSTANTS = require('../util/constants'); import { ApiService, StringUtil, SettingsPage, IdentityService, GroupIdentityService, LocalStorageUtil } from '@alfresco/adf-testing'; import moment = require('moment'); import { browser } from 'protractor'; - import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { LoginSSOPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import resources = require('../util/resources'); describe('Task Header cloud component', () => { const basicCreatedTaskName = StringUtil.generateRandomString(); @@ -37,7 +35,7 @@ describe('Task Header cloud component', () => { let completedEndDate; let defaultDate; let groupInfo, testUser; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const priority = 30; const description = 'descriptionTask'; const formatDate = 'MMM D, YYYY'; diff --git a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts index 1a305e0c1f..5de8c3ecd7 100644 --- a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts +++ b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts @@ -23,7 +23,6 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; import { ProcessInstancesService } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Process list cloud', () => { @@ -42,7 +41,7 @@ describe('Process list cloud', () => { let tasksService: TasksService; let testUser, groupInfo, editProcess, deleteProcess, editTask, deleteTask; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); beforeAll(async () => { @@ -57,7 +56,7 @@ describe('Process list cloud', () => { await apiService.login(testUser.email, testUser.password); processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 663f2a4ed7..e20094675d 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -25,11 +25,8 @@ import { import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; - import moment = require('moment'); -import resources = require('../util/resources'); - describe('Edit task filters and task list properties', () => { const loginSSOPage = new LoginSSOPage(); @@ -45,8 +42,8 @@ describe('Edit task filters and task list properties', () => { let groupIdentityService: GroupIdentityService; const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; - const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const noTasksFoundMessage = 'No Tasks Found'; let createdTask, notAssigned, notDisplayedTask, processDefinition, processInstance, priorityTask, subTask, otherOwnerTask, testUser, groupInfo; @@ -86,7 +83,7 @@ describe('Edit task filters and task list properties', () => { processDefinitionService = new ProcessDefinitionsService(apiService); processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index d1cd72e9d4..bf8afbee39 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -22,7 +22,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; import { StringUtil } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Task list cloud - selection', () => { @@ -41,7 +40,7 @@ describe('Task list cloud - selection', () => { let identityService: IdentityService; let groupIdentityService: GroupIdentityService; - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; const noOfTasks = 3; let response, testUser, groupInfo; const tasks = []; diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index 4546577e51..65f9d69a5d 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -30,7 +30,6 @@ import { import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); describe('Task filters cloud', () => { @@ -54,7 +53,7 @@ describe('Task filters cloud', () => { const createdTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(), deletedTaskName = StringUtil.generateRandomString(); - const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; + const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name; let assignedTask, deletedTask, testUser, groupInfo; const orderByNameAndPriority = ['cCreatedTask', 'dCreatedTask', 'eCreatedTask']; let priority = 30; @@ -85,7 +84,7 @@ describe('Task filters cloud', () => { processDefinitionService = new ProcessDefinitionsService(apiService); const processDefinition = await processDefinitionService - .getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); + .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); processInstancesService = new ProcessInstancesService(apiService); const processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index 771da22d71..92fc024ebe 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -19,11 +19,7 @@ import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import CONSTANTS = require('../util/constants'); - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -34,9 +30,9 @@ describe('Modify applications', () => { const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); - const app = resources.Files.APP_WITH_PROCESSES; - const appToBeDeleted = resources.Files.SIMPLE_APP_WITH_USER_FORM; - const replacingApp = resources.Files.WIDGETS_SMOKE_TEST; + const app = browser.params.resources.Files.APP_WITH_PROCESSES; + const appToBeDeleted = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; + const replacingApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST; const apps = new AppsActions(); const modelActions = new ModelsActions(); let firstApp, appVersionToBeDeleted; diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index 741ac4b30c..707fe3b27b 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -16,16 +16,10 @@ */ import { LoginPage, Widget } from '@alfresco/adf-testing'; - import { TasksPage } from '../pages/adf/process-services/tasksPage'; - import CONSTANTS = require('../util/constants'); - import { FileModel } from '../models/ACS/fileModel'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { ViewerPage } from '../pages/adf/viewerPage'; import { AppsActions } from '../actions/APS/apps.actions'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -41,8 +35,8 @@ describe('Start Task - Task App', () => { const navigationBarPage = new NavigationBarPage(); let processUserModel; - const app = resources.Files.WIDGETS_SMOKE_TEST; - const pdfFile = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name }); + const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST; + const pdfFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name }); const appFields = app.form_fields; beforeAll(async () => { diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index 052cc67b46..927185650a 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -23,7 +23,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; @@ -38,7 +37,7 @@ describe('Attach Form Component', () => { const formFields = new FormFields(); const navigationBarPage = new NavigationBarPage(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const formTextField = app.form_fields.form_fieldId; let user, tenantId, appId; diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index 4f3094e1a8..2d23f185de 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -20,14 +20,9 @@ import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import CONSTANTS = require('../util/constants'); - import { Tenant } from '../models/APS/tenant'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import fs = require('fs'); @@ -37,7 +32,7 @@ describe('Checklist component', () => { const loginPage = new LoginPage(); let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const taskPage = new TasksPage(); const processServices = new ProcessServicesPage(); const checklistDialog = new ChecklistDialog(); diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index dc4119aa86..e6a06fb700 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -20,9 +20,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { CommentsPage } from '../pages/adf/commentsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -34,7 +31,7 @@ describe('Comment component for Processes', () => { const commentsPage = new CommentsPage(); const navigationBarPage = new NavigationBarPage(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let user, tenantId, appId, processInstanceId, addedComment; beforeAll(async () => { diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index 4c6e765208..3036c679b4 100644 --- a/e2e/process-services/comment-component-tasks.e2e.ts +++ b/e2e/process-services/comment-component-tasks.e2e.ts @@ -21,11 +21,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { CommentsPage } from '../pages/adf/commentsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import CONSTANTS = require('../util/constants'); - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -37,7 +33,7 @@ describe('Comment component for Processes', () => { const taskPage = new TasksPage(); const commentsPage = new CommentsPage(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let user, tenantId, appId, secondUser, newTaskId; const taskName = { diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index 1b9e908c83..fe8b9e2252 100644 --- a/e2e/process-services/custom-process-filters-sorting.e2e.ts +++ b/e2e/process-services/custom-process-filters-sorting.e2e.ts @@ -21,9 +21,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { FiltersPage } from '../pages/adf/process-services/filtersPage'; - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -37,7 +34,7 @@ describe('Sorting for process filters', () => { const apps = new AppsActions(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let tenantId, appId, user, processesQuery; const processFilter = { diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index 38b5365679..54101ab3a4 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -20,13 +20,9 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage'; import { PaginationPage, DateUtil } from '@alfresco/adf-testing'; import moment = require('moment'); - import { Tenant } from '../models/APS/tenant'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); import { Util } from '../util/util'; - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions'; @@ -39,9 +35,9 @@ describe('Start Task - Custom App', () => { const taskListSinglePage = new TaskListDemoPage(); const paginationPage = new PaginationPage(); let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let appRuntime, secondAppRuntime; - const secondApp = resources.Files.WIDGETS_SMOKE_TEST; + const secondApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST; let appModel, secondAppModel; const completedTasks = []; const paginationTasksName = ['t01', 't02', 't03', 't04', 't05', 't06', 't07', 't08', 't09', 't10', 't11', 't12', 't13', 'taskOne', 'taskTwo', 'taskOne']; diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index 1145a8a773..47d85cf70f 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -19,10 +19,7 @@ import { LoginPage, Widget, DatePickerPage, DateUtil } from '@alfresco/adf-testi import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -62,7 +59,7 @@ describe('Dynamic Table', () => { }); describe('Date Picker', () => { - const app = resources.Files.DYNAMIC_TABLE_APP; + const app = browser.params.resources.Files.DYNAMIC_TABLE_APP; const randomText = { date: '12/12/2012', @@ -136,7 +133,7 @@ describe('Dynamic Table', () => { }); describe('Required Dropdown', () => { - const app = resources.Files.APP_DYNAMIC_TABLE_DROPDOWN; + const app = browser.params.resources.Files.APP_DYNAMIC_TABLE_DROPDOWN; const dropdown = widget.dropdown(); beforeAll(async () => { diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index 25423d4c8f..505b185c5a 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -16,7 +16,6 @@ */ import { browser } from 'protractor'; -import resources = require('../util/resources'); import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; @@ -24,7 +23,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/processFilters import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { ProcessListPage } from '../pages/adf/process-services/processListPage'; import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -39,8 +37,8 @@ describe('Empty Process List Test', () => { const processListPage = new ProcessListPage(); const startProcessPage = new StartProcessPage(); - const appA = resources.Files.APP_WITH_PROCESSES; - const appB = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const appA = browser.params.resources.Files.APP_WITH_PROCESSES; + const appB = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let user; diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index c6de170e9b..363a52f9ef 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -21,9 +21,6 @@ import { StartProcessPage } from '../pages/adf/process-services/startProcessPage import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -34,7 +31,7 @@ describe('Form widgets - People', () => { const loginPage = new LoginPage(); let processUserModel; - const app = resources.Files.APP_WITH_USER_WIDGET; + const app = browser.params.resources.Files.APP_WITH_USER_WIDGET; const processFiltersPage = new ProcessFiltersPage(); let appModel; let alfrescoJsApi; diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index f344006c1b..db167dd59a 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -17,15 +17,10 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; - import CONSTANTS = require('../util/constants'); - import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -42,7 +37,7 @@ describe('Form widgets', () => { const widget = new Widget(); describe('Form widgets', () => { - const app = resources.Files.WIDGETS_SMOKE_TEST; + const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST; const appFields = app.form_fields; beforeAll(async () => { @@ -201,7 +196,7 @@ describe('Form widgets', () => { describe('with fields involving other people', () => { const appsActions = new AppsActions(); - const app = resources.Files.FORM_ADF; + const app = browser.params.resources.Files.FORM_ADF; let deployedApp, process; const appFields = app.form_fields; diff --git a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts index eb559a0aa1..7aa94688e9 100644 --- a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts +++ b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts @@ -20,9 +20,6 @@ import { PaginationPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -41,7 +38,7 @@ describe('Process List - Pagination when adding processes', () => { const processDetailsPage = new ProcessDetailsPage(); let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const nrOfProcesses = 25; let page, totalPages; let i; diff --git a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts index 829ddbb7e8..c2729ef420 100644 --- a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts @@ -19,14 +19,10 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { PaginationPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import CONSTANTS = require('../util/constants'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; - -import resources = require('../util/resources'); import { browser } from 'protractor'; describe('Items per page set to 15 and adding of tasks', () => { @@ -36,7 +32,7 @@ describe('Items per page set to 15 and adding of tasks', () => { const paginationPage = new PaginationPage(); let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let currentPage = 1; const nrOfTasks = 25; const totalPages = 2; diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 929a6e4e19..5764dfed1e 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -19,14 +19,9 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; - import CONSTANTS = require('../util/constants'); - import { Tenant } from '../models/APS/tenant'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import fs = require('fs'); @@ -37,7 +32,7 @@ describe('People component', () => { const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); let processUserModel, assigneeUserModel, secondAssigneeUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const taskPage = new TasksPage(); const peopleTitle = 'People this task is shared with '; const processServices = new ProcessServicesPage(); diff --git a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts index ee57e7adc8..d40f9be000 100644 --- a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts @@ -21,9 +21,6 @@ import { ProcessDetailsPage } from '../pages/adf/process-services/processDetails import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { ViewerPage } from '../pages/adf/viewerPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -38,10 +35,10 @@ describe('Attachment list action menu for processes', () => { const attachmentListPage = new AttachmentListPage(); const navigationBarPage = new NavigationBarPage(); const viewerPage = new ViewerPage(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const pngFile = new FileModel({ - location: resources.Files.ADF_DOCUMENTS.PNG.file_location, - name: resources.Files.ADF_DOCUMENTS.PNG.file_name + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location, + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name }); const downloadedPngFile = pngFile.name; diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index 52a223caf8..564a3dadf0 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -15,10 +15,8 @@ * limitations under the License. */ -import resources = require('../util/resources'); import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; @@ -44,7 +42,7 @@ describe('Process Filters Test', () => { const processDetailsPage = new ProcessDetailsPage(); let appModel; - const app = resources.Files.APP_WITH_DATE_FIELD_FORM; + const app = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; const processTitle = { running: 'Test_running', diff --git a/e2e/process-services/process-instance-details.e2e.ts b/e2e/process-services/process-instance-details.e2e.ts index ab3ae6dc6f..b7f39304cd 100644 --- a/e2e/process-services/process-instance-details.e2e.ts +++ b/e2e/process-services/process-instance-details.e2e.ts @@ -16,11 +16,9 @@ */ import { browser } from 'protractor'; - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import resources = require('../util/resources'); import { AppsActions } from '../actions/APS/apps.actions'; import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -39,7 +37,7 @@ describe('Process Instance Details', () => { const processDetailsPage = new ProcessDetailsPage(); let appModel, process, user; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const PROCESS_DATE_FORMAT = 'mmm d, yyyy'; beforeAll(async () => { diff --git a/e2e/process-services/processList-component.e2e.ts b/e2e/process-services/processList-component.e2e.ts index 3073e2796d..98aab6ba84 100644 --- a/e2e/process-services/processList-component.e2e.ts +++ b/e2e/process-services/processList-component.e2e.ts @@ -17,10 +17,7 @@ import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -30,8 +27,8 @@ describe('Process List Test', () => { const loginPage = new LoginPage(); const processListDemoPage = new ProcessListDemoPage(); - const appWithDateField = resources.Files.APP_WITH_DATE_FIELD_FORM; - const appWithUserWidget = resources.Files.APP_WITH_USER_WIDGET; + const appWithDateField = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; + const appWithUserWidget = browser.params.resources.Files.APP_WITH_USER_WIDGET; let appDateModel, appUserWidgetModel, user; const processList = ['Process With Date', 'Process With Date 2', 'Process With User Widget', 'Process With User Widget 2']; diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index 7ffce461ca..cab240794e 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -20,10 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { PaginationPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -51,7 +48,7 @@ describe('Process List - Pagination', () => { const processDetailsPage = new ProcessDetailsPage(); let deployedTestApp; let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const nrOfProcesses = 20; let page; let totalPages; diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index 8bf4ee05f3..d593eeecab 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -19,11 +19,8 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { PaginationPage } from '@alfresco/adf-testing'; - import CONSTANTS = require('../util/constants'); - import { browser } from 'protractor'; -import resources = require('../util/resources'); import { Util } from '../util/util'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -36,7 +33,7 @@ describe('Task List Pagination - Sorting', () => { const taskPage = new TasksPage(); const paginationPage = new PaginationPage(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const nrOfTasks = 20; let processUserModel; const taskNameBase = 'Task'; diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index 916d84f083..aad395c3a8 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -20,14 +20,9 @@ import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import CONSTANTS = require('../util/constants'); - import { Tenant } from '../models/APS/tenant'; import Task = require('../models/APS/Task'); - -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import fs = require('fs'); @@ -38,7 +33,7 @@ describe('Start Task - Task App', () => { const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const taskPage = new TasksPage(); const tasks = ['Standalone task', 'Completed standalone task', 'Add a form', 'Remove form']; const noFormMessage = 'No forms attached'; diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 02ee517d8c..4c9b570f12 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import resources = require('../util/resources'); import CONSTANTS = require('../util/constants'); import { LoginPage, StartProcessDialog, Widget, FileBrowserUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -27,13 +26,10 @@ import { ProcessDetailsPage } from '../pages/adf/process-services/processDetails import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { AppsActions } from '../actions/APS/apps.actions'; import { browser } from 'protractor'; - import { User } from '../models/APS/user'; import { Tenant } from '../models/APS/tenant'; - import { FileModel } from '../models/ACS/fileModel'; import dateFormat = require('dateformat'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { StringUtil } from '@alfresco/adf-testing'; @@ -50,9 +46,9 @@ describe('Start Process Component', () => { const startProcessDialog = new StartProcessDialog(); const apps = new AppsActions(); const widget = new Widget(); - const app = resources.Files.APP_WITH_PROCESSES; - const simpleApp = resources.Files.WIDGETS_SMOKE_TEST; - const dateFormApp = resources.Files.APP_WITH_DATE_FIELD_FORM; + const app = browser.params.resources.Files.APP_WITH_PROCESSES; + const simpleApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST; + const dateFormApp = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; let appId, procUserModel, secondProcUserModel, tenantId, simpleAppCreated, dateFormAppCreated; const processModelWithSe = 'process_with_se', processModelWithoutSe = 'process_without_se'; const processName255Characters = StringUtil.generateRandomString(255); @@ -62,8 +58,8 @@ describe('Start Process Component', () => { const auditLogFile = 'Audit.pdf'; const jpgFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, - 'name': resources.Files.ADF_DOCUMENTS.JPG.file_name + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name }); beforeAll(async () => { diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index 87817a0f23..98696d6e99 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -22,14 +22,9 @@ import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import { Tenant } from '../models/APS/tenant'; - import { FileModel } from '../models/ACS/fileModel'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -44,7 +39,7 @@ describe('Start Task - Custom App', () => { const processServiceTabBarPage = new ProcessServiceTabBarPage(); let processUserModel, assigneeUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const formTextField = app.form_fields.form_fieldId; const formFieldValue = 'First value '; const taskPage = new TasksPage(); @@ -53,8 +48,8 @@ describe('Start Task - Custom App', () => { const showHeaderTask = 'Show Header'; let appModel; const pngFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location, - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name }); beforeAll(async () => { diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index 4f21d9e4f5..7ba67c889c 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -15,22 +15,15 @@ * limitations under the License. */ -import { by } from 'protractor'; - +import { by, browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - import CONSTANTS = require('../util/constants'); - import { Tenant } from '../models/APS/tenant'; import { FileModel } from '../models/ACS/fileModel'; - -import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { StringUtil } from '@alfresco/adf-testing'; @@ -46,7 +39,7 @@ describe('Start Task - Task App', () => { const navigationBarPage = new NavigationBarPage(); let processUserModel, assigneeUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const formTextField = app.form_fields.form_fieldId; const formFieldValue = 'First value '; const taskPage = new TasksPage(); @@ -57,8 +50,8 @@ describe('Start Task - Task App', () => { const tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File']; const showHeaderTask = 'Show Header'; const jpgFile = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, - 'name': resources.Files.ADF_DOCUMENTS.JPG.file_name + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name }); beforeAll(async () => { diff --git a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts index b2f5cd1035..42b4a2d5ed 100644 --- a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts @@ -16,20 +16,14 @@ */ import { browser } from 'protractor'; - import { LoginPage, FileBrowserUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { ViewerPage } from '../pages/adf/viewerPage'; - import CONSTANTS = require('../util/constants'); - -import resources = require('../util/resources'); - import path = require('path'); import fs = require('fs'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -42,10 +36,10 @@ describe('Attachment list action menu for tasks', () => { const taskPage = new TasksPage(); const attachmentListPage = new AttachmentListPage(); const viewerPage = new ViewerPage(); - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const pngFile = new FileModel({ - location: resources.Files.ADF_DOCUMENTS.PNG.file_location, - name: resources.Files.ADF_DOCUMENTS.PNG.file_name + location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location, + name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name }); const downloadedPngFile = pngFile.name; let tenantId, appId, relatedContent, relatedContentId; diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index fa3ee81651..6570df6a9a 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -18,14 +18,9 @@ import { LoginPage, BrowserActions, FileBrowserUtil } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; - import CONSTANTS = require('../util/constants'); - import { Tenant } from '../models/APS/tenant'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -34,7 +29,7 @@ describe('Task Audit', () => { const loginPage = new LoginPage(); let processUserModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const taskPage = new TasksPage(); const processServices = new ProcessServicesPage(); const taskTaskApp = 'Audit task task app'; diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index 0db20eab82..3d89dac6db 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -26,13 +26,10 @@ import { TasksListPage } from '../pages/adf/process-services/tasksListPage'; import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; import { FiltersPage } from '../pages/adf/process-services/filtersPage'; import { AppsActions } from '../actions/APS/apps.actions'; - import { StandaloneTask } from '../models/APS/standaloneTask'; - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { FormModelActions } from '../actions/APS/formModel.actions'; -import resources = require('../util/resources'); describe('Task Details - Form', () => { const loginPage = new LoginPage(); @@ -186,7 +183,7 @@ describe('Task Details - Form', () => { const formActions = new FormModelActions(); beforeAll(async () => { - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const apps = new AppsActions(); await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location); }); @@ -194,7 +191,7 @@ describe('Task Details - Form', () => { beforeEach(async () => { newTask = await this.alfrescoJsApi.activiti.taskApi.createNewTask({ name: StringUtil.generateRandomString() }); const form = await formActions.getFormByName(this.alfrescoJsApi, - resources.Files.SIMPLE_APP_WITH_USER_FORM.visibilityTabForm.formName); + browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM.visibilityTabForm.formName); await this.alfrescoJsApi.activiti.taskApi.attachForm(newTask.id, { 'formId': form.id }); await (await new NavigationBarPage().navigateToProcessServicesPage()).goToTaskApp(); diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index cb01c7308a..969f0f5a3e 100644 --- a/e2e/process-services/task-details-no-form.e2e.ts +++ b/e2e/process-services/task-details-no-form.e2e.ts @@ -18,14 +18,9 @@ import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; - import CONSTANTS = require('../util/constants'); - import { Tenant } from '../models/APS/tenant'; - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; @@ -35,7 +30,7 @@ describe('Task Details - No form', () => { const loginPage = new LoginPage(); const navigationBarPage = new NavigationBarPage(); let processUserModel; - const app = resources.Files.NO_FORM_APP; + const app = browser.params.resources.Files.NO_FORM_APP; const taskPage = new TasksPage(); const noFormMessage = 'No forms attached'; const apps = new AppsActions(); diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 554e093efb..98e8571e05 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -23,11 +23,8 @@ import TaskModel = require('../models/APS/TaskModel'); import FormModel = require('../models/APS/FormModel'); import { AppsActions } from '../actions/APS/apps.actions'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; - -import resources = require('../util/resources'); import CONSTANTS = require('../util/constants'); import dateFormat = require('dateformat'); - import { LoginPage, BrowserActions, StringUtil } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { browser } from 'protractor'; @@ -36,7 +33,7 @@ describe('Task Details component', () => { const processServices = new ProcessServicesPage(); let processUserModel, appModel; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File']; const TASK_DATE_FORMAT = 'mmm d, yyyy'; let formModel; diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index b352ed13f0..295ba4ae89 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -15,8 +15,6 @@ * limitations under the License. */ -import resources = require('../util/resources'); - import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; @@ -26,7 +24,6 @@ import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles'; import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage'; - import { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -44,7 +41,7 @@ describe('Task', () => { const taskDetailsPage = new TaskDetailsPage(); const taskFiltersDemoPage = new TaskFiltersDemoPage(); - const app = resources.Files.APP_WITH_DATE_FIELD_FORM; + const app = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM; let appId, tenantId; beforeAll(async () => { @@ -229,7 +226,7 @@ describe('Task', () => { let taskFilterId; - const app = resources.Files.APP_WITH_PROCESSES; + const app = browser.params.resources.Files.APP_WITH_PROCESSES; beforeAll(async () => { const apps = new AppsActions(); diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index 8c5858959f..96427c8a25 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import resources = require('../util/resources'); import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; @@ -23,7 +22,6 @@ import { TasksPage } from '../pages/adf/process-services/tasksPage'; 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 { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -43,7 +41,7 @@ describe('Task Filters Sorting', () => { let appId; let importedApp; - const app = resources.Files.APP_WITH_PROCESSES; + const app = browser.params.resources.Files.APP_WITH_PROCESSES; const tasks = [ { name: 'Task 1 Completed', dueDate: '01/01/2019' }, diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 586378d93a..24a01a61a4 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -19,12 +19,8 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { PaginationPage } from '@alfresco/adf-testing'; - import CONSTANTS = require('../util/constants'); - import { browser } from 'protractor'; -import resources = require('../util/resources'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -37,7 +33,7 @@ describe('Task List Pagination', () => { const paginationPage = new PaginationPage(); let processUserModel, processUserModelEmpty; - const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; + const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; let currentPage = 1; const nrOfTasks = 20; let totalPages; diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index 8260de9a8a..7fdd43acd0 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -20,9 +20,7 @@ import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; - import CONSTANTS = require('../../util/constants'); -import resources = require('../../util/resources'); import { browser } from 'protractor'; describe('Amount Widget', () => { @@ -35,7 +33,7 @@ describe('Amount Widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.AMOUNT; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.AMOUNT; let deployedApp, process; beforeAll(async () => { @@ -51,7 +49,7 @@ describe('Amount Widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index bab81c9b82..e20261f415 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Attach Folder widget', () => { const loginPage = new LoginPage(); @@ -32,7 +31,7 @@ describe('Attach Folder widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.ATTACH_FOLDER; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.ATTACH_FOLDER; let deployedApp, process; beforeAll(async () => { @@ -48,7 +47,7 @@ describe('Attach Folder widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index 8113e4b434..e2b0d03a41 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Checkbox Widget', () => { @@ -33,7 +32,7 @@ describe('Checkbox Widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.CHECKBOX; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.CHECKBOX; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Checkbox Widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 4db843973f..85c4e56eea 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Date and time widget', () => { @@ -33,7 +32,7 @@ describe('Date and time widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.DATETIME; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.DATETIME; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Date and time widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index bc1ba4bca9..a14f2dcaec 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget, FormPage } from '@alfresco/adf-testi import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { FormDemoPage } from '../../pages/adf/demo-shell/process-services/formDemoPage'; import { customDateFormAPS1 } from '../../resources/forms/custom-date-form'; @@ -36,7 +35,7 @@ describe('Date widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.DATE; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.DATE; let deployedApp, process; beforeAll(async () => { @@ -52,7 +51,7 @@ describe('Date widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index bde5e20c97..53206b0ce3 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Document Template widget', () => { @@ -33,7 +32,7 @@ describe('Document Template widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.FILE_FORM_ADF; + const app = browser.params.resources.Files.FILE_FORM_ADF; let deployedApp, process; beforeAll(async () => { diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index a29dea6705..0d085bd09c 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Dropdown widget', () => { @@ -33,7 +32,7 @@ describe('Dropdown widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.DROPDOWN; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.DROPDOWN; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Dropdown widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index f853534f78..e1ddf1812b 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Dynamic Table widget ', () => { @@ -36,7 +35,7 @@ describe('Dynamic Table widget ', () => { let deployedApp, process; describe('with Date Time Widget App', () => { - const app = resources.Files.WIDGET_CHECK_APP.DYNAMIC_TABLE; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.DYNAMIC_TABLE; beforeAll(async () => { const users = new UsersActions(); @@ -51,7 +50,7 @@ describe('Dynamic Table widget ', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { @@ -97,7 +96,7 @@ describe('Dynamic Table widget ', () => { describe('with People Widget App', () => { - const app = resources.Files.WIDGET_CHECK_APP.DYNAMIC_TABLE_USERS; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.DYNAMIC_TABLE_USERS; beforeAll(async () => { const users = new UsersActions(); @@ -112,7 +111,7 @@ describe('Dynamic Table widget ', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 043a07e752..81ffb0f8f1 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Header widget', async () => { @@ -33,7 +32,7 @@ describe('Header widget', async () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.HEADER; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.HEADER; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Header widget', async () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index 065f53170e..6eee985f8c 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Hyperlink widget', () => { @@ -33,7 +32,7 @@ describe('Hyperlink widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.HYPERLINK; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.HYPERLINK; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Hyperlink widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 132b033542..2780b7f7a9 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Multi-line Widget', () => { @@ -33,7 +32,7 @@ describe('Multi-line Widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.MULTILINE_TEXT; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.MULTILINE_TEXT; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Multi-line Widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index d175709c62..f91b51a722 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -20,10 +20,8 @@ import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; - import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Number widget', () => { @@ -34,7 +32,7 @@ describe('Number widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.NUMBER; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.NUMBER; let deployedApp, process; beforeAll(async () => { @@ -50,7 +48,7 @@ describe('Number widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index 037f7f749b..c928776d9f 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('People widget', () => { @@ -33,7 +32,7 @@ describe('People widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.ADD_PEOPLE; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.ADD_PEOPLE; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('People widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index 4d005cffef..3d7cce47a3 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Radio Buttons Widget', () => { @@ -33,7 +32,7 @@ describe('Radio Buttons Widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.RADIO_BUTTONS; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.RADIO_BUTTONS; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Radio Buttons Widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index ee7b363255..8176c57d4c 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import resources = require('../../util/resources'); describe('Text widget', () => { @@ -33,7 +32,7 @@ describe('Text widget', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.TEXT; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.TEXT; let deployedApp, process; beforeAll(async () => { @@ -49,7 +48,7 @@ describe('Text widget', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts index f88130e69b..74047f4cc9 100644 --- a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts +++ b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts @@ -18,7 +18,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { LoginPage, Widget, BrowserActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { UsersActions } from '../../actions/users.actions'; import CONSTANTS = require('../../util/constants'); import { AppsActions } from '../../actions/APS/apps.actions'; @@ -56,7 +55,7 @@ describe('Process-Services - Visibility conditions', () => { let alfrescoJsApi; const appsActions = new AppsActions(); let appModel; - const app = resources.Files.WIDGET_CHECK_APP.VISIBILITY; + const app = browser.params.resources.Files.WIDGET_CHECK_APP.VISIBILITY; let deployedApp, process; beforeAll(async () => { @@ -72,7 +71,7 @@ describe('Process-Services - Visibility conditions', () => { processUserModel = await users.createTenantAndUser(alfrescoJsApi); await alfrescoJsApi.login(processUserModel.email, processUserModel.password); - appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, resources.Files.WIDGET_CHECK_APP.file_location); + appModel = await appsActions.importPublishDeployApp(alfrescoJsApi, browser.params.resources.Files.WIDGET_CHECK_APP.file_location); const appDefinitions = await alfrescoJsApi.activiti.appsApi.getAppDefinitions(); deployedApp = appDefinitions.data.find((currentApp) => { diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index f60b1edbda..27ee299860 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -24,7 +24,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { SearchConfiguration } from '../search.config'; describe('Search Number Range Filter', () => { @@ -40,13 +39,13 @@ describe('Search Number Range Filter', () => { const acsUser = new AcsUserModel(); const file2BytesModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, - 'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location }); const file0BytesModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location }); let file2Bytes, file0Bytes; diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 4c333e9c7f..4f08088dd5 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -24,7 +24,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { SearchConfiguration } from '../search.config'; describe('Search Slider Filter', () => { @@ -40,8 +39,8 @@ describe('Search Slider Filter', () => { const acsUser = new AcsUserModel(); const file2BytesModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, - 'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location }); let file2Bytes; diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 91b8dc159c..0715c4de4d 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -30,7 +30,6 @@ import { NodeActions } from '../../actions/ACS/node.actions'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { browser } from 'protractor'; -import resources = require('../../util/resources'); import { SearchConfiguration } from '../search.config'; describe('Search Sorting Picker', () => { @@ -46,13 +45,13 @@ describe('Search Sorting Picker', () => { const acsUser = new AcsUserModel(); const pngAModel = { - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }; const pngDModel = { - 'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location }; let pngA, pngD; diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index b3d65cb354..07440b476f 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -30,7 +30,6 @@ import { UploadActions, BrowserActions } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { SearchConfiguration } from './search.config'; @@ -63,22 +62,22 @@ describe('Search Filters', () => { }); const pngFileModel = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, - 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location }); const txtFileModel1 = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, 'name': `${uniqueFileName1}.txt` }); const jpgFileModel = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, 'name': `${uniqueFileName2}.jpg` }); const txtFileModel2 = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, 'name': `${uniqueFileName3}.txt` }); diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index a648db3bd1..63e806487f 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -17,7 +17,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { StringUtil, UploadActions, LoginPage } from '@alfresco/adf-testing'; -import resources = require('../util/resources'); import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; import { SearchDialog } from '../pages/adf/dialog/searchDialog'; @@ -47,11 +46,11 @@ describe('Search Component - Multi-Select Facet', () => { const randomName = StringUtil.generateRandomString(); const jpgFileInfo = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, 'name': `${randomName}.jpg` }); const txtFileInfo = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, 'name': `${randomName}.txt` }); @@ -137,11 +136,11 @@ describe('Search Component - Multi-Select Facet', () => { const randomName = StringUtil.generateRandomString(); const jpgFileInfo = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location, 'name': `${randomName}.jpg` }); const txtFileInfo = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, 'name': `${randomName}.txt` }); @@ -199,7 +198,7 @@ describe('Search Component - Multi-Select Facet', () => { const randomName = StringUtil.generateRandomString(); const txtFileInfo = new FileModel({ - 'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location, 'name': `${randomName}.txt` }); diff --git a/e2e/search/search-page-component.e2e.ts b/e2e/search/search-page-component.e2e.ts index ca082829bc..82e008d6e9 100644 --- a/e2e/search/search-page-component.e2e.ts +++ b/e2e/search/search-page-component.e2e.ts @@ -26,7 +26,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; import { FileModel } from '../models/ACS/fileModel'; import { Util } from '../util/util'; -import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -72,7 +71,7 @@ describe('Search component - Search Page', () => { firstFileModel = new FileModel({ 'name': search.active.firstFile, - 'location': resources.Files.ADF_DOCUMENTS.TXT.file_location + 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location }); await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); diff --git a/protractor.conf.ts b/protractor.conf.ts index cbbf27e742..87b590292f 100644 --- a/protractor.conf.ts +++ b/protractor.conf.ts @@ -4,6 +4,7 @@ const retry = require('protractor-retry').retry; const tsConfig = require('./e2e/tsconfig.e2e.json'); const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; const TestConfig = require('./e2e/test.config'); +const RESOURCES = require('./e2e/util/resources'); const failFast = require('./e2e/protractor/fail-fast'); const { beforeAllRewrite, afterAllRewrite, beforeEachAllRewrite, afterEachAllRewrite } = require('./e2e/protractor/override-jasmine'); const { uploadScreenshot, saveReport, cleanReportFolder } = require('./e2e/protractor/save-remote'); @@ -105,7 +106,8 @@ exports.config = { groupSuffix: GROUP_SUFFIX, identityAdmin: TestConfig.identityAdmin, identityUser: TestConfig.identityUser, - rootPath: __dirname + rootPath: __dirname, + resources: RESOURCES }, framework: 'jasmine2',