From b9dc285d2b43a8921a09dc5413877ab8e8e6fb88 Mon Sep 17 00:00:00 2001 From: arditdomi <32884230+arditdomi@users.noreply.github.com> Date: Thu, 16 Jul 2020 23:22:22 +0200 Subject: [PATCH] [ACA-3596] Fix e2e due to process header properties changes (#5873) * [ACA-3596] Fix e2e due to process header properties changes * Change pages structure * Move the build demoshell as last step and exclude for PR * move more pages * change testing pkg * better JSON import * update script * move CLOUD in the right place * some logs and not used methods * retrycout Co-authored-by: maurizio vitale Co-authored-by: Eugenio Romano Co-authored-by: Eugenio Romano --- .travis.yml | 1 - .../about-content-services.component.e2e.ts | 2 +- .../comments/comment-component.e2e.ts | 6 +- .../directives/create-folder-directive.e2e.ts | 8 +- .../create-library-directive.e2e.ts | 8 +- .../directives/delete-directive.e2e.ts | 2 +- .../directives/download-directive.e2e.ts | 4 +- .../directives/edit-folder-directive.e2e.ts | 6 +- .../directives/favorite-directive.e2e.ts | 8 +- .../restore-content-directive.e2e.ts | 6 +- .../document-list-actions.e2e.ts | 8 +- .../document-list-component.e2e.ts | 2 +- .../document-list-copy-move-actions.e2e.ts | 4 +- .../document-list-gallery.e2e.ts | 4 +- .../document-list-pagination.e2e.ts | 6 +- .../document-list-permissions.e2e.ts | 4 +- .../document-list-properties.e2e.ts | 4 +- .../document-list-selection.e2e.ts | 6 +- .../document-list-thumbnails-tooltips.e2e.ts | 4 +- e2e/content-services/lock-file.e2e.ts | 6 +- .../metadata/aspect-oriented-config.e2e.ts | 6 +- .../metadata/metadata-permissions.e2e.ts | 4 +- .../metadata/metadata-properties.e2e.ts | 6 +- .../metadata/metadata-smoke-tests.e2e.ts | 6 +- .../breadcrumb/bread-crumb-dropdown.page.ts | 0 .../pages}/lock-file.page.ts | 0 .../pages}/permissions.page.ts | 0 .../pages}/social.page.ts | 0 .../pages}/tag.page.ts | 0 .../pages}/tree-view.page.ts | 0 .../permissions/permissions-component.e2e.ts | 10 +- .../permissions/site-permissions.e2e.ts | 12 +- .../share-file/share-file.e2e.ts | 8 +- .../share-file/unshare-file.e2e.ts | 6 +- .../social/social.component.e2e.ts | 4 +- .../sso-download-directive-component.e2e.ts | 4 +- e2e/content-services/tag-component.e2e.ts | 4 +- .../trashcan-pagination.e2e.ts | 4 +- .../tree-view-component.e2e.ts | 4 +- .../upload/cancel-upload.e2e.ts | 6 +- .../upload/excluded-file.e2e.ts | 8 +- .../upload/upload-dialog.e2e.ts | 8 +- .../upload/uploader-component.e2e.ts | 8 +- .../upload/user-permission.e2e.ts | 6 +- .../version/version-actions.e2e.ts | 8 +- .../version/version-permissions.e2e.ts | 8 +- .../version/version-properties.e2e.ts | 6 +- .../version/version-smoke-tests.e2e.ts | 6 +- .../data-table-component-selection.e2e.ts | 4 +- .../datatable/data-table-component.e2e.ts | 4 +- e2e/core/error-component.e2e.ts | 2 +- e2e/core/header-component.e2e.ts | 2 +- e2e/core/icons-component.e2e.ts | 4 +- e2e/core/infinite-scrolling.e2e.ts | 6 +- e2e/core/login/login-component.e2e.ts | 8 +- e2e/core/login/login-sso/login-sso.e2e.ts | 4 +- e2e/core/login/login-sso/logout-sso.e2e.ts | 2 +- e2e/core/login/redirection.e2e.ts | 10 +- e2e/core/login/remember-me.e2e.ts | 2 +- e2e/core/notifications-component.e2e.ts | 4 +- .../pages}/card-view-component.page.ts | 0 .../adf => core/pages}/comments.page.ts | 0 .../pages}/content-services.page.ts | 0 .../pages}/custom-sources.page.ts | 2 +- .../pages}/data-table.page.ts | 0 .../dialog/create-library-dialog.page.ts | 0 .../pages}/dialog/folder-dialog.page.ts | 0 .../pages}/dialog/share-dialog.page.ts | 0 .../pages}/dialog/upload-dialog.page.ts | 0 .../pages}/dialog/upload-toggles.page.ts | 0 .../adf/core => core/pages}/header.page.ts | 0 e2e/{pages/adf => core/pages}/icons.page.ts | 0 .../pages}/infinite-pagination.page.ts | 0 .../pages}/login-shell.page.ts | 0 .../demo-shell => core/pages}/logout.page.ts | 0 .../adf => core/pages}/metadata-view.page.ts | 0 .../adf => core/pages}/navigation-bar.page.ts | 6 +- .../pages}/notification.page.ts | 0 .../adf => core/pages}/trashcan.page.ts | 0 .../pages}/version-manager.page.ts | 0 e2e/core/pagination-empty-current-page.e2e.ts | 2 +- e2e/core/settings-component.e2e.ts | 8 +- e2e/core/user-info-component.e2e.ts | 2 +- .../viewer-archive.component.e2e.ts | 4 +- .../file-extensions/viewer-component.e2e.ts | 4 +- .../viewer-excel.component.e2e.ts | 2 +- .../viewer-image.component.e2e.ts | 2 +- .../viewer-powerpoint.component.e2e.ts | 2 +- .../viewer-text.component.e2e.ts | 2 +- .../viewer-word.component.e2e.ts | 4 +- e2e/core/viewer/info-drawer.component.e2e.ts | 4 +- .../viewer-content-services-component.e2e.ts | 4 +- .../viewer-custom-toolbar-info-drawer.e2e.ts | 4 +- e2e/core/viewer/viewer-properties.e2e.ts | 4 +- e2e/core/viewer/viewer-share-content.ts | 6 +- e2e/insights/analytics-component.e2e.ts | 8 +- ...ut-process-services-cloud.component.e2e.ts | 2 +- .../apps-section-cloud.e2e.ts | 2 +- .../edit-process-filters-component.e2e.ts | 6 +- .../edit-task-filters-component.e2e.ts | 4 +- .../form-field/dropdown-widget.e2e.ts | 4 +- .../form-field/people-group-of-people.e2e.ts | 2 +- .../task-visibility-condition.e2e.ts | 6 +- .../visibility-condition-tabs.e2e.ts | 2 +- .../form-field/visibility-condition.e2e.ts | 2 +- .../people-group-cloud-component.page.ts | 0 .../pages}/process-cloud-demo.page.ts | 0 .../pages}/process-details-cloud-demo.page.ts | 0 .../pages}/tasks-cloud-demo.page.ts | 0 .../people-group-cloud-component.e2e.ts | 4 +- ...people-group-cloud-filter-component.e2e.ts | 4 +- .../process-custom-filters.e2e.ts | 6 +- .../process-filter-results.e2e.ts | 8 +- .../process-filter-task.e2e.ts | 8 +- .../process-filters-cloud.e2e.ts | 6 +- .../process-header-cloud.e2e.ts | 6 +- .../process-list-cloud-action-menu.e2e.ts | 6 +- .../process-list-selection-cloud.e2e.ts | 8 +- ...cess-task-attach-content-file-cloud.e2e.ts | 6 +- .../start-process-cloud.e2e.ts | 4 +- .../start-task-form-cloud.e2e.ts | 10 +- .../start-task-custom-app-cloud.e2e.ts | 4 +- .../start-task/start-task-group-cloud.e2e.ts | 4 +- .../task-filters-cloud.e2e.ts | 4 +- .../task-form-cloud-component-tab.e2e.ts | 4 +- .../task-form-cloud-component.e2e.ts | 4 +- .../task-header-cloud.e2e.ts | 4 +- .../task-list-cloud-action-menu.e2e.ts | 4 +- .../task-list-properties-sort.e2e.ts | 4 +- .../task-list-properties.e2e.ts | 4 +- .../task-list-selection.e2e.ts | 4 +- .../tasks-claim-release.e2e.ts | 4 +- .../tasks-custom-filters.e2e.ts | 4 +- .../about-process-services.e2e.ts | 2 +- e2e/process-services/apps-section.e2e.ts | 4 +- .../attach-file-content-service.e2e.ts | 4 +- .../attach-file-widget-start-task-app.e2e.ts | 4 +- e2e/process-services/attach-folder.e2e.ts | 4 +- .../attach-form-component.e2e.ts | 8 +- .../checklist-component.e2e.ts | 8 +- .../comment-component-processes.e2e.ts | 6 +- .../comment-component-tasks.e2e.ts | 6 +- .../custom-process-filters-sorting.e2e.ts | 6 +- .../custom-process-filters.e2e.ts | 8 +- .../custom-tasks-filters.e2e.ts | 4 +- .../dynamic-table-date-picker.e2e.ts | 6 +- .../empty-process-list-component.e2e.ts | 10 +- e2e/process-services/form-component.e2e.ts | 2 +- .../form-people-widget.e2e.ts | 10 +- .../form-widgets-component.e2e.ts | 4 +- e2e/process-services/info-drawer.e2e.ts | 8 +- .../pages}/analytics.page.ts | 0 .../pages}/attach-form.page.ts | 0 .../pages}/attachment-list.page.ts | 0 .../dialog/app-settings-toggles.page.ts | 0 .../dialog/create-checklist-dialog.page.ts | 0 .../pages}/dialog/start-task-dialog.page.ts | 0 .../pages}/filters.page.ts | 0 .../pages}/form-demo.page.ts | 0 .../pages}/process-details.page.ts | 2 +- .../pages}/process-filters.page.ts | 0 .../pages}/process-list-demo.page.ts | 0 .../pages}/process-list.page.ts | 0 .../pages}/process-service-tab-bar.page.ts | 0 .../pages}/process-services.page.ts | 0 .../pages}/task-details.page.ts | 0 .../pages}/task-filters-demo.page.ts | 2 +- .../pages}/task-filters.page.ts | 0 .../pages}/task-list-demo.page.ts | 2 +- .../pages}/tasks-list.page.ts | 0 .../pages}/tasks.page.ts | 0 ...nation-processlist-adding-processes.e2e.ts | 6 +- .../pagination-tasklist-adding-tasks.e2e.ts | 4 +- e2e/process-services/people-component.e2e.ts | 6 +- ...process-attachment-list-action-menu.e2e.ts | 8 +- .../process-filters-component.e2e.ts | 14 +-- .../process-instance-details.e2e.ts | 10 +- .../process-list-component.e2e.ts | 2 +- .../processlist-pagination.e2e.ts | 6 +- .../sort-tasklist-pagination.e2e.ts | 4 +- e2e/process-services/standalone-task.e2e.ts | 4 +- .../start-process-component.e2e.ts | 16 +-- .../start-task-custom-app.e2e.ts | 8 +- .../start-task-task-app.e2e.ts | 10 +- e2e/process-services/stencil.e2e.ts | 14 +-- e2e/process-services/task-assignee.e2e.ts | 14 +-- .../task-attachment-list-action-menu.e2e.ts | 6 +- e2e/process-services/task-audit.e2e.ts | 4 +- e2e/process-services/task-details-form.e2e.ts | 12 +- .../task-details-no-form.e2e.ts | 4 +- e2e/process-services/task-details.e2e.ts | 4 +- .../task-filters-component.e2e.ts | 16 +-- .../task-filters-sorting.e2e.ts | 12 +- .../task-list-pagination.e2e.ts | 4 +- .../widgets/amount-widget.e2e.ts | 2 +- .../widgets/attach-file-widget.e2e.ts | 10 +- .../widgets/attach-folder-widget.e2e.ts | 2 +- .../widgets/checkbox-widget.e2e.ts | 2 +- .../widgets/date-time-widget.e2e.ts | 2 +- .../widgets/date-widget.e2e.ts | 4 +- .../widgets/document-template-widget.e2e.ts | 2 +- .../widgets/dropdown-widget.e2e.ts | 2 +- .../widgets/dynamic-table-widget.e2e.ts | 4 +- .../widgets/header-widget.e2e.ts | 2 +- .../widgets/hyperlink-widget.e2e.ts | 2 +- .../widgets/multi-line-widget.e2e.ts | 2 +- .../widgets/number-widget.e2e.ts | 2 +- .../widgets/people-group-widget.e2e.ts | 4 +- .../widgets/people-widget.e2e.ts | 2 +- .../widgets/radio-buttons-widget.e2e.ts | 2 +- .../widgets/text-widget.e2e.ts | 2 +- .../widgets/typeahead-widget.e2e.ts | 4 +- .../widget-visibility-condition.e2e.ts | 2 +- e2e/protractor.conf.js | 16 +-- e2e/protractor/save-remote.js | 20 +-- .../components/search-check-list.e2e.ts | 8 +- .../components/search-date-range.e2e.ts | 8 +- .../components/search-number-range.e2e.ts | 8 +- e2e/search/components/search-radio.e2e.ts | 8 +- e2e/search/components/search-slider.e2e.ts | 8 +- .../components/search-sorting-picker.e2e.ts | 10 +- e2e/search/components/search-text.e2e.ts | 8 +- .../pages}/search-dialog.page.ts | 0 .../pages}/search-filters.page.ts | 0 .../pages}/search-results.page.ts | 2 +- e2e/search/search-component.e2e.ts | 8 +- e2e/search/search-filters.e2e.ts | 8 +- e2e/search/search-multiselect.e2e.ts | 8 +- e2e/search/search-page.e2e.ts | 8 +- e2e/util/resources.js | 20 +-- package-lock.json | 117 +++++++++--------- package.json | 3 +- scripts/travis/build/build.sh | 8 +- scripts/travis/update/update-children.sh | 10 +- 234 files changed, 571 insertions(+), 584 deletions(-) rename e2e/{pages/adf/content-services => content-services/pages}/breadcrumb/bread-crumb-dropdown.page.ts (100%) rename e2e/{pages/adf => content-services/pages}/lock-file.page.ts (100%) rename e2e/{pages/adf => content-services/pages}/permissions.page.ts (100%) rename e2e/{pages/adf/demo-shell => content-services/pages}/social.page.ts (100%) rename e2e/{pages/adf => content-services/pages}/tag.page.ts (100%) rename e2e/{pages/adf/content-services => content-services/pages}/tree-view.page.ts (100%) rename e2e/{pages/adf => core/pages}/card-view-component.page.ts (100%) rename e2e/{pages/adf => core/pages}/comments.page.ts (100%) rename e2e/{pages/adf => core/pages}/content-services.page.ts (100%) rename e2e/{pages/adf/demo-shell => core/pages}/custom-sources.page.ts (97%) rename e2e/{pages/adf/demo-shell => core/pages}/data-table.page.ts (100%) rename e2e/{pages/adf => core/pages}/dialog/create-library-dialog.page.ts (100%) rename e2e/{pages/adf => core/pages}/dialog/folder-dialog.page.ts (100%) rename e2e/{pages/adf => core/pages}/dialog/share-dialog.page.ts (100%) rename e2e/{pages/adf => core/pages}/dialog/upload-dialog.page.ts (100%) rename e2e/{pages/adf => core/pages}/dialog/upload-toggles.page.ts (100%) rename e2e/{pages/adf/core => core/pages}/header.page.ts (100%) rename e2e/{pages/adf => core/pages}/icons.page.ts (100%) rename e2e/{pages/adf/core => core/pages}/infinite-pagination.page.ts (100%) rename e2e/{pages/adf/demo-shell => core/pages}/login-shell.page.ts (100%) rename e2e/{pages/adf/demo-shell => core/pages}/logout.page.ts (100%) rename e2e/{pages/adf => core/pages}/metadata-view.page.ts (100%) rename e2e/{pages/adf => core/pages}/navigation-bar.page.ts (96%) rename e2e/{pages/adf/demo-shell => core/pages}/notification.page.ts (100%) rename e2e/{pages/adf => core/pages}/trashcan.page.ts (100%) rename e2e/{pages/adf => core/pages}/version-manager.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services-cloud/pages}/people-group-cloud-component.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services-cloud/pages}/process-cloud-demo.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services-cloud => process-services-cloud/pages}/process-details-cloud-demo.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services-cloud/pages}/tasks-cloud-demo.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/analytics.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/attach-form.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/attachment-list.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/dialog/app-settings-toggles.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/dialog/create-checklist-dialog.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/dialog/start-task-dialog.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/filters.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services/pages}/form-demo.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/process-details.page.ts (99%) rename e2e/{pages/adf/process-services => process-services/pages}/process-filters.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services/pages}/process-list-demo.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/process-list.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/process-service-tab-bar.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/process-services.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/task-details.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services/pages}/task-filters-demo.page.ts (96%) rename e2e/{pages/adf/process-services => process-services/pages}/task-filters.page.ts (100%) rename e2e/{pages/adf/demo-shell/process-services => process-services/pages}/task-list-demo.page.ts (98%) rename e2e/{pages/adf/process-services => process-services/pages}/tasks-list.page.ts (100%) rename e2e/{pages/adf/process-services => process-services/pages}/tasks.page.ts (100%) rename e2e/{pages/adf/dialog => search/pages}/search-dialog.page.ts (100%) rename e2e/{pages/adf => search/pages}/search-filters.page.ts (100%) rename e2e/{pages/adf => search/pages}/search-results.page.ts (97%) diff --git a/.travis.yml b/.travis.yml index 407f2f7d0e..c965cf0595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ branches: - /.*old-env.*/ - /.*next-release.*/ - /.*beta.*/ - - /.*greenkeeper.*/ stages: - name: Lint & Build Dist & Release diff --git a/e2e/content-services/about-content-services.component.e2e.ts b/e2e/content-services/about-content-services.component.e2e.ts index cc953789b0..8ac9c5e306 100644 --- a/e2e/content-services/about-content-services.component.e2e.ts +++ b/e2e/content-services/about-content-services.component.e2e.ts @@ -16,7 +16,7 @@ */ import { AboutPage, ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('About Content Services', () => { diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index a974331a3d..6bd15945e2 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -24,9 +24,9 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { CommentsPage } from '../../pages/adf/comments.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { CommentsPage } from '../../core/pages/comments.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts index 5ec648cc09..0d48cb68e4 100644 --- a/e2e/content-services/directives/create-folder-directive.e2e.ts +++ b/e2e/content-services/directives/create-folder-directive.e2e.ts @@ -23,11 +23,11 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { FolderDialogPage } from '../../core/pages/dialog/folder-dialog.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; import { browser, Key } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Create folder directive', () => { diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index aafda99270..09e74bb331 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/e2e/content-services/directives/create-library-directive.e2e.ts @@ -16,11 +16,11 @@ */ import { ApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { CreateLibraryDialogPage } from '../../pages/adf/dialog/create-library-dialog.page'; -import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { CreateLibraryDialogPage } from '../../core/pages/dialog/create-library-dialog.page'; +import { CustomSourcesPage } from '../../core/pages/custom-sources.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Create library directive', () => { diff --git a/e2e/content-services/directives/delete-directive.e2e.ts b/e2e/content-services/directives/delete-directive.e2e.ts index 071882b765..3a068f5c8c 100644 --- a/e2e/content-services/directives/delete-directive.e2e.ts +++ b/e2e/content-services/directives/delete-directive.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { ApiService, diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index 0bd7185368..e45554b636 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/e2e/content-services/directives/download-directive.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { ApiService, @@ -27,7 +27,7 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; describe('Version component actions', () => { diff --git a/e2e/content-services/directives/edit-folder-directive.e2e.ts b/e2e/content-services/directives/edit-folder-directive.e2e.ts index 58339f54c7..76a658e7e3 100644 --- a/e2e/content-services/directives/edit-folder-directive.e2e.ts +++ b/e2e/content-services/directives/edit-folder-directive.e2e.ts @@ -25,10 +25,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { FolderDialogPage } from '../../core/pages/dialog/folder-dialog.page'; import { browser, protractor } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; describe('Edit folder directive', () => { diff --git a/e2e/content-services/directives/favorite-directive.e2e.ts b/e2e/content-services/directives/favorite-directive.e2e.ts index 442009f5fc..e8fd554539 100644 --- a/e2e/content-services/directives/favorite-directive.e2e.ts +++ b/e2e/content-services/directives/favorite-directive.e2e.ts @@ -24,13 +24,13 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page'; -import { TrashcanPage } from '../../pages/adf/trashcan.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { CustomSourcesPage } from '../../core/pages/custom-sources.page'; +import { TrashcanPage } from '../../core/pages/trashcan.page'; describe('Favorite directive', () => { diff --git a/e2e/content-services/directives/restore-content-directive.e2e.ts b/e2e/content-services/directives/restore-content-directive.e2e.ts index 18542a244d..8ad8fca88a 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/e2e/content-services/directives/restore-content-directive.e2e.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { TrashcanPage } from '../../pages/adf/trashcan.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { TrashcanPage } from '../../core/pages/trashcan.page'; import { ApiService, BreadcrumbPage, 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 eca8b46661..12cbdfc3c3 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -28,11 +28,11 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; -import { BreadCrumbDropdownPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page'; -import { InfinitePaginationPage } from '../../pages/adf/core/infinite-pagination.page'; +import { BreadCrumbDropdownPage } from '../pages/breadcrumb/bread-crumb-dropdown.page'; +import { InfinitePaginationPage } from '../../core/pages/infinite-pagination.page'; import { FolderModel } from '../../models/ACS/folder.model'; describe('Document List Component - Actions', () => { 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 3fde884aed..af37051391 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; 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 f850c56afb..809ea71949 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 @@ -27,8 +27,8 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); 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 6b518fdb93..2b0e748525 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/e2e/content-services/document-list/document-list-gallery.e2e.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Document List Component', () => { diff --git a/e2e/content-services/document-list/document-list-pagination.e2e.ts b/e2e/content-services/document-list/document-list-pagination.e2e.ts index 94af296e80..0e3d8bc11f 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -27,12 +27,12 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; describe('Document List - Pagination', () => { const pagination = { diff --git a/e2e/content-services/document-list/document-list-permissions.e2e.ts b/e2e/content-services/document-list/document-list-permissions.e2e.ts index d331f4d86e..15358b1d1f 100644 --- a/e2e/content-services/document-list/document-list-permissions.e2e.ts +++ b/e2e/content-services/document-list/document-list-permissions.e2e.ts @@ -16,8 +16,8 @@ */ import { browser } from 'protractor'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { ApiService, BrowserActions, ErrorPage, LoginPage, StringUtil, UsersActions } from '@alfresco/adf-testing'; describe('Document List Component', () => { 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 62bdebe432..832250343d 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/e2e/content-services/document-list/document-list-properties.e2e.ts @@ -16,8 +16,8 @@ */ import { ApiService, DropActions, LoginPage, UploadActions, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; diff --git a/e2e/content-services/document-list/document-list-selection.e2e.ts b/e2e/content-services/document-list/document-list-selection.e2e.ts index 0595f3db8d..bcaba89dc7 100644 --- a/e2e/content-services/document-list/document-list-selection.e2e.ts +++ b/e2e/content-services/document-list/document-list-selection.e2e.ts @@ -16,12 +16,12 @@ */ import { ApiService, LoginPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; describe('Document List - Selection', () => { const loginPage = new LoginPage(); 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 a9042333a2..352ced738e 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 @@ -15,11 +15,11 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Document List Component', () => { diff --git a/e2e/content-services/lock-file.e2e.ts b/e2e/content-services/lock-file.e2e.ts index d6e5316046..2b4c379cd4 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -16,9 +16,9 @@ */ import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { LockFilePage } from '../pages/adf/lock-file.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; +import { LockFilePage } from '../content-services/pages/lock-file.page'; import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index c8913169a4..8bda02c319 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -25,11 +25,11 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; describe('Aspect oriented config', () => { diff --git a/e2e/content-services/metadata/metadata-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index d9651b63b0..64267b16ce 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -24,8 +24,8 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index f17364f7ab..ce3b73a8f4 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -24,11 +24,11 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; describe('CardView Component - properties', () => { diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index 407e9dc807..6b13bca681 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -26,11 +26,11 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import moment = require('moment'); describe('Metadata component', () => { diff --git a/e2e/pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page.ts b/e2e/content-services/pages/breadcrumb/bread-crumb-dropdown.page.ts similarity index 100% rename from e2e/pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page.ts rename to e2e/content-services/pages/breadcrumb/bread-crumb-dropdown.page.ts diff --git a/e2e/pages/adf/lock-file.page.ts b/e2e/content-services/pages/lock-file.page.ts similarity index 100% rename from e2e/pages/adf/lock-file.page.ts rename to e2e/content-services/pages/lock-file.page.ts diff --git a/e2e/pages/adf/permissions.page.ts b/e2e/content-services/pages/permissions.page.ts similarity index 100% rename from e2e/pages/adf/permissions.page.ts rename to e2e/content-services/pages/permissions.page.ts diff --git a/e2e/pages/adf/demo-shell/social.page.ts b/e2e/content-services/pages/social.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/social.page.ts rename to e2e/content-services/pages/social.page.ts diff --git a/e2e/pages/adf/tag.page.ts b/e2e/content-services/pages/tag.page.ts similarity index 100% rename from e2e/pages/adf/tag.page.ts rename to e2e/content-services/pages/tag.page.ts diff --git a/e2e/pages/adf/content-services/tree-view.page.ts b/e2e/content-services/pages/tree-view.page.ts similarity index 100% rename from e2e/pages/adf/content-services/tree-view.page.ts rename to e2e/content-services/pages/tree-view.page.ts diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 4bb74092fe..6f4ca64947 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { PermissionsPage } from '../../pages/adf/permissions.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { PermissionsPage } from '../../content-services/pages/permissions.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { ApiService, @@ -31,9 +31,9 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../../models/ACS/folder.model'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; describe('Permissions Component', () => { diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index 5b17b67028..5743783152 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { PermissionsPage } from '../../pages/adf/permissions.page'; +import { PermissionsPage } from '../../content-services/pages/permissions.page'; import { ApiService, BrowserActions, @@ -27,13 +27,13 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { VersionManagePage } from '../../core/pages/version-manager.page'; import CONSTANTS = require('../../util/constants'); describe('Permissions Component', () => { diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index db7ea72398..44abd9ed73 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -27,13 +27,13 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { ShareDialogPage } from '../../pages/adf/dialog/share-dialog.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { ShareDialogPage } from '../../core/pages/dialog/share-dialog.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { SharedLinkEntry, SharedLinkPaging } from '@alfresco/js-api'; -import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page'; +import { CustomSourcesPage } from '../../core/pages/custom-sources.page'; describe('Share file', () => { diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index 8574322469..b95df05bd8 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -27,9 +27,9 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { ShareDialogPage } from '../../pages/adf/dialog/share-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { ShareDialogPage } from '../../core/pages/dialog/share-dialog.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; diff --git a/e2e/content-services/social/social.component.e2e.ts b/e2e/content-services/social/social.component.e2e.ts index c03b7b1a17..34edc90034 100644 --- a/e2e/content-services/social/social.component.e2e.ts +++ b/e2e/content-services/social/social.component.e2e.ts @@ -25,8 +25,8 @@ import { UsersActions } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { SocialPage } from '../../pages/adf/demo-shell/social.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { SocialPage } from '../../content-services/pages/social.page'; import { browser } from 'protractor'; describe('Social component', () => { 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 aab267c466..89bcc09d67 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { ApiService, FileBrowserUtil, diff --git a/e2e/content-services/tag-component.e2e.ts b/e2e/content-services/tag-component.e2e.ts index e5e9330fb1..a4009af4a6 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/e2e/content-services/tag-component.e2e.ts @@ -17,8 +17,8 @@ import { FileModel } from '../models/ACS/file.model'; import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { TagPage } from '../pages/adf/tag.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TagPage } from '../content-services/pages/tag.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { browser } from 'protractor'; describe('Tag component', () => { diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index 2dff881fe1..18e47a7cfb 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -26,8 +26,8 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../models/ACS/folder.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TrashcanPage } from '../pages/adf/trashcan.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TrashcanPage } from '../core/pages/trashcan.page'; describe('Trashcan - Pagination', () => { const pagination = { diff --git a/e2e/content-services/tree-view-component.e2e.ts b/e2e/content-services/tree-view-component.e2e.ts index e35ee984b7..7df4feba16 100644 --- a/e2e/content-services/tree-view-component.e2e.ts +++ b/e2e/content-services/tree-view-component.e2e.ts @@ -16,8 +16,8 @@ */ import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TreeViewPage } from '../pages/adf/content-services/tree-view.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TreeViewPage } from './pages/tree-view.page'; import { browser } from 'protractor'; describe('Tree View Component', () => { diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index ac5ccb6f51..a9e6ecca02 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/e2e/content-services/upload/cancel-upload.e2e.ts @@ -17,9 +17,9 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; describe('Upload component', async () => { diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index cd50f3c332..2636a24fd8 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -24,11 +24,11 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; describe('Upload component - Excluded Files', () => { diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index 0fba08cbf9..ca9af6a267 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/e2e/content-services/upload/upload-dialog.e2e.ts @@ -23,12 +23,12 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { VersionManagePage } from '../../core/pages/version-manager.page'; import { FolderModel } from '../../models/ACS/folder.model'; describe('Upload component', () => { diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index 823d6a3e58..00390df1ff 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -26,11 +26,11 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Upload component', () => { diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index 2e6117708f..b7f3635185 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -17,9 +17,9 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, NotificationHistoryPage, StringUtil, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index 9b75ef4501..5e6cc1d203 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -27,10 +27,10 @@ import { } from '@alfresco/adf-testing'; import { browser, by, element } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { VersionManagePage } from '../../core/pages/version-manager.page'; describe('Version component actions', () => { diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index e642b548e9..7fa29189b1 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -26,10 +26,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { VersionManagePage } from '../../pages/adf/version-manager.page'; -import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { VersionManagePage } from '../../core/pages/version-manager.page'; +import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index 93a928c3a9..a0e3393ec7 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -25,10 +25,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { VersionManagePage } from '../../core/pages/version-manager.page'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Version Properties', () => { diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts index c635cb043d..ccef2f35f4 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -25,10 +25,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { VersionManagePage } from '../../core/pages/version-manager.page'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Version component', () => { diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index e431e405c5..64ec7a3a99 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/e2e/core/datatable/data-table-component-selection.e2e.ts @@ -17,8 +17,8 @@ import { ApiService, DataTableComponentPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { DataTablePage } from '../../core/pages/data-table.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Datatable component - selection', () => { diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index 01563a546c..4e929f5de9 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -25,8 +25,8 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { DataTablePage } from '../../core/pages/data-table.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Datatable component', () => { diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index 2a57850d8e..ca8bbe7291 100644 --- a/e2e/core/error-component.e2e.ts +++ b/e2e/core/error-component.e2e.ts @@ -17,7 +17,7 @@ import { ApiService, BrowserActions, ErrorPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Error Component', () => { diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 5a09586f8e..f1918fcb6c 100644 --- a/e2e/core/header-component.e2e.ts +++ b/e2e/core/header-component.e2e.ts @@ -16,7 +16,7 @@ */ import { ApiService, HeaderPage, LoginPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Header Component', () => { diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts index 90125800de..562c154ef6 100644 --- a/e2e/core/icons-component.e2e.ts +++ b/e2e/core/icons-component.e2e.ts @@ -16,8 +16,8 @@ */ import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { IconsPage } from '../pages/adf/icons.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { IconsPage } from '../core/pages/icons.page'; import { browser } from 'protractor'; describe('Universal Icon component', () => { diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index 2161c13497..61ef0f43cf 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/e2e/core/infinite-scrolling.e2e.ts @@ -26,9 +26,9 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../models/ACS/folder.model'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { InfinitePaginationPage } from '../pages/adf/core/infinite-pagination.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; +import { InfinitePaginationPage } from './pages/infinite-pagination.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Enable infinite scrolling', () => { diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index 771721bf00..a65978e3b1 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -25,10 +25,10 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page'; -import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from '../../process-services/pages/process-services.page'; +import { LoginShellPage } from '../../core/pages/login-shell.page'; describe('Login component', () => { diff --git a/e2e/core/login/login-sso/login-sso.e2e.ts b/e2e/core/login/login-sso/login-sso.e2e.ts index d211745789..93f26725fa 100644 --- a/e2e/core/login/login-sso/login-sso.e2e.ts +++ b/e2e/core/login/login-sso/login-sso.e2e.ts @@ -17,8 +17,8 @@ import { LoginPage, SettingsPage, BrowserVisibility } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; -import { LoginShellPage } from '../../../pages/adf/demo-shell/login-shell.page'; +import { NavigationBarPage } from '../../../core/pages/navigation-bar.page'; +import { LoginShellPage } from '../../../core/pages/login-shell.page'; describe('Login component - SSO', () => { diff --git a/e2e/core/login/login-sso/logout-sso.e2e.ts b/e2e/core/login/login-sso/logout-sso.e2e.ts index 1d326cee12..bc08b0519c 100644 --- a/e2e/core/login/login-sso/logout-sso.e2e.ts +++ b/e2e/core/login/login-sso/logout-sso.e2e.ts @@ -17,7 +17,7 @@ import { LoginPage, SettingsPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../../core/pages/navigation-bar.page'; describe('Logout component - SSO', () => { diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index 1887c5f662..419a8b5aff 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -25,11 +25,11 @@ import { UploadActions, UsersActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { LogoutPage } from '../../pages/adf/demo-shell/logout.page'; -import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { ProcessServicesPage } from '../../process-services/pages/process-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { LogoutPage } from '../../core/pages/logout.page'; +import { LoginShellPage } from '../../core/pages/login-shell.page'; describe('Login component - Redirect', () => { diff --git a/e2e/core/login/remember-me.e2e.ts b/e2e/core/login/remember-me.e2e.ts index 6d7fe4590f..5f9696295d 100644 --- a/e2e/core/login/remember-me.e2e.ts +++ b/e2e/core/login/remember-me.e2e.ts @@ -16,7 +16,7 @@ */ import { SettingsPage } from '@alfresco/adf-testing'; -import { LoginShellPage } from '../../pages/adf/demo-shell/login-shell.page'; +import { LoginShellPage } from '../../core/pages/login-shell.page'; describe('Login component - Remember Me', () => { diff --git a/e2e/core/notifications-component.e2e.ts b/e2e/core/notifications-component.e2e.ts index 9e2062687e..a71c0171f2 100644 --- a/e2e/core/notifications-component.e2e.ts +++ b/e2e/core/notifications-component.e2e.ts @@ -16,9 +16,9 @@ */ import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NotificationDemoPage } from '../pages/adf/demo-shell/notification.page'; +import { NotificationDemoPage } from '../core/pages/notification.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Notifications Component', () => { diff --git a/e2e/pages/adf/card-view-component.page.ts b/e2e/core/pages/card-view-component.page.ts similarity index 100% rename from e2e/pages/adf/card-view-component.page.ts rename to e2e/core/pages/card-view-component.page.ts diff --git a/e2e/pages/adf/comments.page.ts b/e2e/core/pages/comments.page.ts similarity index 100% rename from e2e/pages/adf/comments.page.ts rename to e2e/core/pages/comments.page.ts diff --git a/e2e/pages/adf/content-services.page.ts b/e2e/core/pages/content-services.page.ts similarity index 100% rename from e2e/pages/adf/content-services.page.ts rename to e2e/core/pages/content-services.page.ts diff --git a/e2e/pages/adf/demo-shell/custom-sources.page.ts b/e2e/core/pages/custom-sources.page.ts similarity index 97% rename from e2e/pages/adf/demo-shell/custom-sources.page.ts rename to e2e/core/pages/custom-sources.page.ts index 61e5b12dce..46fff319ac 100644 --- a/e2e/pages/adf/demo-shell/custom-sources.page.ts +++ b/e2e/core/pages/custom-sources.page.ts @@ -17,7 +17,7 @@ import { BrowserActions, BrowserVisibility, DataTableComponentPage, DropdownPage } from '@alfresco/adf-testing'; import { by, element } from 'protractor'; -import { NavigationBarPage } from '../navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; const source = { favorites: 'Favorites', diff --git a/e2e/pages/adf/demo-shell/data-table.page.ts b/e2e/core/pages/data-table.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/data-table.page.ts rename to e2e/core/pages/data-table.page.ts diff --git a/e2e/pages/adf/dialog/create-library-dialog.page.ts b/e2e/core/pages/dialog/create-library-dialog.page.ts similarity index 100% rename from e2e/pages/adf/dialog/create-library-dialog.page.ts rename to e2e/core/pages/dialog/create-library-dialog.page.ts diff --git a/e2e/pages/adf/dialog/folder-dialog.page.ts b/e2e/core/pages/dialog/folder-dialog.page.ts similarity index 100% rename from e2e/pages/adf/dialog/folder-dialog.page.ts rename to e2e/core/pages/dialog/folder-dialog.page.ts diff --git a/e2e/pages/adf/dialog/share-dialog.page.ts b/e2e/core/pages/dialog/share-dialog.page.ts similarity index 100% rename from e2e/pages/adf/dialog/share-dialog.page.ts rename to e2e/core/pages/dialog/share-dialog.page.ts diff --git a/e2e/pages/adf/dialog/upload-dialog.page.ts b/e2e/core/pages/dialog/upload-dialog.page.ts similarity index 100% rename from e2e/pages/adf/dialog/upload-dialog.page.ts rename to e2e/core/pages/dialog/upload-dialog.page.ts diff --git a/e2e/pages/adf/dialog/upload-toggles.page.ts b/e2e/core/pages/dialog/upload-toggles.page.ts similarity index 100% rename from e2e/pages/adf/dialog/upload-toggles.page.ts rename to e2e/core/pages/dialog/upload-toggles.page.ts diff --git a/e2e/pages/adf/core/header.page.ts b/e2e/core/pages/header.page.ts similarity index 100% rename from e2e/pages/adf/core/header.page.ts rename to e2e/core/pages/header.page.ts diff --git a/e2e/pages/adf/icons.page.ts b/e2e/core/pages/icons.page.ts similarity index 100% rename from e2e/pages/adf/icons.page.ts rename to e2e/core/pages/icons.page.ts diff --git a/e2e/pages/adf/core/infinite-pagination.page.ts b/e2e/core/pages/infinite-pagination.page.ts similarity index 100% rename from e2e/pages/adf/core/infinite-pagination.page.ts rename to e2e/core/pages/infinite-pagination.page.ts diff --git a/e2e/pages/adf/demo-shell/login-shell.page.ts b/e2e/core/pages/login-shell.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/login-shell.page.ts rename to e2e/core/pages/login-shell.page.ts diff --git a/e2e/pages/adf/demo-shell/logout.page.ts b/e2e/core/pages/logout.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/logout.page.ts rename to e2e/core/pages/logout.page.ts diff --git a/e2e/pages/adf/metadata-view.page.ts b/e2e/core/pages/metadata-view.page.ts similarity index 100% rename from e2e/pages/adf/metadata-view.page.ts rename to e2e/core/pages/metadata-view.page.ts diff --git a/e2e/pages/adf/navigation-bar.page.ts b/e2e/core/pages/navigation-bar.page.ts similarity index 96% rename from e2e/pages/adf/navigation-bar.page.ts rename to e2e/core/pages/navigation-bar.page.ts index 9cf172ed2e..16ebbd4e34 100644 --- a/e2e/pages/adf/navigation-bar.page.ts +++ b/e2e/core/pages/navigation-bar.page.ts @@ -17,8 +17,7 @@ import { AppListCloudPage, BrowserActions, BrowserVisibility } from '@alfresco/adf-testing'; import { browser, by, element, ElementFinder } from 'protractor'; -import { PeopleGroupCloudComponentPage } from './demo-shell/process-services/people-group-cloud-component.page'; -import { ProcessServicesPage } from './process-services/process-services.page'; +import { ProcessServicesPage } from '../../process-services/pages/process-services.page'; export class NavigationBarPage { @@ -81,11 +80,10 @@ export class NavigationBarPage { await BrowserVisibility.waitUntilElementIsNotPresent(this.linkMenuChildrenContainer); } - async navigateToPeopleGroupCloudPage(): Promise { + async navigateToPeopleGroupCloudPage(): Promise { await this.clickProcessCloudButton(); await BrowserActions.click(this.peopleGroupCloudButton); await BrowserVisibility.waitUntilElementIsNotPresent(this.linkMenuChildrenContainer); - return new PeopleGroupCloudComponentPage(); } async clickProcessServicesButton() { diff --git a/e2e/pages/adf/demo-shell/notification.page.ts b/e2e/core/pages/notification.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/notification.page.ts rename to e2e/core/pages/notification.page.ts diff --git a/e2e/pages/adf/trashcan.page.ts b/e2e/core/pages/trashcan.page.ts similarity index 100% rename from e2e/pages/adf/trashcan.page.ts rename to e2e/core/pages/trashcan.page.ts diff --git a/e2e/pages/adf/version-manager.page.ts b/e2e/core/pages/version-manager.page.ts similarity index 100% rename from e2e/pages/adf/version-manager.page.ts rename to e2e/core/pages/version-manager.page.ts diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 0be61b335d..ec2172afc8 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -29,7 +29,7 @@ import { import { browser } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; import { FolderModel } from '../models/ACS/folder.model'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; describe('Pagination - returns to previous page when current is empty', () => { diff --git a/e2e/core/settings-component.e2e.ts b/e2e/core/settings-component.e2e.ts index 95f81d869f..74d1dcaa8a 100644 --- a/e2e/core/settings-component.e2e.ts +++ b/e2e/core/settings-component.e2e.ts @@ -17,10 +17,10 @@ import { BrowserActions, SettingsPage } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { LoginShellPage } from '../pages/adf/demo-shell/login-shell.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from '../process-services/pages/process-services.page'; +import { LoginShellPage } from '../core/pages/login-shell.page'; describe('Settings component', () => { diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index 4a7e1c2535..90fd7996eb 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -19,7 +19,7 @@ import { PeopleApi } from '@alfresco/js-api'; import { ApiService, LocalStorageUtil, LoginPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import * as path from 'path'; import * as fs from 'fs'; 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 0e450ac891..e99b8109f5 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts @@ -25,9 +25,9 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FolderModel } from '../../../models/ACS/folder.model'; -import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { diff --git a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts index a61db672b4..d63acbb047 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -25,10 +25,10 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FileModel } from '../../../models/ACS/file.model'; import { FolderModel } from '../../../models/ACS/folder.model'; -import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { 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 7a3a5b4024..f9e6d61c1e 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -25,7 +25,7 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FolderModel } from '../../../models/ACS/folder.model'; import CONSTANTS = require('../../../util/constants'); 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 f0f8b83670..cb1519d24a 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -25,7 +25,7 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FolderModel } from '../../../models/ACS/folder.model'; import CONSTANTS = require('../../../util/constants'); 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 32af2fa8ce..21da667f8d 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FolderModel } from '../../../models/ACS/folder.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../../util/constants'); 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 a4b7efb6fa..5f6bb27c4e 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -25,7 +25,7 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FolderModel } from '../../../models/ACS/folder.model'; import CONSTANTS = require('../../../util/constants'); 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 51a1cffc87..8fb84dd66d 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -25,9 +25,9 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../../core/pages/content-services.page'; import { FolderModel } from '../../../models/ACS/folder.model'; -import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index 6907a38fd8..7a4289a8af 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -25,8 +25,8 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index 8900a93be8..9839f70896 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -17,9 +17,9 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Content Services Viewer', () => { const acsUser = new UserModel(); 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 b75f16aa96..8b3ff66d05 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -17,9 +17,9 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Viewer', () => { diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index 72f6c32848..1e6354f8cb 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -25,8 +25,8 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; describe('Viewer - properties', () => { diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index c8fafebab1..6ffbc4e5fa 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -25,9 +25,9 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { ShareDialogPage } from '../../pages/adf/dialog/share-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { ShareDialogPage } from '../../core/pages/dialog/share-dialog.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index de12257196..fe163da9f0 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -16,10 +16,10 @@ */ import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { AnalyticsPage } from '../pages/adf/process-services/analytics.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { AnalyticsPage } from '../process-services/pages/analytics.page'; +import { ProcessServicesPage } from '../process-services/pages/process-services.page'; +import { ProcessServiceTabBarPage } from '../process-services/pages/process-service-tab-bar.page'; import { browser } from 'protractor'; describe('Analytics Smoke Test', () => { diff --git a/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts b/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts index 46527ec4e7..5efff24422 100644 --- a/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts +++ b/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts @@ -17,7 +17,7 @@ import { ApiService, IdentityService, AboutPage, LoginPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('About Process Services Cloud', () => { diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index daa9b2bb24..7319167ac9 100644 --- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts +++ b/e2e/process-services-cloud/apps-section-cloud.e2e.ts @@ -17,7 +17,7 @@ import { ApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Applications list', () => { 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 e0614758e5..57eb200fb3 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -23,9 +23,9 @@ import { LoginPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Edit process filters cloud', () => { 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 b90c5b9003..8f0d6288f4 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -25,8 +25,8 @@ import { IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; describe('Edit task filters cloud', () => { 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 6da5afde64..cd70ed06d4 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts @@ -22,8 +22,8 @@ import { TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '.././pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('Form Field Component - Dropdown Widget', () => { diff --git a/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts b/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts index e39eaad685..5c36a1e30c 100644 --- a/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts +++ b/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts @@ -32,7 +32,7 @@ import { peopleReadOnlyFormMock, groupReadOnlyFormMock } from '../../resources/forms/people-group-formwidget-mocks'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; describe('People and Group of people Widgets', () => { diff --git a/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts b/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts index d05b7c581f..abf93a9d30 100644 --- a/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts +++ b/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts @@ -28,9 +28,9 @@ import { } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { ProcessCloudDemoPage } from '../../pages/adf/demo-shell/process-services/process-cloud-demo.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from '.././pages/tasks-cloud-demo.page'; +import { ProcessCloudDemoPage } from '.././pages/process-cloud-demo.page'; describe('Task cloud visibility', async () => { diff --git a/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts b/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts index 0f9ac5042e..ecdf70ad13 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts +++ b/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts @@ -18,7 +18,7 @@ import { FormCloudComponentPage, LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { tabFieldValueVisibilityJson, tabVarValueVisibilityJson, tabVarFieldVisibilityJson, tabFieldFieldVisibilityJson, tabFieldVarVisibilityJson, tabVarVarVisibilityJson, tabNextOperatorsVisibilityJson } from '../../resources/forms/tab-visibility-conditions'; diff --git a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts index 4e840ecf13..2a2ecafc38 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts +++ b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts @@ -18,7 +18,7 @@ import { FormCloudComponentPage, LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { checkboxVisibilityFormJson, multipleCheckboxVisibilityFormJson } from '../../resources/forms/checkbox-visibility-condition'; import { multipleTextVisibilityFormJson, multipleVisibilityFormJson } from '../../resources/forms/multiple-visibility-conditions'; import { displayValueTextJson } from '../../resources/forms/display-value-visibility-conditions'; diff --git a/e2e/pages/adf/demo-shell/process-services/people-group-cloud-component.page.ts b/e2e/process-services-cloud/pages/people-group-cloud-component.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/people-group-cloud-component.page.ts rename to e2e/process-services-cloud/pages/people-group-cloud-component.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/process-cloud-demo.page.ts b/e2e/process-services-cloud/pages/process-cloud-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/process-cloud-demo.page.ts rename to e2e/process-services-cloud/pages/process-cloud-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page.ts b/e2e/process-services-cloud/pages/process-details-cloud-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page.ts rename to e2e/process-services-cloud/pages/process-details-cloud-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/tasks-cloud-demo.page.ts b/e2e/process-services-cloud/pages/tasks-cloud-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/tasks-cloud-demo.page.ts rename to e2e/process-services-cloud/pages/tasks-cloud-demo.page.ts diff --git a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts index 36dc3ebd5c..e03444d70d 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts @@ -25,8 +25,8 @@ import { RolesService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/people-group-cloud-component.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { PeopleGroupCloudComponentPage } from './pages/people-group-cloud-component.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('People Groups Cloud Component', () => { 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 81afa05c93..c3a202aee2 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 @@ -17,8 +17,8 @@ import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/people-group-cloud-component.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { PeopleGroupCloudComponentPage } from './pages/people-group-cloud-component.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('People Groups Cloud Component', () => { diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index a03afc42a4..9d0fe91ae4 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -17,9 +17,9 @@ import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LocalStorageUtil, LoginPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index fad05c10d4..f0a0e32b6d 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process-filter-results.e2e.ts @@ -30,10 +30,10 @@ import { TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessListPage } from '../process-services/pages/process-list.page'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import moment = require('moment'); diff --git a/e2e/process-services-cloud/process-filter-task.e2e.ts b/e2e/process-services-cloud/process-filter-task.e2e.ts index ffecb43e29..a8701bdfce 100644 --- a/e2e/process-services-cloud/process-filter-task.e2e.ts +++ b/e2e/process-services-cloud/process-filter-task.e2e.ts @@ -27,10 +27,10 @@ import { TaskHeaderCloudPage } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { ProcessDetailsCloudDemoPage } from './pages/process-details-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index 7013da50d2..235aa22516 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -29,9 +29,9 @@ import { EditProcessFilterCloudComponentPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Process filters cloud', () => { diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 6c629d0f23..31628634dc 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts @@ -17,9 +17,9 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); import moment = require('moment'); import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; 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 9bcfc76b97..c664f0b8c8 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 @@ -26,9 +26,9 @@ import { StringUtil } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Process list cloud', () => { 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 c9b198f734..01161f9cec 100644 --- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts @@ -17,10 +17,10 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessDetailsCloudDemoPage } from './pages/process-details-cloud-demo.page'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts index d0e7f7469c..81e38f8a1b 100644 --- a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts @@ -29,9 +29,9 @@ import { UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import CONSTANTS = require('../util/constants'); describe('Process Task - Attach content file', () => { diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index ab683c6845..7d9825a632 100644 --- a/e2e/process-services-cloud/start-process-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-process-cloud.e2e.ts @@ -17,8 +17,8 @@ import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Start Process', () => { 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 f37ee5ac6e..3a1d6bf5e2 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -16,8 +16,8 @@ */ import { browser, protractor } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { LoginPage, AppListCloudPage, @@ -39,10 +39,10 @@ import { FileBrowserUtil, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; -import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page'; +import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; +import { ProcessDetailsCloudDemoPage } from './pages/process-details-cloud-demo.page'; import { FileModel } from '../models/ACS/file.model'; -import { BreadCrumbDropdownPage } from '../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page'; +import { BreadCrumbDropdownPage } from '../content-services/pages/breadcrumb/bread-crumb-dropdown.page'; import CONSTANTS = require('../util/constants'); describe('Start Task Form', () => { 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 d66ac5201f..ccdfb5656a 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 @@ -16,8 +16,8 @@ */ import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from '.././pages/tasks-cloud-demo.page'; import { LoginPage, AppListCloudPage, 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 8c0e4d72a1..069226795a 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 @@ -16,8 +16,8 @@ */ import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from '.././pages/tasks-cloud-demo.page'; import { LoginPage, AppListCloudPage, diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index 755ba85a82..c5773ea437 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -26,8 +26,8 @@ import { GroupIdentityService, QueryService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; describe('Task filters cloud', () => { diff --git a/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts index 94dd26a390..c7e1d4da6f 100644 --- a/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts @@ -28,8 +28,8 @@ import { TaskFormCloudComponent, IdentityService, GroupIdentityService, ProcessCloudWidgetPage, FormCloudService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; describe('Task form cloud component', () => { 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 cd3fe12a2f..40fc497a05 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -30,8 +30,8 @@ import { TasksService, FormCloudService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; describe('Task form cloud component', () => { diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index 3f59ef4bbb..9c0073aa8c 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -30,8 +30,8 @@ import { PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import moment = require('moment'); const isValueInvalid = (value: any): boolean => { 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 fd1908a977..55e2c1ac26 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 @@ -17,8 +17,8 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/task-list-properties-sort.e2e.ts b/e2e/process-services-cloud/task-list-properties-sort.e2e.ts index a9ae9a0025..320ca0e5a1 100644 --- a/e2e/process-services-cloud/task-list-properties-sort.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties-sort.e2e.ts @@ -21,8 +21,8 @@ import { LoginPage, ApiService, AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; describe('Edit task filters and task list properties', () => { diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 80adbc1d07..b31ced4ba4 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -22,8 +22,8 @@ import { LoginPage, ApiService, AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; import moment = require('moment'); import { taskFilterConfiguration } from './config/task-filter.config'; diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index 6f3eed0235..95f2a44fcb 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -25,8 +25,8 @@ import { TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Task list cloud - selection', () => { diff --git a/e2e/process-services-cloud/tasks-claim-release.e2e.ts b/e2e/process-services-cloud/tasks-claim-release.e2e.ts index a154bcb725..de1ec033ac 100644 --- a/e2e/process-services-cloud/tasks-claim-release.e2e.ts +++ b/e2e/process-services-cloud/tasks-claim-release.e2e.ts @@ -28,8 +28,8 @@ import { TaskFormCloudComponent, TaskHeaderCloudPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { ProcessInstanceCloud } from '@alfresco/adf-process-services-cloud'; import { taskFilterConfiguration } from './config/task-filter.config'; diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index d7d554cf32..7bcc2473d9 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -29,8 +29,8 @@ import { GroupIdentityService, AppListCloudPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; describe('Task filters cloud', () => { diff --git a/e2e/process-services/about-process-services.e2e.ts b/e2e/process-services/about-process-services.e2e.ts index ec6faa61b4..e292f5a9c1 100644 --- a/e2e/process-services/about-process-services.e2e.ts +++ b/e2e/process-services/about-process-services.e2e.ts @@ -16,7 +16,7 @@ */ import { AboutPage, ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('About Process Services', () => { diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index c3033c6f5d..a25da177bb 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -17,8 +17,8 @@ import { browser } from 'protractor'; import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { ModelsActions } from '../actions/APS/models.actions'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/attach-file-content-service.e2e.ts b/e2e/process-services/attach-file-content-service.e2e.ts index 7b2909314b..030defe102 100644 --- a/e2e/process-services/attach-file-content-service.e2e.ts +++ b/e2e/process-services/attach-file-content-service.e2e.ts @@ -28,9 +28,9 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { TasksPage } from './pages/tasks.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Attach File - Content service', () => { diff --git a/e2e/process-services/attach-file-widget-start-task-app.e2e.ts b/e2e/process-services/attach-file-widget-start-task-app.e2e.ts index c60bc43e56..c2e5af91ee 100644 --- a/e2e/process-services/attach-file-widget-start-task-app.e2e.ts +++ b/e2e/process-services/attach-file-widget-start-task-app.e2e.ts @@ -24,10 +24,10 @@ import { ViewerPage, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { TasksPage } from './pages/tasks.page'; import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Start Task - Task App', () => { diff --git a/e2e/process-services/attach-folder.e2e.ts b/e2e/process-services/attach-folder.e2e.ts index 858ae5d6fc..04ee7f9437 100644 --- a/e2e/process-services/attach-folder.e2e.ts +++ b/e2e/process-services/attach-folder.e2e.ts @@ -26,9 +26,9 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { TasksPage } from './pages/tasks.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Attach Folder', () => { diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index dd3e4925b8..9e5d000eb8 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -17,10 +17,10 @@ import { ApiService, ApplicationsUtil, FormFields, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { AttachFormPage } from '../pages/adf/process-services/attach-form.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { AttachFormPage } from './pages/attach-form.page'; +import { TasksPage } from './pages/tasks.page'; +import { TaskDetailsPage } from './pages/task-details.page'; import { TaskRepresentation } from '@alfresco/js-api'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index 92fbb0843f..e073445cc2 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -16,10 +16,10 @@ */ import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { ChecklistDialog } from '../pages/adf/process-services/dialog/create-checklist-dialog.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { ChecklistDialog } from './pages/dialog/create-checklist-dialog.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { browser } from 'protractor'; import * as fs from 'fs'; import * as path from 'path'; diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index bf39322942..0b0a11a70d 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -17,9 +17,9 @@ import { browser } from 'protractor'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { CommentsPage } from '../pages/adf/comments.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { CommentsPage } from '../core/pages/comments.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Comment component for Processes', () => { diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index f11cab87bc..4ab7665fac 100644 --- a/e2e/process-services/comment-component-tasks.e2e.ts +++ b/e2e/process-services/comment-component-tasks.e2e.ts @@ -18,9 +18,9 @@ import { browser } from 'protractor'; import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { CommentsPage } from '../pages/adf/comments.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; +import { CommentsPage } from '../core/pages/comments.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { TaskRepresentation } from '@alfresco/js-api'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index 56ccd917e7..343c8ffc76 100644 --- a/e2e/process-services/custom-process-filters-sorting.e2e.ts +++ b/e2e/process-services/custom-process-filters-sorting.e2e.ts @@ -18,9 +18,9 @@ import { browser } from 'protractor'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { FiltersPage } from '../pages/adf/process-services/filters.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { FiltersPage } from './pages/filters.page'; describe('Sorting for process filters', () => { diff --git a/e2e/process-services/custom-process-filters.e2e.ts b/e2e/process-services/custom-process-filters.e2e.ts index 98e3f65aff..baef69221e 100644 --- a/e2e/process-services/custom-process-filters.e2e.ts +++ b/e2e/process-services/custom-process-filters.e2e.ts @@ -18,10 +18,10 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { AppSettingsTogglesPage } from '../pages/adf/process-services/dialog/app-settings-toggles.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { AppSettingsTogglesPage } from './pages/dialog/app-settings-toggles.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('New Process Filters', () => { diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index 9d681d1ca5..51b92ff3ba 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -27,8 +27,8 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { AppsRuntimeActions } from '../actions/APS/apps-runtime.actions'; -import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/task-list-demo.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TaskListDemoPage } from './pages/task-list-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { TaskRepresentation } from '@alfresco/js-api'; import moment = require('moment'); diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index 23abaf8c99..e9e64a0c3f 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -24,9 +24,9 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { browser } from 'protractor'; describe('Dynamic Table', () => { diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index 1dcba93e51..13c18f3763 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -17,11 +17,11 @@ import { browser } from 'protractor'; import { ApiService, ApplicationsUtil, LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessListPage } from './pages/process-list.page'; describe('Empty Process List Test', () => { diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index 1cd2d0dd23..a224568141 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -16,7 +16,7 @@ */ import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { browser } from 'protractor'; describe('Form Component', () => { diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index ad511d0913..7cd0691589 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -23,12 +23,12 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { TaskDetailsPage } from './pages/task-details.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { browser } from 'protractor'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; describe('Form widgets - People ', () => { diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index 16cf17e393..1f89ec4ce3 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -24,8 +24,8 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { browser } from 'protractor'; import CONSTANTS = require('../util/constants'); import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); diff --git a/e2e/process-services/info-drawer.e2e.ts b/e2e/process-services/info-drawer.e2e.ts index ebc3bbe275..c426412433 100644 --- a/e2e/process-services/info-drawer.e2e.ts +++ b/e2e/process-services/info-drawer.e2e.ts @@ -28,10 +28,10 @@ import { } from '@alfresco/adf-testing'; import { AppDefinitionRepresentation } from '@alfresco/js-api'; import { browser, by, element } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; import { infoDrawerConfiguration } from './config/task.config'; import CONSTANTS = require('../util/constants'); import moment = require('moment'); diff --git a/e2e/pages/adf/process-services/analytics.page.ts b/e2e/process-services/pages/analytics.page.ts similarity index 100% rename from e2e/pages/adf/process-services/analytics.page.ts rename to e2e/process-services/pages/analytics.page.ts diff --git a/e2e/pages/adf/process-services/attach-form.page.ts b/e2e/process-services/pages/attach-form.page.ts similarity index 100% rename from e2e/pages/adf/process-services/attach-form.page.ts rename to e2e/process-services/pages/attach-form.page.ts diff --git a/e2e/pages/adf/process-services/attachment-list.page.ts b/e2e/process-services/pages/attachment-list.page.ts similarity index 100% rename from e2e/pages/adf/process-services/attachment-list.page.ts rename to e2e/process-services/pages/attachment-list.page.ts diff --git a/e2e/pages/adf/process-services/dialog/app-settings-toggles.page.ts b/e2e/process-services/pages/dialog/app-settings-toggles.page.ts similarity index 100% rename from e2e/pages/adf/process-services/dialog/app-settings-toggles.page.ts rename to e2e/process-services/pages/dialog/app-settings-toggles.page.ts diff --git a/e2e/pages/adf/process-services/dialog/create-checklist-dialog.page.ts b/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts similarity index 100% rename from e2e/pages/adf/process-services/dialog/create-checklist-dialog.page.ts rename to e2e/process-services/pages/dialog/create-checklist-dialog.page.ts diff --git a/e2e/pages/adf/process-services/dialog/start-task-dialog.page.ts b/e2e/process-services/pages/dialog/start-task-dialog.page.ts similarity index 100% rename from e2e/pages/adf/process-services/dialog/start-task-dialog.page.ts rename to e2e/process-services/pages/dialog/start-task-dialog.page.ts diff --git a/e2e/pages/adf/process-services/filters.page.ts b/e2e/process-services/pages/filters.page.ts similarity index 100% rename from e2e/pages/adf/process-services/filters.page.ts rename to e2e/process-services/pages/filters.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/form-demo.page.ts b/e2e/process-services/pages/form-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/form-demo.page.ts rename to e2e/process-services/pages/form-demo.page.ts diff --git a/e2e/pages/adf/process-services/process-details.page.ts b/e2e/process-services/pages/process-details.page.ts similarity index 99% rename from e2e/pages/adf/process-services/process-details.page.ts rename to e2e/process-services/pages/process-details.page.ts index bf8a916df6..dfac1d2a6d 100644 --- a/e2e/pages/adf/process-services/process-details.page.ts +++ b/e2e/process-services/pages/process-details.page.ts @@ -25,7 +25,7 @@ export class ProcessDetailsPage { processEndDateField = element(by.css('span[data-automation-id="card-dateitem-ended"]')); processCategoryField = element(by.css('[data-automation-id="card-textitem-value-category"]')); processBusinessKeyField = element(by.css('[data-automation-id="card-textitem-value-businessKey"]')); - processCreatedByField = element(by.css('[data-automation-id="card-textitem-value-assignee"]')); + processCreatedByField = element(by.css('[data-automation-id="card-textitem-value-createdBy"]')); processCreatedField = element(by.css('span[data-automation-id="card-dateitem-created"]')); processIdField = element(by.css('[data-automation-id="card-textitem-value-id"]')); processDescription = element(by.css('[data-automation-id="card-textitem-value-description"]')); diff --git a/e2e/pages/adf/process-services/process-filters.page.ts b/e2e/process-services/pages/process-filters.page.ts similarity index 100% rename from e2e/pages/adf/process-services/process-filters.page.ts rename to e2e/process-services/pages/process-filters.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/process-list-demo.page.ts b/e2e/process-services/pages/process-list-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/process-list-demo.page.ts rename to e2e/process-services/pages/process-list-demo.page.ts diff --git a/e2e/pages/adf/process-services/process-list.page.ts b/e2e/process-services/pages/process-list.page.ts similarity index 100% rename from e2e/pages/adf/process-services/process-list.page.ts rename to e2e/process-services/pages/process-list.page.ts diff --git a/e2e/pages/adf/process-services/process-service-tab-bar.page.ts b/e2e/process-services/pages/process-service-tab-bar.page.ts similarity index 100% rename from e2e/pages/adf/process-services/process-service-tab-bar.page.ts rename to e2e/process-services/pages/process-service-tab-bar.page.ts diff --git a/e2e/pages/adf/process-services/process-services.page.ts b/e2e/process-services/pages/process-services.page.ts similarity index 100% rename from e2e/pages/adf/process-services/process-services.page.ts rename to e2e/process-services/pages/process-services.page.ts diff --git a/e2e/pages/adf/process-services/task-details.page.ts b/e2e/process-services/pages/task-details.page.ts similarity index 100% rename from e2e/pages/adf/process-services/task-details.page.ts rename to e2e/process-services/pages/task-details.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/task-filters-demo.page.ts b/e2e/process-services/pages/task-filters-demo.page.ts similarity index 96% rename from e2e/pages/adf/demo-shell/process-services/task-filters-demo.page.ts rename to e2e/process-services/pages/task-filters-demo.page.ts index d12abbe2d0..cb1596ef04 100644 --- a/e2e/pages/adf/demo-shell/process-services/task-filters-demo.page.ts +++ b/e2e/process-services/pages/task-filters-demo.page.ts @@ -17,7 +17,7 @@ import { BrowserActions } from '@alfresco/adf-testing'; import { element, by } from 'protractor'; -import { TaskFiltersPage } from '../../process-services/task-filters.page'; +import { TaskFiltersPage } from './task-filters.page'; export class TaskFiltersDemoPage { diff --git a/e2e/pages/adf/process-services/task-filters.page.ts b/e2e/process-services/pages/task-filters.page.ts similarity index 100% rename from e2e/pages/adf/process-services/task-filters.page.ts rename to e2e/process-services/pages/task-filters.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/task-list-demo.page.ts b/e2e/process-services/pages/task-list-demo.page.ts similarity index 98% rename from e2e/pages/adf/demo-shell/process-services/task-list-demo.page.ts rename to e2e/process-services/pages/task-list-demo.page.ts index 840aaf6c9c..d19ef06750 100644 --- a/e2e/pages/adf/demo-shell/process-services/task-list-demo.page.ts +++ b/e2e/process-services/pages/task-list-demo.page.ts @@ -17,7 +17,7 @@ import { BrowserActions, BrowserVisibility, DropdownPage, PaginationPage } from '@alfresco/adf-testing'; import { by, element } from 'protractor'; -import { TasksListPage } from '../../process-services/tasks-list.page'; +import { TasksListPage } from './tasks-list.page'; export class TaskListDemoPage { diff --git a/e2e/pages/adf/process-services/tasks-list.page.ts b/e2e/process-services/pages/tasks-list.page.ts similarity index 100% rename from e2e/pages/adf/process-services/tasks-list.page.ts rename to e2e/process-services/pages/tasks-list.page.ts diff --git a/e2e/pages/adf/process-services/tasks.page.ts b/e2e/process-services/pages/tasks.page.ts similarity index 100% rename from e2e/pages/adf/process-services/tasks.page.ts rename to e2e/process-services/pages/tasks.page.ts diff --git a/e2e/process-services/pagination-processlist-adding-processes.e2e.ts b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts index ba893b37cc..12b76e5a8c 100644 --- a/e2e/process-services/pagination-processlist-adding-processes.e2e.ts +++ b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts @@ -24,9 +24,9 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; describe('Process List - Pagination when adding processes', () => { diff --git a/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts index 01ab086378..0fa1d516f2 100644 --- a/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts @@ -24,8 +24,8 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; import CONSTANTS = require('../util/constants'); describe('Items per page set to 15 and adding of tasks', () => { diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 29b87ddc69..95e9d01ab4 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -16,9 +16,9 @@ */ import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; +import { TasksPage } from './pages/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; import { browser } from 'protractor'; import * as fs from 'fs'; import * as path from 'path'; diff --git a/e2e/process-services/process-attachment-list-action-menu.e2e.ts b/e2e/process-services/process-attachment-list-action-menu.e2e.ts index 34111e8b1e..78f8fbc837 100644 --- a/e2e/process-services/process-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/process-attachment-list-action-menu.e2e.ts @@ -24,10 +24,10 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { AttachmentListPage } from './pages/attachment-list.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index 236684d3d6..95b195ba78 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -23,15 +23,15 @@ import { StartProcessPage, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessListPage } from './pages/process-list.page'; import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/process-list-demo.page'; +import { ProcessListDemoPage } from './pages/process-list-demo.page'; import CONSTANTS = require('../util/constants'); describe('Process Filters Test', () => { diff --git a/e2e/process-services/process-instance-details.e2e.ts b/e2e/process-services/process-instance-details.e2e.ts index 0f239ffcad..0ce9698eb2 100644 --- a/e2e/process-services/process-instance-details.e2e.ts +++ b/e2e/process-services/process-instance-details.e2e.ts @@ -17,11 +17,11 @@ import { browser } from 'protractor'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { ProcessListPage } from './pages/process-list.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; import moment = require('moment'); describe('Process Instance Details', () => { diff --git a/e2e/process-services/process-list-component.e2e.ts b/e2e/process-services/process-list-component.e2e.ts index 98d9af04fc..5f12d2b7a1 100644 --- a/e2e/process-services/process-list-component.e2e.ts +++ b/e2e/process-services/process-list-component.e2e.ts @@ -23,7 +23,7 @@ import { ProcessUtil, UsersActions } from '@alfresco/adf-testing'; -import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/process-list-demo.page'; +import { ProcessListDemoPage } from './pages/process-list-demo.page'; import { browser } from 'protractor'; describe('Process List Test', () => { diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index 4ca5c2eb42..67b6fd5dd8 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -24,9 +24,9 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; describe('Process List - Pagination', () => { diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index 4e53d0d5e2..1141b30f6c 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -24,8 +24,8 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; import { TaskRepresentation } from '@alfresco/js-api'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index f699e16b99..25a65285f5 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -18,8 +18,8 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import * as fs from 'fs'; import * as path from 'path'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 8c40e95c43..c87713ed2f 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -32,14 +32,14 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { UploadDialogPage } from '../pages/adf/dialog/upload-dialog.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { AttachmentListPage } from './pages/attachment-list.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; +import { UploadDialogPage } from '../core/pages/dialog/upload-dialog.page'; describe('Start Process Component', () => { diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index af37b71e05..02e6c8fad3 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -19,10 +19,10 @@ import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from import { browser, by } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { AttachmentListPage } from './pages/attachment-list.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { TasksPage } from './pages/tasks.page'; import CONSTANTS = require('../util/constants'); describe('Start Task - Custom App', () => { diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index 23e6ed647c..283d585a38 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -18,11 +18,11 @@ import { ApiService, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; -import { ChecklistDialog } from '../pages/adf/process-services/dialog/create-checklist-dialog.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { AttachmentListPage } from './pages/attachment-list.page'; +import { ChecklistDialog } from './pages/dialog/create-checklist-dialog.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { TasksPage } from './pages/tasks.page'; import * as fs from 'fs'; import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; diff --git a/e2e/process-services/stencil.e2e.ts b/e2e/process-services/stencil.e2e.ts index 2a5989be9f..d2516ed421 100644 --- a/e2e/process-services/stencil.e2e.ts +++ b/e2e/process-services/stencil.e2e.ts @@ -23,14 +23,14 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { TasksPage } from './pages/tasks.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/process-list-demo.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { ProcessListDemoPage } from './pages/process-list-demo.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessListPage } from './pages/process-list.page'; import CONSTANTS = require('../util/constants'); describe('Stencil', () => { diff --git a/e2e/process-services/task-assignee.e2e.ts b/e2e/process-services/task-assignee.e2e.ts index cd419c6fd1..15dca47713 100644 --- a/e2e/process-services/task-assignee.e2e.ts +++ b/e2e/process-services/task-assignee.e2e.ts @@ -24,14 +24,14 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; -import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { ProcessFiltersPage } from './pages/process-filters.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { ProcessDetailsPage } from './pages/process-details.page'; +import { ProcessListPage } from './pages/process-list.page'; import { browser } from 'protractor'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { TasksPage } from './pages/tasks.page'; import CONSTANTS = require('../util/constants'); describe('Task Assignee', () => { diff --git a/e2e/process-services/task-attachment-list-action-menu.e2e.ts b/e2e/process-services/task-attachment-list-action-menu.e2e.ts index 2358f821d7..65e3652b6a 100644 --- a/e2e/process-services/task-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/task-attachment-list-action-menu.e2e.ts @@ -24,9 +24,9 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; +import { AttachmentListPage } from './pages/attachment-list.page'; import * as fs from 'fs'; import * as path from 'path'; import { FileModel } from '../models/ACS/file.model'; diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index ad4bb8b973..66f6e300cc 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -16,8 +16,8 @@ */ import { LoginPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; +import { TasksPage } from './pages/tasks.page'; +import { ProcessServicesPage } from './pages/process-services.page'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; import { TaskRepresentation } from '@alfresco/js-api'; diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index 28aeed265e..7653a75f6d 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -26,12 +26,12 @@ import { } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FormModelActions } from '../actions/APS/form-model.actions'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { FiltersPage } from '../pages/adf/process-services/filters.page'; -import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; -import { TasksListPage } from '../pages/adf/process-services/tasks-list.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { AttachFormPage } from '../pages/adf/process-services/attach-form.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { FiltersPage } from './pages/filters.page'; +import { TaskDetailsPage } from './pages/task-details.page'; +import { TasksListPage } from './pages/tasks-list.page'; +import { TasksPage } from './pages/tasks.page'; +import { AttachFormPage } from './pages/attach-form.page'; import { TaskRepresentation } from '@alfresco/js-api'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index eb2d993ce3..e9e238b731 100644 --- a/e2e/process-services/task-details-no-form.e2e.ts +++ b/e2e/process-services/task-details-no-form.e2e.ts @@ -16,8 +16,8 @@ */ import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 08f1bbf690..72b0c5be4a 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -24,8 +24,8 @@ import { StringUtil, UsersActions } from '@alfresco/adf-testing'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { TasksPage } from './pages/tasks.page'; import { browser } from 'protractor'; import { TaskRepresentation } from '@alfresco/js-api'; import Task = require('../models/APS/Task'); diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index 6f1a5b9cfe..81ebac748c 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -16,14 +16,14 @@ */ import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { TasksListPage } from '../pages/adf/process-services/tasks-list.page'; -import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; -import { AppSettingsTogglesPage } from '../pages/adf/process-services/dialog/app-settings-toggles.page'; -import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/task-filters-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { TasksPage } from './pages/tasks.page'; +import { TasksListPage } from './pages/tasks-list.page'; +import { TaskDetailsPage } from './pages/task-details.page'; +import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; +import { AppSettingsTogglesPage } from './pages/dialog/app-settings-toggles.page'; +import { TaskFiltersDemoPage } from './pages/task-filters-demo.page'; import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { browser } from 'protractor'; diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index e4c50c802b..3f5c19e818 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -16,12 +16,12 @@ */ import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import { TasksListPage } from '../pages/adf/process-services/tasks-list.page'; -import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; -import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/task-filters-demo.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { ProcessServicesPage } from './pages/process-services.page'; +import { TasksPage } from './pages/tasks.page'; +import { TasksListPage } from './pages/tasks-list.page'; +import { TaskDetailsPage } from './pages/task-details.page'; +import { TaskFiltersDemoPage } from './pages/task-filters-demo.page'; import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { browser } from 'protractor'; diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 33d316189b..901b8d6dc8 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -25,8 +25,8 @@ import { UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; +import { TasksPage } from './pages/tasks.page'; import CONSTANTS = require('../util/constants'); describe('Task List Pagination', () => { diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index 65ffae8d89..0c1f0bd221 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/attach-file-widget.e2e.ts b/e2e/process-services/widgets/attach-file-widget.e2e.ts index 58732be4b2..eb4914a458 100644 --- a/e2e/process-services/widgets/attach-file-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-file-widget.e2e.ts @@ -24,13 +24,13 @@ import { ViewerPage, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { TaskDetailsPage } from '../../pages/adf/process-services/task-details.page'; -import { TasksListPage } from '../../pages/adf/process-services/tasks-list.page'; -import { FiltersPage } from '../../pages/adf/process-services/filters.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { TaskDetailsPage } from '../pages/task-details.page'; +import { TasksListPage } from '../pages/tasks-list.page'; +import { FiltersPage } from '../pages/filters.page'; import CONSTANTS = require('../../util/constants'); describe('Attach widget - File', () => { diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index e0772f215a..98541828fc 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index 91093ad944..1e6076d116 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index cf9dbb65ab..b33ce87f29 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index 581389b3df..7133a74e7d 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -25,9 +25,9 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; -import { FormDemoPage } from '../../pages/adf/demo-shell/process-services/form-demo.page'; +import { FormDemoPage } from '.././pages/form-demo.page'; import { customDateFormAPS1 } from '../../resources/forms/custom-date-form'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index f0e7ee1988..5bf7e33c65 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index 8c23a085b0..5445db4974 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index 4ebaae2d7a..db409c9ac4 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -24,9 +24,9 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../util/constants'); describe('Dynamic Table widget ', () => { diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 4cb696ddb8..adc5d91b07 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index d9047e077b..7dd6e2d9c5 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 2dafee8681..461c0f50a6 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index 5eeefeb232..b2f74137ce 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/people-group-widget.e2e.ts b/e2e/process-services/widgets/people-group-widget.e2e.ts index 3d2ca5ce58..850df82364 100644 --- a/e2e/process-services/widgets/people-group-widget.e2e.ts +++ b/e2e/process-services/widgets/people-group-widget.e2e.ts @@ -16,9 +16,9 @@ */ import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../util/constants'); describe('People and Group widget', () => { diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index 17a2d8e058..3ec032ac75 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index f6d114f2c0..66240e6323 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index a0d1fb5800..46b2db1529 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -24,7 +24,7 @@ import { UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/process-services/widgets/typeahead-widget.e2e.ts b/e2e/process-services/widgets/typeahead-widget.e2e.ts index 6ff56fedd0..dad3ee7662 100644 --- a/e2e/process-services/widgets/typeahead-widget.e2e.ts +++ b/e2e/process-services/widgets/typeahead-widget.e2e.ts @@ -16,9 +16,9 @@ */ import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import CONSTANTS = require('../../util/constants'); describe('Typeahead widget', () => { diff --git a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts index 76578a4f4b..ebaf6a2a79 100644 --- a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts +++ b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts @@ -25,7 +25,7 @@ import { Widget } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import { TasksPage } from '../pages/tasks.page'; import CONSTANTS = require('../../util/constants'); const widgets = { diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 31632064a3..5d653e5c79 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -1,4 +1,4 @@ -const {LocalStorageUtil, ACTIVITI_CLOUD_APPS, Logger} = require('../lib/dist/testing'); +const { LocalStorageUtil, Logger } = require('@alfresco/adf-testing'); const path = require('path'); const {SpecReporter} = require('jasmine-spec-reporter'); const retry = require('protractor-retry').retry; @@ -9,7 +9,7 @@ const smartRunner = require('protractor-smartrunner'); const resolve = require('path').resolve; const fs = require('fs'); -const {uploadScreenshot, cleanReportFolder} = require('./protractor/save-remote'); +const {uploadScreenshot} = require('./protractor/save-remote'); const argv = require('yargs').argv; const width = 1657, height = 1657; @@ -17,7 +17,6 @@ const width = 1657, height = 1657; const ENV_FILE = process.env.ENV_FILE; const GROUP_SUFFIX = process.env.PREFIX || 'adf'; -RESOURCES.ACTIVITI_CLOUD_APPS = ACTIVITI_CLOUD_APPS; if (ENV_FILE) { require('dotenv').config({path: ENV_FILE}); } @@ -265,15 +264,10 @@ exports.config = { }, - - beforeLaunch: function () { - if (SAVE_SCREENSHOT) { - cleanReportFolder(); - } - }, - afterLaunch: async function () { if (SAVE_SCREENSHOT) { + console.log(`Save screenshot failures enabled`); + let retryCount = 1; if (argv.retry) { retryCount = ++argv.retry; @@ -283,6 +277,8 @@ exports.config = { } catch (error) { console.error('Error saving screenshot', error); } + }else{ + console.log(`Save screenshot failures disabled`); } return retry.afterLaunch(MAX_RETRIES); diff --git a/e2e/protractor/save-remote.js b/e2e/protractor/save-remote.js index 6f670ad70f..79084321ff 100644 --- a/e2e/protractor/save-remote.js +++ b/e2e/protractor/save-remote.js @@ -14,6 +14,8 @@ function buildNumber() { } async function uploadScreenshot(retryCount) { + console.log(`Start uploading failures screenshot ${retryCount}`); + let files = fs.readdirSync(path.join(__dirname, '../e2e-output/screenshots')); if (files && files.length > 0) { @@ -72,22 +74,6 @@ async function uploadScreenshot(retryCount) { } } -async function cleanReportFolder() { - const reportsFolder = path.resolve(__dirname, '../e2e-output/junit-report/'); - - fs.exists(reportsFolder, function (exists, error) { - if (exists) { - rimraf(reportsFolder, function (err) { - }); - } - - if (error) { - console.error('[ERROR] fs', error); - } - }); -} - module.exports = { - uploadScreenshot: uploadScreenshot, - cleanReportFolder: cleanReportFolder + uploadScreenshot: uploadScreenshot }; diff --git a/e2e/search/components/search-check-list.e2e.ts b/e2e/search/components/search-check-list.e2e.ts index fb17eeb529..d6b53a093e 100644 --- a/e2e/search/components/search-check-list.e2e.ts +++ b/e2e/search/components/search-check-list.e2e.ts @@ -25,10 +25,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { SearchResultsPage } from '../pages/search-results.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { SearchConfiguration } from '../search.config'; import { browser } from 'protractor'; diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index 6ddf238079..309865df17 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -17,10 +17,10 @@ import { DataTableComponentPage, DatePickerCalendarPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing'; import { browser, ElementFinder } from 'protractor'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; +import { SearchResultsPage } from '../pages/search-results.page'; import { SearchConfiguration } from '../search.config'; describe('Search Date Range Filter', () => { diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index 57d8c7bd72..958ef6913d 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -25,10 +25,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; +import { SearchResultsPage } from '../pages/search-results.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser, ElementFinder } from 'protractor'; import { SearchConfiguration } from '../search.config'; diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index 5a61396cf9..79273de46d 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -25,10 +25,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; +import { SearchResultsPage } from '../pages/search-results.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; import { SearchConfiguration } from '../search.config'; import { browser } from 'protractor'; diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 8c5364f690..ee24122620 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -24,10 +24,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; +import { SearchResultsPage } from '../pages/search-results.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser, ElementFinder } from 'protractor'; import { SearchConfiguration } from '../search.config'; diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index d4a21d29b5..82902b6b5e 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -24,11 +24,11 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; -import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; +import { SearchResultsPage } from '../pages/search-results.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; import { browser } from 'protractor'; import { SearchConfiguration } from '../search.config'; diff --git a/e2e/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts index 6054bcdbb4..257f193260 100644 --- a/e2e/search/components/search-text.e2e.ts +++ b/e2e/search/components/search-text.e2e.ts @@ -27,10 +27,10 @@ import { UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; -import { SearchResultsPage } from '../../pages/adf/search-results.page'; -import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; -import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { SearchDialogPage } from '../pages/search-dialog.page'; +import { SearchResultsPage } from '../pages/search-results.page'; +import { SearchFiltersPage } from '../pages/search-filters.page'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { SearchConfiguration } from '../search.config'; diff --git a/e2e/pages/adf/dialog/search-dialog.page.ts b/e2e/search/pages/search-dialog.page.ts similarity index 100% rename from e2e/pages/adf/dialog/search-dialog.page.ts rename to e2e/search/pages/search-dialog.page.ts diff --git a/e2e/pages/adf/search-filters.page.ts b/e2e/search/pages/search-filters.page.ts similarity index 100% rename from e2e/pages/adf/search-filters.page.ts rename to e2e/search/pages/search-filters.page.ts diff --git a/e2e/pages/adf/search-results.page.ts b/e2e/search/pages/search-results.page.ts similarity index 97% rename from e2e/pages/adf/search-results.page.ts rename to e2e/search/pages/search-results.page.ts index 0c11f89d5a..d8e8220a09 100644 --- a/e2e/pages/adf/search-results.page.ts +++ b/e2e/search/pages/search-results.page.ts @@ -17,7 +17,7 @@ import { BrowserVisibility, DataTableComponentPage, SearchSortingPickerPage } from '@alfresco/adf-testing'; import { by, element } from 'protractor'; -import { ContentServicesPage } from './content-services.page'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; export class SearchResultsPage { diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index 1b9a940d35..0d6740d30e 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -28,12 +28,12 @@ import { UsersActions, ViewerPage } from '@alfresco/adf-testing'; -import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { SearchResultsPage } from '../pages/adf/search-results.page'; +import { SearchDialogPage } from './pages/search-dialog.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; +import { SearchResultsPage } from './pages/search-results.page'; import { FileModel } from '../models/ACS/file.model'; import { FolderModel } from '../models/ACS/folder.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { SearchConfiguration } from './search.config'; describe('Search component - Search Bar', () => { diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index 6dd1c8b6d3..cc0db2d910 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; -import { SearchFiltersPage } from '../pages/adf/search-filters.page'; -import { SearchResultsPage } from '../pages/adf/search-results.page'; +import { SearchDialogPage } from './pages/search-dialog.page'; +import { SearchFiltersPage } from './pages/search-filters.page'; +import { SearchResultsPage } from './pages/search-results.page'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { ApiService, BrowserActions, diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index 16f5882766..4c4d12ca2c 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -17,11 +17,11 @@ import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; -import { SearchResultsPage } from '../pages/adf/search-results.page'; -import { SearchFiltersPage } from '../pages/adf/search-filters.page'; +import { SearchDialogPage } from './pages/search-dialog.page'; +import { SearchResultsPage } from './pages/search-results.page'; +import { SearchFiltersPage } from './pages/search-filters.page'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import CONSTANTS = require('../util/constants'); describe('Search Component - Multi-Select Facet', () => { diff --git a/e2e/search/search-page.e2e.ts b/e2e/search/search-page.e2e.ts index a2d40f0424..66d945f35f 100644 --- a/e2e/search/search-page.e2e.ts +++ b/e2e/search/search-page.e2e.ts @@ -19,12 +19,12 @@ import { browser } from 'protractor'; import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; -import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; -import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { SearchResultsPage } from '../pages/adf/search-results.page'; +import { SearchDialogPage } from './pages/search-dialog.page'; +import { ContentServicesPage } from '../core/pages/content-services.page'; +import { SearchResultsPage } from './pages/search-results.page'; import { FolderModel } from '../models/ACS/folder.model'; import { FileModel } from '../models/ACS/file.model'; -import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('Search component - Search Page', () => { const search = { diff --git a/e2e/util/resources.js b/e2e/util/resources.js index b2f06d3a5e..8c20440670 100644 --- a/e2e/util/resources.js +++ b/e2e/util/resources.js @@ -21,8 +21,10 @@ * * @class util.Resources */ -var exports = module.exports = {}; var path = require('path'); +const ACTIVITI_CLOUD_APPS = require('../../lib/testing/src/lib/process-services-cloud/resources/resources.json'); + +exports.ACTIVITI_CLOUD_APPS = ACTIVITI_CLOUD_APPS; exports.Files = { @@ -70,13 +72,13 @@ exports.Files = { description: "Description for app", processNames: ["simple", "candidate-task"], userTasks: { - "simple": { one: 'Candidate Task', two: 'User Task' }, - "candidateTask": "Human step" + "simple": {one: 'Candidate Task', two: 'User Task'}, + "candidateTask": "Human step" }, candidateGroup: "candidates", adminGroup: "admin", adminCapabilities: ['tenant-admin'], - candidate: { firstName: 'Candidate', lastName: 'User', email: 'candidateuser@actviti.com' } + candidate: {firstName: 'Candidate', lastName: 'User', email: 'candidateuser@actviti.com'} }, APP_WITH_USER_WIDGET: { @@ -389,7 +391,7 @@ exports.Files = { }, case2: { searchTerm: 'One', - result: [ '123456789 - Customer Number One' ] + result: ['123456789 - Customer Number One'] } }, @@ -412,11 +414,11 @@ exports.Files = { file_location: "/resources/apps/More Widgets.zip", file_path: path.join(__dirname, '../resources/apps/More Widgets.zip'), title: "More Widgets", - group: { name: "Users", subgroup: [ { name: "Heros" }, { name: "Villains" }] }, - subGroupUser: { firstName: "Hero", lastName: "User" } , + group: {name: "Users", subgroup: [{name: "Heros"}, {name: "Villains"}]}, + subGroupUser: {firstName: "Hero", lastName: "User"}, groupUser: [ - { firstName: "Hero", lastName: "Audience" }, - { firstName: "Villain", lastName: "Audience" }, + {firstName: "Hero", lastName: "Audience"}, + {firstName: "Villain", lastName: "Audience"}, ], ADD_PEOPLE_AND_GROUP_RESTRICTION: { diff --git a/package-lock.json b/package-lock.json index 14f4ac33b8..96f0a9430f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,17 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.9.0.tgz", - "integrity": "sha512-mvdYNgAflFagrzx6Czzd4p68lRvv+zHpODU9BTl6BMlF1edi/iYfv0DSyGWK5A/3x3RkiEskmyidTPaY3DQ2kg==", + "version": "3.10.0-dace956aa0429686afb7befd9da9eb9a858e6a99", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.10.0-dace956aa0429686afb7befd9da9eb9a858e6a99.tgz", + "integrity": "sha512-vZuyJ0ySI0ZTPy7ZGl/GRaYRoOBizna+nDeE8PQ/Kay5DAeEFus8D1pkSHdGrSf1sXAd1hJTEKFrU/aV/SGfww==", "dev": true, "requires": { - "@angular-devkit/core": "^7.2.15", + "@angular-devkit/core": "^9.1.7", "commander": "^4.0.0", "ejs": "^2.6.1", "license-checker": "^25.0.1", - "npm-registry-fetch": "^3.9.0", - "rxjs": ">=6.2.2", + "npm-registry-fetch": "^4.0.5", + "rxjs": "^6.5.5", "shelljs": "^0.8.3", "spdx-license-list": "^5.0.0" }, @@ -28,10 +28,19 @@ } } }, + "@alfresco/adf-testing": { + "version": "3.10.0-dace956aa0429686afb7befd9da9eb9a858e6a99", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.10.0-dace956aa0429686afb7befd9da9eb9a858e6a99.tgz", + "integrity": "sha512-hwmQglQl18Ot6zcHgtbbgd803NQjZHRXm5nYfL0HChK5lq5pbX/Re95ZSc+58NAf2GfOE5GPGGprWfWvtQKkzA==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } + }, "@alfresco/js-api": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.9.0.tgz", - "integrity": "sha512-O0Xe175Ziks+ap8Pb1VbjlGuB1x3cgxdPIKIPziXjXb7eAbvk7VO4HItwgQ6itSvFIU4H5CXO1t+NfTucak7EA==", + "version": "3.10.0-c05b67bb1af16b57b9fdf9d185fb2955c3af08f2", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.10.0-c05b67bb1af16b57b9fdf9d185fb2955c3af08f2.tgz", + "integrity": "sha512-04VoHdDDOYvdR7sveE2syxVj2DvR3jq1czqwfrqh7vPCuvlp8t89LPIkepWa1OzCnv9VGN87FilFKhZQLaJq8Q==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", @@ -835,57 +844,37 @@ } }, "@angular-devkit/core": { - "version": "7.3.10", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.10.tgz", - "integrity": "sha512-h8Yj2+UfBsPI7jZ8X88tImO/7RPgNWUcKF8Uq/J5eUSN6z0FMO0lluD4sM7X8aikb7RK8MwkwrqB/xfxvvkOow==", + "version": "9.1.11", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.11.tgz", + "integrity": "sha512-uiEkDvWfMgPHuO4jVgBEr9Kl/LuxHaWYGD2ZtKsOnnHYZyRGp61ot7UcDF+KNdXTiq01JJH84VTd3IttEewmhQ==", "dev": true, "requires": { - "ajv": "6.9.1", - "chokidar": "2.0.4", - "fast-json-stable-stringify": "2.0.0", - "rxjs": "6.3.3", + "ajv": "6.12.0", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.5.4", "source-map": "0.7.3" }, "dependencies": { "ajv": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", - "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true - }, "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", "dev": true, "requires": { "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", - "dev": true - } } }, "source-map": { @@ -893,6 +882,12 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true } } }, @@ -7139,9 +7134,9 @@ "dev": true }, "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", "dev": true, "requires": { "bluebird": "^3.5.5", @@ -7149,6 +7144,7 @@ "figgy-pudding": "^3.5.1", "glob": "^7.1.4", "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "mkdirp": "^0.5.1", @@ -15047,16 +15043,16 @@ "dev": true }, "make-fetch-happen": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz", - "integrity": "sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz", + "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==", "dev": true, "requires": { "agentkeepalive": "^3.4.1", - "cacache": "^11.3.3", + "cacache": "^12.0.0", "http-cache-semantics": "^3.8.1", "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", + "https-proxy-agent": "^2.2.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "node-fetch-npm": "^2.0.2", @@ -16698,17 +16694,26 @@ } }, "npm-registry-fetch": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz", - "integrity": "sha512-VQCEZlydXw4AwLROAXWUR7QDfe2Y8Id/vpAgp6TI1/H78a4SiQ1kQrKZALm5/zxM5n4HIi+aYb+idUAV/RuY0Q==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz", + "integrity": "sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==", "dev": true, "requires": { "JSONStream": "^1.3.4", "bluebird": "^3.5.1", "figgy-pudding": "^3.4.1", "lru-cache": "^5.1.1", - "make-fetch-happen": "^4.0.2", - "npm-package-arg": "^6.1.0" + "make-fetch-happen": "^5.0.0", + "npm-package-arg": "^6.1.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } } }, "npm-run-all": { diff --git a/package.json b/package.json index 8908749a10..1fd28f0c7d 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@alfresco/adf-cli": "3.9.0", + "@alfresco/adf-cli": "3.10.0-dace956aa0429686afb7befd9da9eb9a858e6a99", + "@alfresco/adf-testing": "3.10.0-dace956aa0429686afb7befd9da9eb9a858e6a99", "@angular-devkit/build-angular": "~0.1000.3", "@angular-devkit/build-ng-packagr": "~0.1000.3", "@angular/cli": "^10.0.3", diff --git a/scripts/travis/build/build.sh b/scripts/travis/build/build.sh index 3901acbdb8..e11c50820f 100755 --- a/scripts/travis/build/build.sh +++ b/scripts/travis/build/build.sh @@ -26,12 +26,12 @@ then ./scripts/build/build-all-lib.sh - echo "====== Build Demo shell for production =====" - npm run build:prod || exit 1; - else echo "====== Update the package.json with latest JS-API/CLI deps =====" npx @alfresco/adf-cli@alpha update-version --alpha --pathPackage "$(pwd)" npm install; - nx affected --target=build --base=$BASE_HASH --head=$HEAD_HASH --exclude=cli --prod --with-deps || exit 1; + nx affected --target=build --base=$BASE_HASH --head=$HEAD_HASH --exclude="cli,demoshell" --prod --with-deps || exit 1; fi; + +echo "====== Build Demo shell for production =====" +nx build demoshell --prod diff --git a/scripts/travis/update/update-children.sh b/scripts/travis/update/update-children.sh index baaa672b10..b2f453f0f0 100755 --- a/scripts/travis/update/update-children.sh +++ b/scripts/travis/update/update-children.sh @@ -12,13 +12,13 @@ else fi; echo "Update Generator" -./scripts/travis/update/update-project.sh -t $GITHUB_TOKEN -n 'Alfresco/generator-alfresco-adf-app' -v $VERSION -vj $JS_VERSION +./scripts/travis/update/update-project.sh -t $GITHUB_TOKEN -n 'Alfresco/generator-alfresco-adf-app' -v $VERSION -vjs $JS_VERSION echo "Update ACA" -./scripts/travis/update/update-project.sh -t $GITHUB_TOKEN -n 'Alfresco/alfresco-content-app' -v $VERSION -vj $JS_VERSION +./scripts/travis/update/update-project.sh -t $GITHUB_TOKEN -n 'Alfresco/alfresco-content-app' -v $VERSION -vjs $JS_VERSION echo "Update AMA" -./scripts/travis/update/update-project.sh -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-apps' -v $VERSION -vj $JS_VERSION +./scripts/travis/update/update-project.sh -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-apps' -v $VERSION -vjs $JS_VERSION echo "Update Workspace" -./scripts/travis/update/update-project.sh -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-process-workspace-app' -v $VERSION -vj $JS_VERSION +./scripts/travis/update/update-project.sh -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-process-workspace-app' -v $VERSION -vjs $JS_VERSION echo "Update Digital Workspace" -./scripts/travis/update/update-project.sh -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-digital-workspace-app' -v $VERSION -vj $JS_VERSION +./scripts/travis/update/update-project.sh -t $GITHUB_ENTERPRISE_TOKEN -n 'Alfresco/alfresco-digital-workspace-app' -v $VERSION -vjs $JS_VERSION