diff --git a/.stylelintignore b/.stylelintignore index 795f3a3a3d..66f64bc148 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -1,2 +1,2 @@ _theming.scss -pdfViewerHost.component.scss +lib/core/viewer/components/pdf-viewer-host.component.scss diff --git a/angular.json b/angular.json index 291b46ac66..c346c144d7 100644 --- a/angular.json +++ b/angular.json @@ -101,6 +101,15 @@ "vendorChunk": true, "buildOptimizer": true, "verbose": false, + "budgets": [ + { + "type": "bundle", + "name": "vendor", + "baseline": "4.2MB", + "warning": "4.5MB", + "error": "5.0MB" + } + ], "fileReplacements": [ { "replace": "demo-shell/src/environments/environment.ts", diff --git a/docs/insights/components/analytics-generator.component.md b/docs/insights/components/analytics-generator.component.md index 323d196f46..561cccf7dc 100644 --- a/docs/insights/components/analytics-generator.component.md +++ b/docs/insights/components/analytics-generator.component.md @@ -24,7 +24,7 @@ Generates and shows charts | Name | Type | Default value | Description | | ---- | ---- | ------------- | ----------- | | reportId | `number` | | reportId. | -| reportParamQuery | [`ReportQuery`](../../../lib/insights/src/lib/diagram/models/report/reportQuery.model.ts) | undefined | reportParamQuery. | +| reportParamQuery | [`ReportQuery`](../../../lib/insights/src/lib/diagram/models/report/report-query.model.ts) | undefined | reportParamQuery. | ### Events diff --git a/docs/insights/components/analytics-report-list.component.md b/docs/insights/components/analytics-report-list.component.md index 58a6b2b618..1c06498341 100644 --- a/docs/insights/components/analytics-report-list.component.md +++ b/docs/insights/components/analytics-report-list.component.md @@ -31,5 +31,5 @@ Shows a list of all available reports | Name | Type | Description | | ---- | ---- | ----------- | | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<>` | error. | -| reportClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ReportParametersModel`](../../../lib/insights/src/lib/diagram/models/report/reportParameters.model.ts)`>` | report Click. | +| reportClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ReportParametersModel`](../../../lib/insights/src/lib/diagram/models/report/report-parameters.model.ts)`>` | report Click. | | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<>` | success. | diff --git a/docs/process-services/components/form.component.md b/docs/process-services/components/form.component.md index d65f187560..9a40da5f27 100644 --- a/docs/process-services/components/form.component.md +++ b/docs/process-services/components/form.component.md @@ -279,7 +279,7 @@ could use this, say, to provide two alternative ways of entering the same inform up default values that can be edited. You can implement this in ADF using the `formFieldValueChanged` event of the -[Form service](../../core/services/form.service.md). For example, if you had a form with a [dropdown widget](../../../lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts) (id: `type`) +[Form service](../../core/services/form.service.md). For example, if you had a form with a [dropdown widget](../../../lib/testing/src/lib/core/pages/form/widgets/dropdown-widget.page.ts) (id: `type`) and a multiline text (id:`description`), you could synchronize their values as follows: ```ts diff --git a/docs/upgrade-guide/upgrade26-30.md b/docs/upgrade-guide/upgrade26-30.md index eb36b0bfca..d4668d4fdc 100644 --- a/docs/upgrade-guide/upgrade26-30.md +++ b/docs/upgrade-guide/upgrade26-30.md @@ -465,21 +465,21 @@ These changes are noted with an arrow "->". - `adf-full-width` -#### [../../lib/core/viewer/components/imgViewer.component.scss](../../lib/core/viewer/components/imgViewer.component.scss) +#### [../../lib/core/viewer/components/imgViewer.component.scss](../../lib/core/viewer/components/img-viewer.component.scss) - `adf-image-container` -#### [../../lib/core/viewer/components/pdfViewer-thumbnails.component.scss](../../lib/core/viewer/components/pdfViewer-thumbnails.component.scss) +#### [../../lib/core/viewer/components/pdfViewer-thumbnails.component.scss](../../lib/core/viewer/components/pdf-viewer-thumbnails.component.scss) - `adf-pdf-thumbnails` -#### [../../lib/core/viewer/components/pdfViewer.component.scss](../../lib/core/viewer/components/pdfViewer.component.scss) +#### [../../lib/core/viewer/components/pdfViewer.component.scss](../../lib/core/viewer/components/pdf-viewer.component.scss) - `adf-loader-container` - `adf-thumbnails-template` - `adf-loader-item` -#### [../../lib/core/viewer/components/pdfViewerHost.component.scss](../../lib/core/viewer/components/pdfViewerHost.component.scss) +#### [../../lib/core/viewer/components/pdfViewerHost.component.scss](../../lib/core/viewer/components/pdf-viewer-host.component.scss) - `adf-highlight` - `adf-begin` diff --git a/e2e/actions/APS/appsRuntime.actions.ts b/e2e/actions/APS/apps-runtime.actions.ts similarity index 100% rename from e2e/actions/APS/appsRuntime.actions.ts rename to e2e/actions/APS/apps-runtime.actions.ts diff --git a/e2e/actions/APS/formModel.actions.ts b/e2e/actions/APS/form-model.actions.ts similarity index 100% rename from e2e/actions/APS/formModel.actions.ts rename to e2e/actions/APS/form-model.actions.ts diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index 6cfef4f4b8..d8d933a1c6 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -16,11 +16,11 @@ */ import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { CommentsPage } from '../../pages/adf/commentsPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { CommentsPage } from '../../pages/adf/comments.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts index 8f371a87dc..24aa0ed6ab 100644 --- a/e2e/content-services/directives/create-folder-directive.e2e.ts +++ b/e2e/content-services/directives/create-folder-directive.e2e.ts @@ -16,19 +16,19 @@ */ import { LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { FolderDialog } from '../../pages/adf/dialog/folderDialog'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +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 { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, Key } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Create folder directive', () => { const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); - const createFolderDialog = new FolderDialog(); + const createFolderDialog = new FolderDialogPage(); const notificationHistoryPage = new NotificationHistoryPage(); const metadataViewPage = new MetadataViewPage(); const acsUser = new AcsUserModel(); diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index 6c71c9277b..bfdd441fb3 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/e2e/content-services/directives/create-library-directive.e2e.ts @@ -16,19 +16,19 @@ */ import { LoginPage, BrowserActions, StringUtil } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { CreateLibraryDialog } from '../../pages/adf/dialog/createLibraryDialog'; -import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { CreateLibraryDialogPage } from '../../pages/adf/dialog/create-library-dialog.page'; +import { CustomSources } from '../../pages/adf/demo-shell/custom-sources.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Create library directive', () => { const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); - const createLibraryDialog = new CreateLibraryDialog(); + const createLibraryDialog = new CreateLibraryDialogPage(); const customSourcesPage = new CustomSources(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index a04d8953d2..288454a644 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/e2e/content-services/directives/download-directive.e2e.ts @@ -15,14 +15,14 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { LoginPage, UploadActions, BrowserVisibility, FileBrowserUtil } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { FolderModel } from '../../models/ACS/folderModel'; +import { NavigationBarPage } from '../../pages/adf/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 737cabfe6f..1ec3f764dc 100644 --- a/e2e/content-services/directives/edit-folder-directive.e2e.ts +++ b/e2e/content-services/directives/edit-folder-directive.e2e.ts @@ -16,19 +16,19 @@ */ import { BrowserActions, LoginPage, NotificationHistoryPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { FolderDialog } from '../../pages/adf/dialog/folderDialog'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, protractor } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { FileModel } from '../../models/ACS/fileModel'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { FileModel } from '../../models/ACS/file.model'; describe('Edit folder directive', () => { const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); - const editFolderDialog = new FolderDialog(); + const editFolderDialog = new FolderDialogPage(); const acsUser = new AcsUserModel(); const anotherAcsUser = new AcsUserModel(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/content-services/directives/favorite-directive.e2e.ts b/e2e/content-services/directives/favorite-directive.e2e.ts index 97d847fd18..e8cc79d0db 100644 --- a/e2e/content-services/directives/favorite-directive.e2e.ts +++ b/e2e/content-services/directives/favorite-directive.e2e.ts @@ -16,15 +16,15 @@ */ import { ContentNodeSelectorDialogPage, LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { FileModel } from '../../models/ACS/fileModel'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage'; -import { TrashcanPage } from '../../pages/adf/trashcanPage'; +import { FileModel } from '../../models/ACS/file.model'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { CustomSources } from '../../pages/adf/demo-shell/custom-sources.page'; +import { TrashcanPage } from '../../pages/adf/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 49f4512d07..1c6d888207 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/e2e/content-services/directives/restore-content-directive.e2e.ts @@ -15,16 +15,16 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { FileModel } from '../../models/ACS/fileModel'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { TrashcanPage } from '../../pages/adf/trashcanPage'; +import { FileModel } from '../../models/ACS/file.model'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { TrashcanPage } from '../../pages/adf/trashcan.page'; import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions } from '@alfresco/adf-testing'; -import { BreadCrumbPage } from '../../pages/adf/content-services/breadcrumb/breadCrumbPage'; +import { BreadCrumbPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb.page'; describe('Restore content directive', () => { 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 3e6f11094e..b4ff9af84e 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -23,16 +23,16 @@ import { StringUtil, ContentNodeSelectorDialogPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; import { Util } from '../../util/util'; -import { BreadCrumbDropdownPage } from '../../pages/adf/content-services/breadcrumb/breadCrumbDropdownPage'; -import { BreadCrumbPage } from '../../pages/adf/content-services/breadcrumb/breadCrumbPage'; -import { InfinitePaginationPage } from '../../pages/adf/core/infinitePaginationPage'; -import { FolderModel } from '../../models/ACS/folderModel'; +import { BreadCrumbDropdownPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page'; +import { BreadCrumbPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb.page'; +import { InfinitePaginationPage } from '../../pages/adf/core/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 204bc70931..560418c41e 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; import moment from 'moment-es6'; describe('Document List Component', () => { 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 2c6655951f..0abbec9b64 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 @@ -23,11 +23,11 @@ import { ContentNodeSelectorDialogPage, NotificationHistoryPage, BrowserActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; describe('Document List Component', () => { 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 4f5c54b24f..b48e70b9dc 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/e2e/content-services/document-list/document-list-gallery.e2e.ts @@ -15,13 +15,13 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { FileModel } from '../../models/ACS/file.model'; +import { NavigationBarPage } from '../../pages/adf/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 895fbb3997..993d69236c 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage, UploadActions, PaginationPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FolderModel } from '../../models/ACS/folderModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FolderModel } from '../../models/ACS/folder.model'; import { Util } from '../../util/util'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; 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 5411c0ffd2..ddcff9008e 100644 --- a/e2e/content-services/document-list/document-list-permissions.e2e.ts +++ b/e2e/content-services/document-list/document-list-permissions.e2e.ts @@ -16,9 +16,9 @@ */ import { browser } from 'protractor'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { LoginPage, ErrorPage, StringUtil, BrowserActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; 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 d90885624a..00678d9500 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/e2e/content-services/document-list/document-list-properties.e2e.ts @@ -16,13 +16,13 @@ */ import { LoginPage, UploadActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { DropActions } from '../../actions/drop.actions'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; describe('Document List Component - Properties', () => { 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 df18f0858a..a92c1a62ce 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,13 +15,13 @@ * limitations under the License. */ -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { FileModel } from '../../models/ACS/file.model'; +import { NavigationBarPage } from '../../pages/adf/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 88e4df6d69..564c03ff61 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -16,11 +16,11 @@ */ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { LockFilePage } from '../pages/adf/lockFilePage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; +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 { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index 70afe4cd0f..cbed96c0cd 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -16,13 +16,13 @@ */ import { LoginPage, UploadActions, LocalStorageUtil, ViewerPage } from '@alfresco/adf-testing'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { check } from '../../util/material'; 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 35f5bed6c5..0d28d15bee 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; 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 1934dae5e3..f81cb7051c 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -16,14 +16,14 @@ */ import { LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { check, uncheck } from '../../util/material'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../pages/adf/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 1f362ea176..9f17d84d65 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -16,14 +16,14 @@ */ import { LoginPage, LocalStorageUtil, BrowserActions, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import moment = require('moment'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Metadata component', () => { diff --git a/e2e/content-services/notifications-component.e2e.ts b/e2e/content-services/notifications-component.e2e.ts index e7dc193ebd..547318d4b7 100644 --- a/e2e/content-services/notifications-component.e2e.ts +++ b/e2e/content-services/notifications-component.e2e.ts @@ -16,11 +16,11 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NotificationPage } from '../pages/adf/notificationPage'; +import { NotificationPage } from '../pages/adf/notification.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('Notifications Component', () => { diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 5e53a8ee7b..bf095a316d 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -15,17 +15,17 @@ * limitations under the License. */ -import { PermissionsPage } from '../../pages/adf/permissionsPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { PermissionsPage } from '../../pages/adf/permissions.page'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { FolderModel } from '../../models/ACS/folderModel'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; +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'; describe('Permissions Component', () => { @@ -43,7 +43,7 @@ describe('Permissions Component', () => { const viewerPage = new ViewerPage(); const metadataViewPage = new MetadataViewPage(); const notificationHistoryPage = new NotificationHistoryPage(); - const uploadDialog = new UploadDialog(); + const uploadDialog = new UploadDialogPage(); let fileOwnerUser, filePermissionUser, file; const fileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index 878b7f53c4..262ce6743c 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -15,17 +15,17 @@ * limitations under the License. */ -import { PermissionsPage } from '../../pages/adf/permissionsPage'; +import { PermissionsPage } from '../../pages/adf/permissions.page'; import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +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'; describe('Permissions Component', () => { @@ -44,7 +44,7 @@ describe('Permissions Component', () => { const navigationBarPage = new NavigationBarPage(); const metadataViewPage = new MetadataViewPage(); const notificationHistoryPage = new NotificationHistoryPage(); - const uploadDialog = new UploadDialog(); + const uploadDialog = new UploadDialogPage(); let folderOwnerUser, consumerUser, siteConsumerUser, contributorUser, managerUser, collaboratorUser; diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index 9513a65dbf..e167ba890c 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -23,11 +23,11 @@ import { UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -40,7 +40,7 @@ describe('Share file', () => { const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); const contentListPage = contentServicesPage.getDocumentList(); - const shareDialog = new ShareDialog(); + const shareDialog = new ShareDialogPage(); const navigationBarPage = new NavigationBarPage(); const viewerPage = new ViewerPage(); const notificationHistoryPage = new NotificationHistoryPage(); diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index ad12024c05..2bab3d1ea8 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -24,11 +24,11 @@ import { ErrorPage, UploadActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -46,7 +46,7 @@ describe('Unshare file', () => { const notificationHistoryPage = new NotificationHistoryPage(); const navigationBarPage = new NavigationBarPage(); - const shareDialog = new ShareDialog(); + const shareDialog = new ShareDialogPage(); const siteName = `PRIVATE-TEST-SITE-${StringUtil.generateRandomString(5)}`; const acsUser = new AcsUserModel(); const uploadActions = new UploadActions(this.alfrescoJsApi); diff --git a/e2e/content-services/social/social.component.e2e.ts b/e2e/content-services/social/social.component.e2e.ts index 01bad15221..1599c9581c 100644 --- a/e2e/content-services/social/social.component.e2e.ts +++ b/e2e/content-services/social/social.component.e2e.ts @@ -17,10 +17,10 @@ import { LoginPage, LikePage, RatePage, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { SocialPage } from '../../pages/adf/demo-shell/socialPage'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +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 { 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 f553fc139e..19fe8d855b 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/contentServicesPage'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { ApiService, LoginSSOPage, @@ -29,7 +29,7 @@ import { FileBrowserUtil, ViewerPage } from '@alfresco/adf-testing'; -import { FileModel } from '../../models/ACS/fileModel'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList, implicitFlow true', () => { diff --git a/e2e/content-services/tag-component.e2e.ts b/e2e/content-services/tag-component.e2e.ts index defd9807e9..bea20a5d50 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/e2e/content-services/tag-component.e2e.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { TagPage } from '../pages/adf/tagPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TagPage } from '../pages/adf/tag.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index 0a3e9c146e..821c91b58f 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -18,10 +18,10 @@ import { LoginPage, PaginationPage, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FolderModel } from '../models/ACS/folderModel'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TrashcanPage } from '../pages/adf/trashcanPage'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FolderModel } from '../models/ACS/folder.model'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TrashcanPage } from '../pages/adf/trashcan.page'; import { Util } from '../util/util'; describe('Trashcan - Pagination', () => { diff --git a/e2e/content-services/tree-view-component.e2e.ts b/e2e/content-services/tree-view-component.e2e.ts index 7b91d2f7b9..d4e574a249 100644 --- a/e2e/content-services/tree-view-component.e2e.ts +++ b/e2e/content-services/tree-view-component.e2e.ts @@ -16,9 +16,9 @@ */ import { LoginPage, UploadActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TreeViewPage } from '../pages/adf/content-services/treeViewPage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TreeViewPage } from '../pages/adf/content-services/tree-view.page'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index 61d59db12d..429925c541 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/e2e/content-services/upload/cancel-upload.e2e.ts @@ -17,11 +17,11 @@ import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Upload component', async () => { @@ -31,8 +31,8 @@ describe('Upload component', async () => { hostEcm: browser.params.testConfig.adf_acs.host }); const contentServicesPage = new ContentServicesPage(); - const uploadDialog = new UploadDialog(); - const uploadToggles = new UploadToggles(); + const uploadDialog = new UploadDialogPage(); + const uploadToggles = new UploadTogglesPage(); const loginPage = new LoginPage(); const acsUser = new AcsUserModel(); @@ -56,7 +56,7 @@ describe('Upload component', async () => { }); it('[C272792] Should be possible to cancel upload of a big file using row cancel icon', async () => { - await browser.executeScript('setTimeout(() => {document.querySelector("div[data-automation-id=\'cancel-upload-progress\']").click();}, 750)'); + await browser.executeScript('setTimeout(() => {document.querySelector("div[data-automation-id=\'cancel-upload-progress\']").click();}, 1500)'); await contentServicesPage.uploadFile(largeFile.location); @@ -68,7 +68,7 @@ describe('Upload component', async () => { it('[C287790] Should be possible to cancel upload of a big file through the cancel uploads button', async () => { await browser.executeScript(' setTimeout(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' + - 'document.querySelector("#adf-upload-dialog-cancel").click(); }, 750)'); + 'document.querySelector("#adf-upload-dialog-cancel").click(); }, 1500)'); await contentServicesPage.uploadFile(largeFile.location); await expect(await uploadDialog.getTitleText()).toEqual('Upload canceled'); await uploadDialog.clickOnCloseButton(); @@ -79,7 +79,7 @@ describe('Upload component', async () => { it('[C272793] Should be able to cancel multiple files upload', async () => { await uploadToggles.enableMultipleFileUpload(); await browser.executeScript(' setTimeout(() => {document.querySelector("#adf-upload-dialog-cancel-all").click();' + - 'document.querySelector("#adf-upload-dialog-cancel").click(); }, 750)'); + 'document.querySelector("#adf-upload-dialog-cancel").click(); }, 1500)'); await contentServicesPage.uploadMultipleFile([pngFileModel.location, largeFile.location]); await expect(await uploadDialog.getTitleText()).toEqual('Upload canceled'); @@ -92,7 +92,7 @@ describe('Upload component', async () => { it('[C315257] Should be able to cancel file in upload queue', async () => { await uploadToggles.enableMultipleFileUpload(); - await browser.executeScript('setTimeout(() => {document.querySelector("button[data-automation-id=\'cancel-upload-queue\']").click();}, 750)'); + await browser.executeScript('setTimeout(() => {document.querySelector("button[data-automation-id=\'cancel-upload-queue\']").click();}, 1500)'); await contentServicesPage.uploadMultipleFile([largeFile.location, pngFileModel.location]); await uploadDialog.fileIsCancelled(pngFileModel.name); await uploadDialog.clickOnCloseButton(); diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index f58f4bb9de..e0ef76c73f 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -17,20 +17,20 @@ import { element, by, browser } from 'protractor'; import { LoginPage, LocalStorageUtil } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { DropActions } from '../../actions/drop.actions'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Upload component - Excluded Files', () => { const contentServicesPage = new ContentServicesPage(); - const uploadDialog = new UploadDialog(); - const uploadToggles = new UploadToggles(); + const uploadDialog = new UploadDialogPage(); + const uploadToggles = new UploadTogglesPage(); const loginPage = new LoginPage(); const acsUser = new AcsUserModel(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index 2892dd9261..f0b5309d21 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/e2e/content-services/upload/upload-dialog.e2e.ts @@ -16,20 +16,20 @@ */ import { BrowserActions, LoginPage, UploadActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { VersionManagePage } from '../../pages/adf/versionManagerPage'; +import { VersionManagePage } from '../../pages/adf/version-manager.page'; describe('Upload component', () => { const contentServicesPage = new ContentServicesPage(); - const uploadDialog = new UploadDialog(); - const uploadToggles = new UploadToggles(); + const uploadDialog = new UploadDialogPage(); + const uploadToggles = new UploadTogglesPage(); const loginPage = new LoginPage(); const acsUser = new AcsUserModel(); const versionManagePage = new VersionManagePage(); diff --git a/e2e/content-services/upload/upload-dialog.ts b/e2e/content-services/upload/upload-dialog.ts index 0e08d5e103..9ceed7b125 100644 --- a/e2e/content-services/upload/upload-dialog.ts +++ b/e2e/content-services/upload/upload-dialog.ts @@ -16,21 +16,21 @@ */ import { BrowserActions, LoginPage, UploadActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { VersionManagePage } from '../../pages/adf/versionManagerPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Upload component', () => { const contentServicesPage = new ContentServicesPage(); - const uploadDialog = new UploadDialog(); - const uploadToggles = new UploadToggles(); + const uploadDialog = new UploadDialogPage(); + const uploadToggles = new UploadTogglesPage(); const loginPage = new LoginPage(); const acsUser = new AcsUserModel(); const versionManagePage = new VersionManagePage(); diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index 80f9a8f0e5..cc2916e3f5 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -18,20 +18,20 @@ import { element, by, browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { DropActions } from '../../actions/drop.actions'; describe('Upload component', () => { const contentServicesPage = new ContentServicesPage(); - const uploadDialog = new UploadDialog(); - const uploadToggles = new UploadToggles(); + const uploadDialog = new UploadDialogPage(); + const uploadToggles = new UploadTogglesPage(); const loginPage = new LoginPage(); const acsUser = new AcsUserModel(); this.alfrescoJsApi = new AlfrescoApi({ diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index 30c627b5b1..958a0cc64c 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -17,18 +17,18 @@ import { browser } from 'protractor'; import { StringUtil, LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import CONSTANTS = require('../../util/constants'); describe('Upload - User permission', () => { const contentServicesPage = new ContentServicesPage(); - const uploadDialog = new UploadDialog(); + const uploadDialog = new UploadDialogPage(); const loginPage = new LoginPage(); let acsUser; let acsUserTwo; diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index 2d44604ec6..41164ebab6 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -18,12 +18,12 @@ import { BrowserActions, BrowserVisibility, FileBrowserUtil, LoginPage, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, by, element } from 'protractor'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { VersionManagePage } from '../../pages/adf/versionManagerPage'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +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'; describe('Version component actions', () => { @@ -31,7 +31,7 @@ describe('Version component actions', () => { const contentServicesPage = new ContentServicesPage(); const versionManagePage = new VersionManagePage(); const navigationBarPage = new NavigationBarPage(); - const uploadDialog = new UploadDialog(); + const uploadDialog = new UploadDialogPage(); const acsUser = new AcsUserModel(); diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index 36399ac751..180c0db02a 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -17,12 +17,12 @@ import { element, by, browser } from 'protractor'; import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { VersionManagePage } from '../../pages/adf/versionManagerPage'; -import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { 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 { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NodeActions } from '../../actions/ACS/node.actions'; import CONSTANTS = require('../../util/constants'); @@ -32,7 +32,7 @@ describe('Version component permissions', () => { const loginPage = new LoginPage(); const versionManagePage = new VersionManagePage(); const navigationBarPage = new NavigationBarPage(); - const uploadDialog = new UploadDialog(); + const uploadDialog = new UploadDialogPage(); const notificationHistoryPage = new NotificationHistoryPage(); const contentServices = new ContentServicesPage(); let site; diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index d3cf675069..ce715f6c14 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -17,12 +17,12 @@ import { by, element, browser } from 'protractor'; import { LoginPage, UploadActions, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { VersionManagePage } from '../../pages/adf/versionManagerPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/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 977580283e..dc56b496b9 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -17,12 +17,12 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { VersionManagePage } from '../../pages/adf/versionManagerPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { VersionManagePage } from '../../pages/adf/version-manager.page'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Version component', () => { diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts index fda813fc4f..1d483e10b6 100644 --- a/e2e/core/card-view/card-view-component.e2e.ts +++ b/e2e/core/card-view/card-view-component.e2e.ts @@ -17,9 +17,9 @@ import { BrowserVisibility, LoginPage } from '@alfresco/adf-testing'; import { browser, by, element } from 'protractor'; -import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { CardViewComponentPage } from '../../pages/adf/card-view-component.page'; +import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('CardView Component', () => { const loginPage = new LoginPage(); diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index 2e20c6c446..2f45a7fd7e 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/e2e/core/datatable/data-table-component-selection.e2e.ts @@ -18,9 +18,9 @@ import { DataTableComponentPage, LoginPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page'; +import { NavigationBarPage } from '../../pages/adf/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 1c73a3bcfa..6d6070e276 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -19,10 +19,10 @@ import { LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { DropActions } from '../../actions/drop.actions'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; -import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +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'; describe('Datatable component', () => { diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index 9748ff413c..9bf09e3366 100644 --- a/e2e/core/error-component.e2e.ts +++ b/e2e/core/error-component.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage, ErrorPage, BrowserActions } from '@alfresco/adf-testing'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('Error Component', () => { diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 3f4301dfc9..7ded2368e0 100644 --- a/e2e/core/header-component.e2e.ts +++ b/e2e/core/header-component.e2e.ts @@ -18,7 +18,7 @@ import { HeaderPage, LoginPage, SettingsPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('Header Component', () => { diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts index 2cff2144fc..d5217ced9a 100644 --- a/e2e/core/icons-component.e2e.ts +++ b/e2e/core/icons-component.e2e.ts @@ -16,9 +16,9 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { IconsPage } from '../pages/adf/iconsPage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { IconsPage } from '../pages/adf/icons.page'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index f222add806..672a01d3e8 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/e2e/core/infinite-scrolling.e2e.ts @@ -18,11 +18,11 @@ import { LocalStorageUtil, LoginPage, UploadActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FolderModel } from '../models/ACS/folderModel'; -import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { InfinitePaginationPage } from '../pages/adf/core/infinitePaginationPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +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 { Util } from '../util/util'; describe('Enable infinite scrolling', () => { diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index 97752978e6..d2176eaaa1 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -18,10 +18,10 @@ import { BrowserActions, ErrorPage, LoginPage, SettingsPage, UserInfoPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +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 { Util } from '../../util/util'; 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 2d7a367680..14fde00187 100644 --- a/e2e/core/login/login-sso/login-sso.e2e.ts +++ b/e2e/core/login/login-sso/login-sso.e2e.ts @@ -17,7 +17,7 @@ import { LoginSSOPage, SettingsPage, LoginPage, BrowserVisibility } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../../pages/adf/navigation-bar.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 5cddbe0ddf..8aa9c8920b 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 { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; describe('Logout component - SSO', () => { diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index 1e00ff1ece..03db134e31 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -18,12 +18,12 @@ import { browser } from 'protractor'; import { LoginPage, SettingsPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +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 { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { LogoutPage } from '../../pages/adf/demo-shell/logoutPage'; +import { LogoutPage } from '../../pages/adf/demo-shell/logout.page'; describe('Login component - Redirect', () => { diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 4083dd6e03..6b5a94cabc 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -18,10 +18,10 @@ import { LoginPage, PaginationPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; -import { FolderModel } from '../models/ACS/folderModel'; -import { ContentServicesPage } from '../pages/adf/contentServicesPage'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; +import { FolderModel } from '../models/ACS/folder.model'; +import { ContentServicesPage } from '../pages/adf/content-services.page'; import { Util } from '../util/util'; 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 78a02f3df2..1761df638b 100644 --- a/e2e/core/settings-component.e2e.ts +++ b/e2e/core/settings-component.e2e.ts @@ -17,10 +17,10 @@ import { BrowserActions, LoginPage, SettingsPage } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +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'; describe('Settings component', () => { diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index a72f88198f..2abe02ae55 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -19,9 +19,9 @@ import { LoginPage, UserInfoPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { UsersActions } from '../actions/users.actions'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import PeopleAPI = require('../restAPI/ACS/PeopleAPI'); describe('User Info component', () => { 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 b87a758197..897c8db0f5 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts @@ -17,12 +17,12 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; 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 d678005c70..e62540d406 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -17,13 +17,13 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FileModel } from '../../..//models/ACS/fileModel'; -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FileModel } from '../../../models/ACS/file.model'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../..//pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; 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 7c1937572d..9795a568cd 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -17,10 +17,10 @@ import { browser } from 'protractor'; import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Viewer', () => { 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 b3de28109f..680fc06193 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -17,10 +17,10 @@ import { browser } from 'protractor'; import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Viewer', () => { 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 929f057289..f327c91844 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; 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 5b4f2c01b2..85788478ca 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -17,10 +17,10 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Viewer', () => { 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 38f5155c48..8994d8157f 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -17,12 +17,12 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; +import { ContentServicesPage } from '../../../pages/adf/content-services.page'; import CONSTANTS = require('../../../util/constants'); -import { FolderModel } from '../../../models/ACS/folderModel'; -import { AcsUserModel } from '../../../models/ACS/acsUserModel'; +import { FolderModel } from '../../../models/ACS/folder.model'; +import { AcsUserModel } from '../../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; describe('Viewer', () => { diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index c022416637..61dd02edf7 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -17,11 +17,11 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; import CONSTANTS = require('../../util/constants'); -import { FileModel } from '../../models/ACS/fileModel'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { FileModel } from '../../models/ACS/file.model'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Info Drawer', () => { diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index 1ce389d70f..251ae5e9d5 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -17,11 +17,11 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { FileModel } from '../../models/ACS/fileModel'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { FileModel } from '../../models/ACS/file.model'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Content Services Viewer', () => { const acsUser = new AcsUserModel(); 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 7e49462a90..6643b306ec 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -17,11 +17,11 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { FileModel } from '../../models/ACS/fileModel'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { FileModel } from '../../models/ACS/file.model'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Viewer', () => { diff --git a/e2e/core/viewer/viewer-extension.e2e.ts b/e2e/core/viewer/viewer-extension.e2e.ts index 4f714a8832..5f0d88cdb1 100644 --- a/e2e/core/viewer/viewer-extension.e2e.ts +++ b/e2e/core/viewer/viewer-extension.e2e.ts @@ -17,12 +17,12 @@ import { browser } from 'protractor'; import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monaco-extension.page'; import CONSTANTS = require('../../util/constants'); -import { FileModel } from '../../models/ACS/fileModel'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { FileModel } from '../../models/ACS/file.model'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Viewer', () => { diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index f85e1ecbae..908380350f 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -17,10 +17,10 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, DataTableComponentPage, ViewerPage } from '@alfresco/adf-testing'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { FileModel } from '../../models/ACS/fileModel'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { ContentServicesPage } from '../../pages/adf/content-services.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { FileModel } from '../../models/ACS/file.model'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Viewer - properties', () => { diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index c7271351ad..3bf18e33fa 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -16,12 +16,12 @@ */ import { LoginPage, UploadActions, StringUtil, BrowserActions, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; +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 CONSTANTS = require('../../util/constants'); -import { FileModel } from '../../models/ACS/fileModel'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { FileModel } from '../../models/ACS/file.model'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -40,7 +40,7 @@ describe('Viewer', () => { const acsUser = new AcsUserModel(); let pngFileUploaded; const contentList = contentServicesPage.getDocumentList(); - const shareDialog = new ShareDialog(); + const shareDialog = new ShareDialogPage(); const pngFileInfo = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name, diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index 6abbd4160a..00784e326e 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { AnalyticsPage } from '../pages/adf/process-services/analyticsPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; +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 { browser } from 'protractor'; import { Tenant } from '../models/APS/tenant'; import { User } from '../models/APS/user'; diff --git a/e2e/models/ACS/acsUserModel.ts b/e2e/models/ACS/acs-user.model.ts similarity index 100% rename from e2e/models/ACS/acsUserModel.ts rename to e2e/models/ACS/acs-user.model.ts diff --git a/e2e/models/ACS/createdByModel.ts b/e2e/models/ACS/created-by-model.ts similarity index 100% rename from e2e/models/ACS/createdByModel.ts rename to e2e/models/ACS/created-by-model.ts diff --git a/e2e/models/ACS/fileModel.ts b/e2e/models/ACS/file.model.ts similarity index 98% rename from e2e/models/ACS/fileModel.ts rename to e2e/models/ACS/file.model.ts index aad8e08330..1592467ea1 100644 --- a/e2e/models/ACS/fileModel.ts +++ b/e2e/models/ACS/file.model.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import ContentModel = require('./contentModel'); import ContentPropertiesModel = require('./contentProperties'); -import { CreatedByModel } from './createdByModel'; +import { CreatedByModel } from './created-by-model'; import { StringUtil } from '@alfresco/adf-testing'; export class FileModel { diff --git a/e2e/models/ACS/folderModel.ts b/e2e/models/ACS/folder.model.ts similarity index 100% rename from e2e/models/ACS/folderModel.ts rename to e2e/models/ACS/folder.model.ts diff --git a/e2e/models/APS/standaloneTask.ts b/e2e/models/APS/standalone-task.ts similarity index 100% rename from e2e/models/APS/standaloneTask.ts rename to e2e/models/APS/standalone-task.ts diff --git a/e2e/pages/adf/cardViewComponentPage.ts b/e2e/pages/adf/card-view-component.page.ts similarity index 100% rename from e2e/pages/adf/cardViewComponentPage.ts rename to e2e/pages/adf/card-view-component.page.ts diff --git a/e2e/pages/adf/commentsPage.ts b/e2e/pages/adf/comments.page.ts similarity index 100% rename from e2e/pages/adf/commentsPage.ts rename to e2e/pages/adf/comments.page.ts diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/content-services.page.ts similarity index 98% rename from e2e/pages/adf/contentServicesPage.ts rename to e2e/pages/adf/content-services.page.ts index 04c92c686a..af5d8e6462 100644 --- a/e2e/pages/adf/contentServicesPage.ts +++ b/e2e/pages/adf/content-services.page.ts @@ -18,9 +18,9 @@ import { BrowserActions, BrowserVisibility, DateUtil, DocumentListPage, FormControllersPage } from '@alfresco/adf-testing'; import { $$, browser, by, element, ElementFinder, protractor } from 'protractor'; import { DropActions } from '../../actions/drop.actions'; -import { CreateLibraryDialog } from './dialog/createLibraryDialog'; -import { FolderDialog } from './dialog/folderDialog'; -import { NavigationBarPage } from './navigationBarPage'; +import { CreateLibraryDialogPage } from './dialog/create-library-dialog.page'; +import { FolderDialogPage } from './dialog/folder-dialog.page'; +import { NavigationBarPage } from './navigation-bar.page'; import path = require('path'); @@ -36,8 +36,8 @@ export class ContentServicesPage { contentList: DocumentListPage = new DocumentListPage(element.all(by.css('adf-upload-drag-area adf-document-list')).first()); formControllersPage: FormControllersPage = new FormControllersPage(); - createFolderDialog: FolderDialog = new FolderDialog(); - createLibraryDialog: CreateLibraryDialog = new CreateLibraryDialog(); + createFolderDialog: FolderDialogPage = new FolderDialogPage(); + createLibraryDialog: CreateLibraryDialogPage = new CreateLibraryDialogPage(); dragAndDropAction: DropActions = new DropActions(); multipleFileUploadToggle: ElementFinder = element(by.id('adf-document-list-enable-drop-files')); diff --git a/e2e/pages/adf/content-services/breadcrumb/breadCrumbDropdownPage.ts b/e2e/pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page.ts similarity index 100% rename from e2e/pages/adf/content-services/breadcrumb/breadCrumbDropdownPage.ts rename to e2e/pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page.ts diff --git a/e2e/pages/adf/content-services/breadcrumb/breadCrumbPage.ts b/e2e/pages/adf/content-services/breadcrumb/bread-crumb.page.ts similarity index 100% rename from e2e/pages/adf/content-services/breadcrumb/breadCrumbPage.ts rename to e2e/pages/adf/content-services/breadcrumb/bread-crumb.page.ts diff --git a/e2e/pages/adf/content-services/treeViewPage.ts b/e2e/pages/adf/content-services/tree-view.page.ts similarity index 100% rename from e2e/pages/adf/content-services/treeViewPage.ts rename to e2e/pages/adf/content-services/tree-view.page.ts diff --git a/e2e/pages/adf/core/headerPage.ts b/e2e/pages/adf/core/header.page.ts similarity index 100% rename from e2e/pages/adf/core/headerPage.ts rename to e2e/pages/adf/core/header.page.ts diff --git a/e2e/pages/adf/core/infinitePaginationPage.ts b/e2e/pages/adf/core/infinite-pagination.page.ts similarity index 100% rename from e2e/pages/adf/core/infinitePaginationPage.ts rename to e2e/pages/adf/core/infinite-pagination.page.ts diff --git a/e2e/pages/adf/demo-shell/customSourcesPage.ts b/e2e/pages/adf/demo-shell/custom-sources.page.ts similarity index 97% rename from e2e/pages/adf/demo-shell/customSourcesPage.ts rename to e2e/pages/adf/demo-shell/custom-sources.page.ts index bc9542fadb..b16f81364c 100644 --- a/e2e/pages/adf/demo-shell/customSourcesPage.ts +++ b/e2e/pages/adf/demo-shell/custom-sources.page.ts @@ -17,7 +17,7 @@ import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing'; import { by, element, ElementFinder } from 'protractor'; -import { NavigationBarPage } from '../navigationBarPage'; +import { NavigationBarPage } from '../navigation-bar.page'; const source = { favorites: 'Favorites', diff --git a/e2e/pages/adf/demo-shell/dataTablePage.ts b/e2e/pages/adf/demo-shell/data-table.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/dataTablePage.ts rename to e2e/pages/adf/demo-shell/data-table.page.ts diff --git a/e2e/pages/adf/demo-shell/logoutPage.ts b/e2e/pages/adf/demo-shell/logout.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/logoutPage.ts rename to e2e/pages/adf/demo-shell/logout.page.ts diff --git a/e2e/pages/adf/demo-shell/monacoExtensionPage.ts b/e2e/pages/adf/demo-shell/monaco-extension.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/monacoExtensionPage.ts rename to e2e/pages/adf/demo-shell/monaco-extension.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services-cloud/process-details-cloud-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/formDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/form-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/formDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services/form-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage.ts b/e2e/pages/adf/demo-shell/process-services/people-group-cloud-component.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage.ts rename to e2e/pages/adf/demo-shell/process-services/people-group-cloud-component.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/process-cloud-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services/process-cloud-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/process-list-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services/process-list-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/task-filters-demo.page.ts similarity index 96% rename from e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services/task-filters-demo.page.ts index 0ee1386090..2512fa260f 100644 --- a/e2e/pages/adf/demo-shell/process-services/taskFiltersDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/task-filters-demo.page.ts @@ -17,7 +17,7 @@ import { BrowserActions } from '@alfresco/adf-testing'; import { element, by, ElementFinder } from 'protractor'; -import { TaskFiltersPage } from '../../process-services/taskFiltersPage'; +import { TaskFiltersPage } from '../../process-services/task-filters.page'; export class TaskFiltersDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/task-list-demo.page.ts similarity index 98% rename from e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services/task-list-demo.page.ts index 38eeb726ed..44e899fa32 100644 --- a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/task-list-demo.page.ts @@ -17,7 +17,7 @@ import { BrowserActions, BrowserVisibility, PaginationPage } from '@alfresco/adf-testing'; import { by, element, ElementFinder } from 'protractor'; -import { TasksListPage } from '../../process-services/tasksListPage'; +import { TasksListPage } from '../../process-services/tasks-list.page'; export class TaskListDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/tasks-cloud-demo.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/process-services/tasksCloudDemoPage.ts rename to e2e/pages/adf/demo-shell/process-services/tasks-cloud-demo.page.ts diff --git a/e2e/pages/adf/demo-shell/socialPage.ts b/e2e/pages/adf/demo-shell/social.page.ts similarity index 100% rename from e2e/pages/adf/demo-shell/socialPage.ts rename to e2e/pages/adf/demo-shell/social.page.ts diff --git a/e2e/pages/adf/dialog/createLibraryDialog.ts b/e2e/pages/adf/dialog/create-library-dialog.page.ts similarity index 99% rename from e2e/pages/adf/dialog/createLibraryDialog.ts rename to e2e/pages/adf/dialog/create-library-dialog.page.ts index 369e081198..d48db48bc8 100644 --- a/e2e/pages/adf/dialog/createLibraryDialog.ts +++ b/e2e/pages/adf/dialog/create-library-dialog.page.ts @@ -18,7 +18,7 @@ import { by, element, browser, protractor, ElementFinder, ElementArrayFinder } from 'protractor'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -export class CreateLibraryDialog { +export class CreateLibraryDialogPage { libraryDialog: ElementFinder = element(by.css('[role="dialog"]')); libraryTitle: ElementFinder = element(by.css('.adf-library-dialog>h2')); libraryNameField: ElementFinder = element(by.css('input[formcontrolname="title"]')); diff --git a/e2e/pages/adf/dialog/folderDialog.ts b/e2e/pages/adf/dialog/folder-dialog.page.ts similarity index 99% rename from e2e/pages/adf/dialog/folderDialog.ts rename to e2e/pages/adf/dialog/folder-dialog.page.ts index 22d05915f4..a90a5f7cb0 100644 --- a/e2e/pages/adf/dialog/folderDialog.ts +++ b/e2e/pages/adf/dialog/folder-dialog.page.ts @@ -18,7 +18,7 @@ import { by, element, ElementFinder } from 'protractor'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -export class FolderDialog { +export class FolderDialogPage { folderDialog: ElementFinder = element(by.css('adf-folder-dialog')); folderNameField: ElementFinder = this.folderDialog.element(by.id('adf-folder-name-input')); folderDescriptionField: ElementFinder = this.folderDialog.element(by.id('adf-folder-description-input')); diff --git a/e2e/pages/adf/dialog/searchDialog.ts b/e2e/pages/adf/dialog/search-dialog.page.ts similarity index 99% rename from e2e/pages/adf/dialog/searchDialog.ts rename to e2e/pages/adf/dialog/search-dialog.page.ts index 0e3fc1ee0b..260573d92b 100644 --- a/e2e/pages/adf/dialog/searchDialog.ts +++ b/e2e/pages/adf/dialog/search-dialog.page.ts @@ -18,7 +18,7 @@ import { browser, by, element, ElementFinder, Locator, protractor } from 'protractor'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -export class SearchDialog { +export class SearchDialogPage { searchIcon: ElementFinder = element(by.css(`button[class*='adf-search-button']`)); searchBar: ElementFinder = element(by.css(`adf-search-control input`)); diff --git a/e2e/pages/adf/dialog/shareDialog.ts b/e2e/pages/adf/dialog/share-dialog.page.ts similarity index 99% rename from e2e/pages/adf/dialog/shareDialog.ts rename to e2e/pages/adf/dialog/share-dialog.page.ts index c3ca548af8..5bc7d3d8c3 100644 --- a/e2e/pages/adf/dialog/shareDialog.ts +++ b/e2e/pages/adf/dialog/share-dialog.page.ts @@ -19,7 +19,7 @@ import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility, FormControllersPage, BrowserActions } from '@alfresco/adf-testing'; import moment = require('moment'); -export class ShareDialog { +export class ShareDialogPage { formControllersPage = new FormControllersPage(); shareDialog: ElementFinder = element(by.css('adf-share-dialog')); diff --git a/e2e/pages/adf/dialog/uploadDialog.ts b/e2e/pages/adf/dialog/upload-dialog.page.ts similarity index 99% rename from e2e/pages/adf/dialog/uploadDialog.ts rename to e2e/pages/adf/dialog/upload-dialog.page.ts index 5d26e5a8a5..3531c61082 100644 --- a/e2e/pages/adf/dialog/uploadDialog.ts +++ b/e2e/pages/adf/dialog/upload-dialog.page.ts @@ -18,7 +18,7 @@ import { element, by, browser, ElementFinder, Locator } from 'protractor'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -export class UploadDialog { +export class UploadDialogPage { closeButton: ElementFinder = element((by.css('footer[class*="upload-dialog__actions"] button[id="adf-upload-dialog-close"]'))); dialog: ElementFinder = element(by.css('div[id="upload-dialog"]')); diff --git a/e2e/pages/adf/dialog/uploadToggles.ts b/e2e/pages/adf/dialog/upload-toggles.page.ts similarity index 99% rename from e2e/pages/adf/dialog/uploadToggles.ts rename to e2e/pages/adf/dialog/upload-toggles.page.ts index d5b420cdfc..68125762c0 100644 --- a/e2e/pages/adf/dialog/uploadToggles.ts +++ b/e2e/pages/adf/dialog/upload-toggles.page.ts @@ -18,7 +18,7 @@ import { browser, by, element, ElementFinder } from 'protractor'; import { BrowserActions, BrowserVisibility, FormControllersPage } from '@alfresco/adf-testing'; -export class UploadToggles { +export class UploadTogglesPage { formControllersPage: FormControllersPage = new FormControllersPage(); multipleFileUploadToggle: ElementFinder = element(by.id('adf-multiple-upload-switch')); diff --git a/e2e/pages/adf/iconsPage.ts b/e2e/pages/adf/icons.page.ts similarity index 100% rename from e2e/pages/adf/iconsPage.ts rename to e2e/pages/adf/icons.page.ts diff --git a/e2e/pages/adf/lockFilePage.ts b/e2e/pages/adf/lock-file.page.ts similarity index 100% rename from e2e/pages/adf/lockFilePage.ts rename to e2e/pages/adf/lock-file.page.ts diff --git a/e2e/pages/adf/metadataViewPage.ts b/e2e/pages/adf/metadata-view.page.ts similarity index 100% rename from e2e/pages/adf/metadataViewPage.ts rename to e2e/pages/adf/metadata-view.page.ts diff --git a/e2e/pages/adf/navigationBarPage.ts b/e2e/pages/adf/navigation-bar.page.ts similarity index 98% rename from e2e/pages/adf/navigationBarPage.ts rename to e2e/pages/adf/navigation-bar.page.ts index 1b77e5d112..7ba51b0784 100644 --- a/e2e/pages/adf/navigationBarPage.ts +++ b/e2e/pages/adf/navigation-bar.page.ts @@ -17,8 +17,8 @@ import { AppListCloudPage, BrowserActions, BrowserVisibility } from '@alfresco/adf-testing'; import { browser, by, element, ElementFinder } from 'protractor'; -import { PeopleGroupCloudComponentPage } from './demo-shell/process-services/peopleGroupCloudComponentPage'; -import { ProcessServicesPage } from './process-services/processServicesPage'; +import { PeopleGroupCloudComponentPage } from './demo-shell/process-services/people-group-cloud-component.page'; +import { ProcessServicesPage } from './process-services/process-services.page'; export class NavigationBarPage { diff --git a/e2e/pages/adf/notificationPage.ts b/e2e/pages/adf/notification.page.ts similarity index 100% rename from e2e/pages/adf/notificationPage.ts rename to e2e/pages/adf/notification.page.ts diff --git a/e2e/pages/adf/permissionsPage.ts b/e2e/pages/adf/permissions.page.ts similarity index 100% rename from e2e/pages/adf/permissionsPage.ts rename to e2e/pages/adf/permissions.page.ts diff --git a/e2e/pages/adf/process-services/analyticsPage.ts b/e2e/pages/adf/process-services/analytics.page.ts similarity index 100% rename from e2e/pages/adf/process-services/analyticsPage.ts rename to e2e/pages/adf/process-services/analytics.page.ts diff --git a/e2e/pages/adf/process-services/attachFormPage.ts b/e2e/pages/adf/process-services/attach-form.page.ts similarity index 100% rename from e2e/pages/adf/process-services/attachFormPage.ts rename to e2e/pages/adf/process-services/attach-form.page.ts diff --git a/e2e/pages/adf/process-services/attachmentListPage.ts b/e2e/pages/adf/process-services/attachment-list.page.ts similarity index 100% rename from e2e/pages/adf/process-services/attachmentListPage.ts rename to e2e/pages/adf/process-services/attachment-list.page.ts diff --git a/e2e/pages/adf/process-services/dialog/appSettingsToggles.ts b/e2e/pages/adf/process-services/dialog/app-settings-toggles.page.ts similarity index 97% rename from e2e/pages/adf/process-services/dialog/appSettingsToggles.ts rename to e2e/pages/adf/process-services/dialog/app-settings-toggles.page.ts index 69ec4d1aad..b7cd59bb41 100644 --- a/e2e/pages/adf/process-services/dialog/appSettingsToggles.ts +++ b/e2e/pages/adf/process-services/dialog/app-settings-toggles.page.ts @@ -18,7 +18,7 @@ import { FormControllersPage } from '@alfresco/adf-testing'; import { element, by, ElementFinder } from 'protractor'; -export class AppSettingsToggles { +export class AppSettingsTogglesPage { formControllersPage: FormControllersPage = new FormControllersPage(); diff --git a/e2e/pages/adf/process-services/dialog/createChecklistDialog.ts b/e2e/pages/adf/process-services/dialog/create-checklist-dialog.page.ts similarity index 100% rename from e2e/pages/adf/process-services/dialog/createChecklistDialog.ts rename to e2e/pages/adf/process-services/dialog/create-checklist-dialog.page.ts diff --git a/e2e/pages/adf/process-services/dialog/startTaskDialog.ts b/e2e/pages/adf/process-services/dialog/start-task-dialog.page.ts similarity index 99% rename from e2e/pages/adf/process-services/dialog/startTaskDialog.ts rename to e2e/pages/adf/process-services/dialog/start-task-dialog.page.ts index 732ab15150..9bacc1f190 100644 --- a/e2e/pages/adf/process-services/dialog/startTaskDialog.ts +++ b/e2e/pages/adf/process-services/dialog/start-task-dialog.page.ts @@ -18,7 +18,7 @@ import { element, by, Key, ElementFinder } from 'protractor'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -export class StartTaskDialog { +export class StartTaskDialogPage { name: ElementFinder = element(by.css('input[id="name_id"]')); dueDate: ElementFinder = element(by.css('input[id="date_id"]')); diff --git a/e2e/pages/adf/process-services/filtersPage.ts b/e2e/pages/adf/process-services/filters.page.ts similarity index 100% rename from e2e/pages/adf/process-services/filtersPage.ts rename to e2e/pages/adf/process-services/filters.page.ts diff --git a/e2e/pages/adf/process-services/processDetailsPage.ts b/e2e/pages/adf/process-services/process-details.page.ts similarity index 100% rename from e2e/pages/adf/process-services/processDetailsPage.ts rename to e2e/pages/adf/process-services/process-details.page.ts diff --git a/e2e/pages/adf/process-services/processFiltersPage.ts b/e2e/pages/adf/process-services/process-filters.page.ts similarity index 99% rename from e2e/pages/adf/process-services/processFiltersPage.ts rename to e2e/pages/adf/process-services/process-filters.page.ts index 129a953608..90b38a8e3c 100644 --- a/e2e/pages/adf/process-services/processFiltersPage.ts +++ b/e2e/pages/adf/process-services/process-filters.page.ts @@ -17,7 +17,7 @@ import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing'; import { by, element, ElementFinder, Locator } from 'protractor'; -import { StartProcessPage } from './startProcessPage'; +import { StartProcessPage } from './start-process.page'; export class ProcessFiltersPage { diff --git a/e2e/pages/adf/process-services/processListPage.ts b/e2e/pages/adf/process-services/process-list.page.ts similarity index 100% rename from e2e/pages/adf/process-services/processListPage.ts rename to e2e/pages/adf/process-services/process-list.page.ts diff --git a/e2e/pages/adf/process-services/processServiceTabBarPage.ts b/e2e/pages/adf/process-services/process-service-tab-bar.page.ts similarity index 100% rename from e2e/pages/adf/process-services/processServiceTabBarPage.ts rename to e2e/pages/adf/process-services/process-service-tab-bar.page.ts diff --git a/e2e/pages/adf/process-services/processServicesPage.ts b/e2e/pages/adf/process-services/process-services.page.ts similarity index 97% rename from e2e/pages/adf/process-services/processServicesPage.ts rename to e2e/pages/adf/process-services/process-services.page.ts index cf90798767..9ee0535895 100644 --- a/e2e/pages/adf/process-services/processServicesPage.ts +++ b/e2e/pages/adf/process-services/process-services.page.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ProcessServiceTabBarPage } from './processServiceTabBarPage'; +import { ProcessServiceTabBarPage } from './process-service-tab-bar.page'; import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; diff --git a/e2e/pages/adf/process-services/startProcessPage.ts b/e2e/pages/adf/process-services/start-process.page.ts similarity index 100% rename from e2e/pages/adf/process-services/startProcessPage.ts rename to e2e/pages/adf/process-services/start-process.page.ts diff --git a/e2e/pages/adf/process-services/taskDetailsPage.ts b/e2e/pages/adf/process-services/task-details.page.ts similarity index 98% rename from e2e/pages/adf/process-services/taskDetailsPage.ts rename to e2e/pages/adf/process-services/task-details.page.ts index 62eed38334..8a3cb05b05 100644 --- a/e2e/pages/adf/process-services/taskDetailsPage.ts +++ b/e2e/pages/adf/process-services/task-details.page.ts @@ -17,11 +17,11 @@ import { BrowserActions, BrowserVisibility, TabsPage } from '@alfresco/adf-testing'; import { browser, by, element, ElementFinder } from 'protractor'; -import { AppSettingsToggles } from './dialog/appSettingsToggles'; +import { AppSettingsTogglesPage } from './dialog/app-settings-toggles.page'; export class TaskDetailsPage { - appSettingsTogglesClass = new AppSettingsToggles(); + appSettingsTogglesClass = new AppSettingsTogglesPage(); formContent: ElementFinder = element(by.css('adf-form')); formNameField: ElementFinder = element(by.css('span[data-automation-id*="formName"] span')); @@ -321,7 +321,7 @@ export class TaskDetailsPage { await BrowserActions.click(this.auditLogButton); } - appSettingsToggles(): AppSettingsToggles { + appSettingsToggles(): AppSettingsTogglesPage { return this.appSettingsTogglesClass; } diff --git a/e2e/pages/adf/process-services/taskFiltersPage.ts b/e2e/pages/adf/process-services/task-filters.page.ts similarity index 100% rename from e2e/pages/adf/process-services/taskFiltersPage.ts rename to e2e/pages/adf/process-services/task-filters.page.ts diff --git a/e2e/pages/adf/process-services/tasksListPage.ts b/e2e/pages/adf/process-services/tasks-list.page.ts similarity index 100% rename from e2e/pages/adf/process-services/tasksListPage.ts rename to e2e/pages/adf/process-services/tasks-list.page.ts diff --git a/e2e/pages/adf/process-services/tasksPage.ts b/e2e/pages/adf/process-services/tasks.page.ts similarity index 93% rename from e2e/pages/adf/process-services/tasksPage.ts rename to e2e/pages/adf/process-services/tasks.page.ts index 09db2dcfa7..03206315a8 100644 --- a/e2e/pages/adf/process-services/tasksPage.ts +++ b/e2e/pages/adf/process-services/tasks.page.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { StartTaskDialog } from './dialog/startTaskDialog'; -import { TaskDetailsPage } from './taskDetailsPage'; +import { StartTaskDialogPage } from './dialog/start-task-dialog.page'; +import { TaskDetailsPage } from './task-details.page'; -import { FiltersPage } from './filtersPage'; -import { ChecklistDialog } from './dialog/createChecklistDialog'; -import { TasksListPage } from './tasksListPage'; +import { FiltersPage } from './filters.page'; +import { ChecklistDialog } from './dialog/create-checklist-dialog.page'; +import { TasksListPage } from './tasks-list.page'; import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility, BrowserActions, FormFields } from '@alfresco/adf-testing'; @@ -39,16 +39,16 @@ export class TasksPage { numberOfChecklists: ElementFinder = element(by.css('[data-automation-id="checklist-label"] mat-chip')); sortByName = by.css('div[data-automation-id="auto_id_name"]'); - async createNewTask(): Promise { + async createNewTask(): Promise { await this.clickOnCreateButton(); await BrowserActions.clickExecuteScript('button[data-automation-id="btn-start-task"]'); - return new StartTaskDialog(); + return new StartTaskDialogPage(); } async createTask({ name, description = '', dueDate = '', formName = 'None'}): Promise { await this.clickOnCreateButton(); await BrowserActions.clickExecuteScript('button[data-automation-id="btn-start-task"]'); - const dialog = new StartTaskDialog(); + const dialog = new StartTaskDialogPage(); await dialog.addName(name); await dialog.addDescription(description); await dialog.addDueDate(dueDate); diff --git a/e2e/pages/adf/searchFiltersPage.ts b/e2e/pages/adf/search-filters.page.ts similarity index 100% rename from e2e/pages/adf/searchFiltersPage.ts rename to e2e/pages/adf/search-filters.page.ts diff --git a/e2e/pages/adf/searchResultsPage.ts b/e2e/pages/adf/search-results.page.ts similarity index 98% rename from e2e/pages/adf/searchResultsPage.ts rename to e2e/pages/adf/search-results.page.ts index e0c021dcbd..95bdc0ac2d 100644 --- a/e2e/pages/adf/searchResultsPage.ts +++ b/e2e/pages/adf/search-results.page.ts @@ -17,7 +17,7 @@ import { BrowserVisibility, DataTableComponentPage, SearchSortingPickerPage } from '@alfresco/adf-testing'; import { by, element, ElementFinder } from 'protractor'; -import { ContentServicesPage } from './contentServicesPage'; +import { ContentServicesPage } from './content-services.page'; export class SearchResultsPage { diff --git a/e2e/pages/adf/tagPage.ts b/e2e/pages/adf/tag.page.ts similarity index 100% rename from e2e/pages/adf/tagPage.ts rename to e2e/pages/adf/tag.page.ts diff --git a/e2e/pages/adf/trashcanPage.ts b/e2e/pages/adf/trashcan.page.ts similarity index 100% rename from e2e/pages/adf/trashcanPage.ts rename to e2e/pages/adf/trashcan.page.ts diff --git a/e2e/pages/adf/versionManagerPage.ts b/e2e/pages/adf/version-manager.page.ts similarity index 100% rename from e2e/pages/adf/versionManagerPage.ts rename to e2e/pages/adf/version-manager.page.ts diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index 1b1cc2df31..bf7459640d 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, ApplicationsService, AppListCloudPage, IdentityService, LocalStorageUtil, LoginSSOPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/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 7a657b4e6d..12c804ebb8 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -17,9 +17,9 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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'; 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 12ef3ee2b1..c84fd747ec 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/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/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 4b07a89148..5a0475cb08 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/tasksCloudDemoPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; describe('Form Field Component - Dropdown Widget', () => { const loginSSOPage = new LoginSSOPage(); 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 e871a8b5f1..b5032d3226 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/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; 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 7afd65a035..f2ba1841bf 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 @@ -18,11 +18,11 @@ import { LoginSSOPage, AppListCloudPage, IdentityService, GroupIdentityService, ApiService, StringUtil, StartTasksCloudPage, TaskFormCloudComponent } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { StartProcessPage } from '../../pages/adf/process-services/startProcessPage'; -import { ProcessCloudDemoPage } from '../../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { ProcessDetailsCloudDemoPage } from '../../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { StartProcessPage } from '../../pages/adf/process-services/start-process.page'; +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'; 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 483a302157..7ffb64d473 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 @@ -19,7 +19,7 @@ import { FormCloudComponentPage, LoginSSOPage, ProcessCloudWidgetPage } from '@a import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/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 27fbf5d4e1..6e771059c0 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts +++ b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts @@ -19,10 +19,10 @@ import { FormCloudComponentPage, LoginSSOPage, ProcessCloudWidgetPage } from '@a import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../../pages/adf/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/displayValue-visibilityConditions'; +import { displayValueTextJson } from '../../resources/forms/display-value-visibility-conditions'; describe('Visibility conditions - cloud', () => { 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 202409a8bb..3cae7d363c 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts @@ -17,8 +17,8 @@ import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginSSOPage, PeopleCloudComponentPage, RolesService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/people-group-cloud-component.page'; +import { NavigationBarPage } from '../pages/adf/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 bc79bacd89..cb5a975c5f 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, LoginSSOPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/people-group-cloud-component.page'; +import { NavigationBarPage } from '../pages/adf/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 17c9574df7..a69c140b20 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, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 { 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 bffcfe3a97..8f39374cee 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/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessListPage } from '../pages/adf/process-services/processListPage'; +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 { 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 b88749e172..4be798cb34 100644 --- a/e2e/process-services-cloud/process-filter-task.e2e.ts +++ b/e2e/process-services-cloud/process-filter-task.e2e.ts @@ -27,11 +27,11 @@ import { TaskHeaderCloudPage } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessListPage } from '../pages/adf/process-services/processListPage'; +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 { ProcessListPage } from '../pages/adf/process-services/process-list.page'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessDefinitionCloud, ProcessInstanceCloud, StartTaskCloudResponseModel } from '@alfresco/adf-process-services-cloud'; diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index d38b25366a..3db13366e7 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -17,9 +17,9 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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'; 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 880ac02f56..618e41ab95 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, LoginSSOPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 CONSTANTS = require('../util/constants'); import moment = require('moment'); 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 07c8b1002f..176414915e 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 @@ -17,9 +17,9 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts index 68709c69b5..21afea89c4 100644 --- a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts @@ -17,8 +17,8 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; 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 0df7c769c3..fb9b5e3d32 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, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage'; +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'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index 1be6a32ddd..f2d2f5406b 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, LoginSSOPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/process-cloud-demo.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; 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 482543118c..528ed11666 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/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; import { LoginSSOPage, AppListCloudPage, @@ -40,12 +40,12 @@ import { FileBrowserUtil, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; -import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; -import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage'; -import { FileModel } from '../models/ACS/fileModel'; +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 { FileModel } from '../models/ACS/file.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { BreadCrumbDropdownPage } from '../pages/adf/content-services/breadcrumb/breadCrumbDropdownPage'; +import { AcsUserModel } from '../models/ACS/acs-user.model'; +import { BreadCrumbDropdownPage } from '../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page'; 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 25c951cbf8..0281e2c33a 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/navigationBarPage'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; import { LoginSSOPage, 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 ba96679c18..08c81925df 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/navigationBarPage'; -import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; import { LoginSSOPage, AppListCloudPage, diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index 400125d95d..d54e53d690 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -17,8 +17,8 @@ import { browser } from 'protractor'; import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/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 ae5ed182af..f324a9b953 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 } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; import { FormCloudService } from '../../lib/testing/src/lib/form-cloud/actions/form-cloud.service'; 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 3c261133e2..7509a7198d 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -29,8 +29,8 @@ import { TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; import { FormCloudService } from '../../lib/testing/src/lib/form-cloud/actions/form-cloud.service'; 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 0267f923d3..f12169b62f 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -28,8 +28,8 @@ import { TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import moment = require('moment'); describe('Task Header cloud component', () => { 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 8f0e79be58..5b49c055f7 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, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../pages/adf/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 2af12f1e06..ec29d83c1e 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 { LoginSSOPage, ApiService, AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/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 26b1b07dab..8d9c4883cb 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 { LoginSSOPage, ApiService, AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; import moment = require('moment'); diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index cd7dbb9a99..c6649b576a 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -17,8 +17,8 @@ import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, StringUtil, TasksService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('Task list cloud - selection', () => { diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index 27ac569be9..897e75f9ae 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/navigationBarPage'; -import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasks-cloud-demo.page'; describe('Task filters cloud', () => { diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index 92fc024ebe..2f0c31b7a6 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 { LoginPage } from '@alfresco/adf-testing'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import CONSTANTS = require('../util/constants'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index c35725a740..75637b71d8 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -16,12 +16,12 @@ */ import { LoginPage, Widget, ViewerPage } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); -import { FileModel } from '../models/ACS/fileModel'; +import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index fe3265fc80..252e19bb15 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -20,9 +20,9 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, by } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { AttachFormPage } from '../pages/adf/process-services/attachFormPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +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 CONSTANTS = require('../util/constants'); describe('Attach Form Component', () => { diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index 2d23f185de..9585b3d7f2 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { 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 CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import { browser } from 'protractor'; diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index e6a06fb700..7500ff9617 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 { LoginPage } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { CommentsPage } from '../pages/adf/commentsPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { 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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index 3036c679b4..bb4fa3b4bd 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 { LoginPage } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { CommentsPage } from '../pages/adf/commentsPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { CommentsPage } from '../pages/adf/comments.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import CONSTANTS = require('../util/constants'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index fe8b9e2252..05ab2ca452 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 { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { FiltersPage } from '../pages/adf/process-services/filtersPage'; +import { 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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/e2e/process-services/custom-process-filters.e2e.ts b/e2e/process-services/custom-process-filters.e2e.ts index 72ceeec023..d1d2df21ca 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 { LoginPage } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; @@ -31,7 +31,7 @@ describe('New Process Filters', () => { const loginPage = new LoginPage(); const processFiltersPage = new ProcessFiltersPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); - const appSettingsToggles = new AppSettingsToggles(); + const appSettingsToggles = new AppSettingsTogglesPage(); const navigationBarPage = new NavigationBarPage(); let tenantId, user, filterId, customProcessFilter; diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index 7bcee7a782..81772ac726 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -19,11 +19,11 @@ import { DateUtil, LoginPage, PaginationPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; -import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions'; +import { AppsRuntimeActions } from '../actions/APS/apps-runtime.actions'; import { UsersActions } from '../actions/users.actions'; import { Tenant } from '../models/APS/tenant'; -import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/task-list-demo.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { Util } from '../util/util'; 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 47d85cf70f..527444bc80 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -16,9 +16,9 @@ */ import { LoginPage, Widget, DatePickerPage, DateUtil } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index 6a9de93c77..4b53c569e3 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -17,12 +17,12 @@ import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { ProcessListPage } from '../pages/adf/process-services/processListPage'; -import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; +import { 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 { StartProcessPage } from '../pages/adf/process-services/start-process.page'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index 37041ead30..ef04c13d45 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage, Widget, FormPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index 363a52f9ef..339fa55a0e 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -16,16 +16,16 @@ */ import { LoginPage, Widget } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; +import { StartProcessPage } from '../pages/adf/process-services/start-process.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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; +import { ProcessServiceTabBarPage } from '../pages/adf/process-services/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 db167dd59a..2c71546a3f 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -16,10 +16,10 @@ */ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/e2e/process-services/info-drawer.e2e.ts b/e2e/process-services/info-drawer.e2e.ts index 576b1efa9d..b0f9512a90 100644 --- a/e2e/process-services/info-drawer.e2e.ts +++ b/e2e/process-services/info-drawer.e2e.ts @@ -24,13 +24,13 @@ import { import { browser, by, element } from 'protractor'; import { UsersActions } from '../actions/users.actions'; import { Tenant } from '../models/APS/tenant'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { AppsActions } from '../actions/APS/apps.actions'; import CONSTANTS = require('../util/constants'); import moment = require('moment'); -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; +import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; +import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { infoDrawerConfiguration } from './config/task.config'; describe('Info Drawer', () => { diff --git a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts similarity index 97% rename from e2e/process-services/pagination-processlist-addingProcesses.e2e.ts rename to e2e/process-services/pagination-processlist-adding-processes.e2e.ts index cd3dcf7f9d..1bc55d1a31 100644 --- a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts +++ b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts @@ -20,9 +20,9 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; +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'; describe('Process List - Pagination when adding processes', () => { diff --git a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts similarity index 96% rename from e2e/process-services/pagination-tasklist-addingTasks.e2e.ts rename to e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts index 13e6f6d9ed..5da57efa4c 100644 --- a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts @@ -20,8 +20,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from '../pages/adf/process-services/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 5764dfed1e..5ffb7999e2 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -16,9 +16,9 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; +import { 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 CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import { browser } from 'protractor'; diff --git a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts b/e2e/process-services/process-attachment-list-action-menu.e2e.ts similarity index 97% rename from e2e/process-services/process-attachmentList-actionMenu.e2e.ts rename to e2e/process-services/process-attachment-list-action-menu.e2e.ts index ff96b390b7..4a97530ce7 100644 --- a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/process-attachment-list-action-menu.e2e.ts @@ -16,14 +16,14 @@ */ import { LoginPage, FileBrowserUtil, ViewerPage } from '@alfresco/adf-testing'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; -import { FileModel } from '../models/ACS/fileModel'; +import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; describe('Attachment list action menu for processes', () => { diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index 15e7e8fc14..d1734bea07 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -16,18 +16,19 @@ */ import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { ProcessListPage } from '../pages/adf/process-services/processListPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; +import { StartProcessPage } from '../pages/adf/process-services/start-process.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 { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; -import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage'; +import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/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 5a944b85ea..8bc271a90a 100644 --- a/e2e/process-services/process-instance-details.e2e.ts +++ b/e2e/process-services/process-instance-details.e2e.ts @@ -18,13 +18,13 @@ import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { AppsActions } from '../actions/APS/apps.actions'; import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { ProcessListPage } from '../pages/adf/process-services/processListPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; +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 moment = require('moment'); describe('Process Instance Details', () => { diff --git a/e2e/process-services/processList-component.e2e.ts b/e2e/process-services/process-list-component.e2e.ts similarity index 99% rename from e2e/process-services/processList-component.e2e.ts rename to e2e/process-services/process-list-component.e2e.ts index 98aab6ba84..51176def06 100644 --- a/e2e/process-services/processList-component.e2e.ts +++ b/e2e/process-services/process-list-component.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; -import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage'; +import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/process-list-demo.page'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index db896d011f..c8ad6b4a91 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -20,9 +20,9 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; +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'; 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 81ffc8ba7e..c56b85eb49 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -20,8 +20,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { Util } from '../util/util'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index aad395c3a8..7f870e6def 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 { LoginPage } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import Task = require('../models/APS/Task'); diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 0d8bc6f497..c7510d55db 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -20,16 +20,16 @@ import { FileBrowserUtil, LoginPage, StartProcessDialog, StringUtil, Widget } fr import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; -import { FileModel } from '../models/ACS/fileModel'; +import { FileModel } from '../models/ACS/file.model'; import { Tenant } from '../models/APS/tenant'; import { User } from '../models/APS/user'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; +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 { StartProcessPage } from '../pages/adf/process-services/start-process.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 fe1d44411d..047497875f 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -20,12 +20,12 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, by } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { FileModel } from '../models/ACS/fileModel'; +import { FileModel } from '../models/ACS/file.model'; import { Tenant } from '../models/APS/tenant'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +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 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 699bd1538a..ebccb1979e 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -19,13 +19,13 @@ import { LoginPage, StringUtil } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, by } from 'protractor'; import { UsersActions } from '../actions/users.actions'; -import { FileModel } from '../models/ACS/fileModel'; +import { FileModel } from '../models/ACS/file.model'; import { Tenant } from '../models/APS/tenant'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; -import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +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 CONSTANTS = require('../util/constants'); import fs = require('fs'); import path = require('path'); diff --git a/e2e/process-services/task-assignee.e2e.ts b/e2e/process-services/task-assignee.e2e.ts index 62300eb135..d16bd80c47 100644 --- a/e2e/process-services/task-assignee.e2e.ts +++ b/e2e/process-services/task-assignee.e2e.ts @@ -16,19 +16,19 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; -import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import { ProcessListPage } from '../pages/adf/process-services/processListPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; +import { StartProcessPage } from '../pages/adf/process-services/start-process.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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; import { User } from '../models/APS/user'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); describe('Task Assignee', () => { diff --git a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts b/e2e/process-services/task-attachment-list-action-menu.e2e.ts similarity index 97% rename from e2e/process-services/task-attachmentList-actionMenu.e2e.ts rename to e2e/process-services/task-attachment-list-action-menu.e2e.ts index 48ca3ff51d..c3d6dea6ad 100644 --- a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/task-attachment-list-action-menu.e2e.ts @@ -17,16 +17,16 @@ import { browser } from 'protractor'; import { LoginPage, FileBrowserUtil, ViewerPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; +import { 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 CONSTANTS = require('../util/constants'); import path = require('path'); import fs = require('fs'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { AppsActions } from '../actions/APS/apps.actions'; -import { FileModel } from '../models/ACS/fileModel'; +import { FileModel } from '../models/ACS/file.model'; describe('Attachment list action menu for tasks', () => { diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index 129fe60157..2db88bc115 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 } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import { browser } from 'protractor'; diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index 4fd8df7a79..26e1895f56 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -19,13 +19,13 @@ import { LoginPage, StringUtil, Widget } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; -import { FormModelActions } from '../actions/APS/formModel.actions'; +import { FormModelActions } from '../actions/APS/form-model.actions'; import { UsersActions } from '../actions/users.actions'; -import { StandaloneTask } from '../models/APS/standaloneTask'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { FiltersPage } from '../pages/adf/process-services/filtersPage'; -import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; -import { TasksListPage } from '../pages/adf/process-services/tasksListPage'; +import { StandaloneTask } from '../models/APS/standalone-task'; +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 CONSTANTS = require('../util/constants'); describe('Task Details - Form', () => { diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index 9a35c8d341..ca57f74709 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 { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import { browser } from 'protractor'; diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 2f6837eeb3..e82c8c9013 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -22,11 +22,11 @@ import Task = require('../models/APS/Task'); import TaskModel = require('../models/APS/TaskModel'); import FormModel = require('../models/APS/FormModel'); import { AppsActions } from '../actions/APS/apps.actions'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import CONSTANTS = require('../util/constants'); import moment = require('moment'); import { LoginPage, BrowserActions, StringUtil } from '@alfresco/adf-testing'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; describe('Task Details component', () => { diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index b6fe348c44..07b0f172fc 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -16,14 +16,14 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { TasksListPage } from '../pages/adf/process-services/tasksListPage'; -import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; -import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles'; -import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage'; +import { 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 { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; @@ -190,7 +190,7 @@ describe('Task', () => { const navigationBarPage = new NavigationBarPage(); const processServicesPage = new ProcessServicesPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage(); - const appSettingsToggles = new AppSettingsToggles(); + const appSettingsToggles = new AppSettingsTogglesPage(); const taskFiltersDemoPage = new TaskFiltersDemoPage(); let user; diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index 172beba542..14accfdc93 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -16,12 +16,12 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { TasksListPage } from '../pages/adf/process-services/tasksListPage'; -import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; -import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/process-services/taskFiltersDemoPage'; +import { 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 { AlfrescoApiCompatibility as AlfrescoApi, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index e81ccacb98..bc3578dee3 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -20,8 +20,8 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { TasksPage } from '../pages/adf/process-services/tasksPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; +import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); import { User } from '../models/APS/user'; diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index 7fdd43acd0..8f44718842 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index e20261f415..1b48b22a9c 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index e2b0d03a41..c5fdd51c3a 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 85c4e56eea..eadecd75a7 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index a14f2dcaec..be6d7b961a 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -19,10 +19,10 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget, FormPage } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; -import { FormDemoPage } from '../../pages/adf/demo-shell/process-services/formDemoPage'; +import { FormDemoPage } from '../../pages/adf/demo-shell/process-services/form-demo.page'; import { customDateFormAPS1 } from '../../resources/forms/custom-date-form'; describe('Date widget', () => { diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index 53206b0ce3..60109efaaf 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index 0d085bd09c..547d5f89fa 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index e1ddf1812b..4ba8f48c30 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 81ffb0f8f1..750aa6b02f 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index 6eee985f8c..e0290a4b56 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 2780b7f7a9..1d72cf7e9c 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index f91b51a722..89d19522ad 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index c928776d9f..2e900f44b3 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index 3d7cce47a3..8e4ca39497 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index 8176c57d4c..796b329e66 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -19,7 +19,7 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../../actions/APS/apps.actions'; import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; diff --git a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts index 620cfeba64..1aa09d372a 100644 --- a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts +++ b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts @@ -21,7 +21,7 @@ import { browser } from 'protractor'; import { UsersActions } from '../../actions/users.actions'; import CONSTANTS = require('../../util/constants'); import { AppsActions } from '../../actions/APS/apps.actions'; -import { TasksPage } from '../../pages/adf/process-services/tasksPage'; +import { TasksPage } from '../../pages/adf/process-services/tasks.page'; const widgets = { textOneId: 'text1', diff --git a/e2e/resources/forms/displayValue-visibilityConditions.ts b/e2e/resources/forms/display-value-visibility-conditions.ts similarity index 100% rename from e2e/resources/forms/displayValue-visibilityConditions.ts rename to e2e/resources/forms/display-value-visibility-conditions.ts diff --git a/e2e/search/components/search-checkList.e2e.ts b/e2e/search/components/search-check-list.e2e.ts similarity index 97% rename from e2e/search/components/search-checkList.e2e.ts rename to e2e/search/components/search-check-list.e2e.ts index 81e3d724de..ae06b9b272 100644 --- a/e2e/search/components/search-checkList.e2e.ts +++ b/e2e/search/components/search-check-list.e2e.ts @@ -16,11 +16,11 @@ */ import { LoginPage, BrowserActions, UploadActions, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +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 { AcsUserModel } from '../../models/ACS/acs-user.model'; import { SearchConfiguration } from '../search.config'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -29,7 +29,7 @@ describe('Search Checklist Component', () => { const loginPage = new LoginPage(); const searchFiltersPage = new SearchFiltersPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchResults = new SearchResultsPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index a14e71fdd1..5da6984334 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -18,16 +18,16 @@ import { DataTableComponentPage, DatePickerPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; +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 { SearchConfiguration } from '../search.config'; describe('Search Date Range Filter', () => { const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const dateRangeFilter = searchFilters.createdDateRangeFilterPage(); const searchResults = new SearchResultsPage(); diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index 27ee299860..fe55f58d0c 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -16,20 +16,20 @@ */ import { LoginPage, LocalStorageUtil, UploadActions, DataTableComponentPage, DateUtil } from '@alfresco/adf-testing'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; +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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { SearchConfiguration } from '../search.config'; describe('Search Number Range Filter', () => { const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const sizeRangeFilter = searchFilters.sizeRangeFilterPage(); const searchResults = new SearchResultsPage(); diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index 09f300940a..6865dfb859 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -16,11 +16,11 @@ */ import { LoginPage, BrowserActions, StringUtil, LocalStorageUtil, UploadActions } from '@alfresco/adf-testing'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +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 { AcsUserModel } from '../../models/ACS/acs-user.model'; import { SearchConfiguration } from '../search.config'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -30,7 +30,7 @@ describe('Search Radio Component', () => { const loginPage = new LoginPage(); const searchFiltersPage = new SearchFiltersPage(); const navigationBarPage = new NavigationBarPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchResults = new SearchResultsPage(); const acsUser = new AcsUserModel(); diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 4f08088dd5..9384834d75 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -16,20 +16,20 @@ */ import { LoginPage, LocalStorageUtil, UploadActions, DataTableComponentPage } from '@alfresco/adf-testing'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; +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 { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FileModel } from '../../models/ACS/fileModel'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { SearchConfiguration } from '../search.config'; describe('Search Slider Filter', () => { const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const sizeSliderFilter = searchFilters.sizeSliderFilterPage(); const searchResults = new SearchResultsPage(); diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 0715c4de4d..45906dc3a5 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -21,21 +21,21 @@ import { SearchSortingPickerPage, UploadActions } from '@alfresco/adf-testing'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +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 { NodeActions } from '../../actions/ACS/node.actions'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; import { browser } from 'protractor'; import { SearchConfiguration } from '../search.config'; describe('Search Sorting Picker', () => { const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchFilters = new SearchFiltersPage(); const searchResults = new SearchResultsPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/e2e/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts index 9cd0ddb3b2..4c0bc687ce 100644 --- a/e2e/search/components/search-text.e2e.ts +++ b/e2e/search/components/search-text.e2e.ts @@ -17,16 +17,16 @@ import { browser } from 'protractor'; -import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { FolderModel } from '../../models/ACS/folderModel'; +import { AcsUserModel } from '../../models/ACS/acs-user.model'; +import { FolderModel } from '../../models/ACS/folder.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; -import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; -import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; -import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +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 { SearchConfiguration } from '../search.config'; @@ -36,7 +36,7 @@ describe('Search component - Text widget', () => { const searchFiltersPage = new SearchFiltersPage(); const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchResultPage = new SearchResultsPage(); const acsUser = new AcsUserModel(); diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index 55e600ec47..c9ed9629af 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -18,14 +18,14 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil, LocalStorageUtil, BrowserActions, ViewerPage } from '@alfresco/adf-testing'; -import { SearchDialog } from '../pages/adf/dialog/searchDialog'; -import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { SearchResultsPage } from '../pages/adf/searchResultsPage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; -import { FolderModel } from '../models/ACS/folderModel'; +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 { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; +import { FolderModel } from '../models/ACS/folder.model'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { SearchConfiguration } from './search.config'; describe('Search component - Search Bar', () => { @@ -43,7 +43,7 @@ describe('Search component - Search Bar', () => { const contentServicesPage = new ContentServicesPage(); const navigationBarPage = new NavigationBarPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchResultPage = new SearchResultsPage(); const viewerPage = new ViewerPage(); diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index 07440b476f..791dac9cc2 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { SearchDialog } from '../pages/adf/dialog/searchDialog'; -import { SearchFiltersPage } from '../pages/adf/searchFiltersPage'; -import { SearchResultsPage } from '../pages/adf/searchResultsPage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { StringUtil, DocumentListPage, @@ -37,7 +37,7 @@ import { SearchConfiguration } from './search.config'; describe('Search Filters', () => { const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchFiltersPage = new SearchFiltersPage(); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index 63e806487f..041a2f1187 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -19,16 +19,16 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { StringUtil, UploadActions, LoginPage } from '@alfresco/adf-testing'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import { SearchDialog } from '../pages/adf/dialog/searchDialog'; -import { SearchResultsPage } from '../pages/adf/searchResultsPage'; -import { SearchFiltersPage } from '../pages/adf/searchFiltersPage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FileModel } from '../models/ACS/fileModel'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +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 { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FileModel } from '../models/ACS/file.model'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('Search Component - Multi-Select Facet', () => { const loginPage = new LoginPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchResultsPage = new SearchResultsPage(); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/search/search-page-component.e2e.ts b/e2e/search/search-page-component.e2e.ts index 82e008d6e9..712a3ede61 100644 --- a/e2e/search/search-page-component.e2e.ts +++ b/e2e/search/search-page-component.e2e.ts @@ -19,15 +19,15 @@ import { browser } from 'protractor'; import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { SearchDialog } from '../pages/adf/dialog/searchDialog'; -import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { SearchResultsPage } from '../pages/adf/searchResultsPage'; -import { AcsUserModel } from '../models/ACS/acsUserModel'; -import { FolderModel } from '../models/ACS/folderModel'; -import { FileModel } from '../models/ACS/fileModel'; +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 { AcsUserModel } from '../models/ACS/acs-user.model'; +import { FolderModel } from '../models/ACS/folder.model'; +import { FileModel } from '../models/ACS/file.model'; import { Util } from '../util/util'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('Search component - Search Page', () => { const search = { @@ -45,7 +45,7 @@ describe('Search component - Search Page', () => { const loginPage = new LoginPage(); const contentServicesPage = new ContentServicesPage(); - const searchDialog = new SearchDialog(); + const searchDialog = new SearchDialogPage(); const searchResultPage = new SearchResultsPage(); const navigationBarPage = new NavigationBarPage(); diff --git a/lib/core/buttons-menu/buttons-menu.component.spec.ts b/lib/core/buttons-menu/buttons-menu.component.spec.ts index aa5784018d..e4cafbd03b 100644 --- a/lib/core/buttons-menu/buttons-menu.component.spec.ts +++ b/lib/core/buttons-menu/buttons-menu.component.spec.ts @@ -18,7 +18,7 @@ import { TestBed, async } from '@angular/core/testing'; import { MaterialModule } from '../material.module'; import { CoreTestingModule } from '../testing/core.testing.module'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CUSTOM_ELEMENTS_SCHEMA, Component } from '@angular/core'; @Component({ diff --git a/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts b/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts index 08ee894ada..6cc2e78079 100644 --- a/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { CardViewArrayItemComponent } from './card-view-arrayitem.component'; import { CardViewArrayItemModel, CardViewArrayItem } from '../../models/card-view-arrayitem.model'; diff --git a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts index f97b6ac4c7..972a693423 100644 --- a/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts @@ -18,7 +18,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MatCheckbox, MatCheckboxChange } from '@angular/material'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewBoolItemComponent } from './card-view-boolitem.component'; import { CardViewBoolItemModel } from '../../models/card-view-boolitem.model'; diff --git a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts index 196405290f..46e8c8e11c 100644 --- a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import moment from 'moment-es6'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; diff --git a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts index 56f3b867bd..d1891bb4c8 100644 --- a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts +++ b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts @@ -24,7 +24,7 @@ import { Moment } from 'moment'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { UserPreferencesService, UserPreferenceValues } from '../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../utils/momentDateAdapter'; +import { MomentDateAdapter } from '../../../utils/moment-date-adapter'; import { MOMENT_DATE_FORMATS } from '../../../utils/moment-date-formats.model'; import { AppConfigService } from '../../../app-config/app-config.service'; import { Subject } from 'rxjs'; diff --git a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts index c68a73dac7..6326c98524 100644 --- a/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { CardViewKeyValuePairsItemModel } from '../../models/card-view-keyvaluepairs.model'; import { CardViewKeyValuePairsItemComponent } from './card-view-keyvaluepairsitem.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { CardViewUpdateService } from '../../services/card-view-update.service'; diff --git a/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts b/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts index d730457272..2abb3335a6 100644 --- a/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { CardViewMapItemModel } from '../../models/card-view-mapitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewMapItemComponent } from './card-view-mapitem.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; describe('CardViewMapItemComponent', () => { diff --git a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts index c8c7151d6b..69ecd50437 100644 --- a/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model'; import { CardViewSelectItemComponent } from './card-view-selectitem.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { of } from 'rxjs'; diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts index 885f6125c3..9e578a13e5 100644 --- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts +++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts @@ -20,7 +20,7 @@ import { By } from '@angular/platform-browser'; import { CardViewTextItemModel } from '../../models/card-view-textitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewTextItemComponent } from './card-view-textitem.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; describe('CardViewTextItemComponent', () => { diff --git a/lib/core/card-view/components/card-view/card-view.component.spec.ts b/lib/core/card-view/components/card-view/card-view.component.spec.ts index 8e59af4b14..2fb954c206 100644 --- a/lib/core/card-view/components/card-view/card-view.component.spec.ts +++ b/lib/core/card-view/components/card-view/card-view.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { CardViewTextItemModel } from '../../models/card-view-textitem.model'; import { CardViewComponent } from './card-view.component'; diff --git a/lib/core/card-view/services/card-view-update.service.spec.ts b/lib/core/card-view/services/card-view-update.service.spec.ts index 88472cd28a..4157bcb752 100644 --- a/lib/core/card-view/services/card-view-update.service.spec.ts +++ b/lib/core/card-view/services/card-view-update.service.spec.ts @@ -18,7 +18,7 @@ import { async, TestBed } from '@angular/core/testing'; import { CardViewBaseItemModel } from '../models/card-view-baseitem.model'; import { CardViewUpdateService, transformKeyToObject } from './card-view-update.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; describe('CardViewUpdateService', () => { diff --git a/lib/core/clipboard/clipboard.directive.spec.ts b/lib/core/clipboard/clipboard.directive.spec.ts index 3e56c66a24..b861c9e197 100644 --- a/lib/core/clipboard/clipboard.directive.spec.ts +++ b/lib/core/clipboard/clipboard.directive.spec.ts @@ -17,7 +17,7 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { ClipboardService } from './clipboard.service'; import { ClipboardDirective } from './clipboard.directive'; diff --git a/lib/core/clipboard/clipboard.service.spec.ts b/lib/core/clipboard/clipboard.service.spec.ts index 6d07a4d6fd..202b2675e8 100644 --- a/lib/core/clipboard/clipboard.service.spec.ts +++ b/lib/core/clipboard/clipboard.service.spec.ts @@ -26,7 +26,7 @@ import { AppConfigServiceMock } from '../mock/app-config.service.mock'; import { HttpClientModule } from '@angular/common/http'; import { MatSnackBarModule } from '@angular/material'; import { TranslationMock } from '@alfresco/adf-core'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; describe('ClipboardService', () => { let clipboardService: ClipboardService; diff --git a/lib/core/comments/comment-list.component.spec.ts b/lib/core/comments/comment-list.component.spec.ts index 0118c699c7..b8cfff49c7 100644 --- a/lib/core/comments/comment-list.component.spec.ts +++ b/lib/core/comments/comment-list.component.spec.ts @@ -22,7 +22,7 @@ import { CommentListComponent } from './comment-list.component'; import { By } from '@angular/platform-browser'; import { EcmUserService } from '../services/ecm-user.service'; import { PeopleProcessService } from '../services/people-process.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; const testUser: UserProcessModel = new UserProcessModel({ diff --git a/lib/core/comments/comments.component.spec.ts b/lib/core/comments/comments.component.spec.ts index 657d4cb65a..229b819cf2 100644 --- a/lib/core/comments/comments.component.spec.ts +++ b/lib/core/comments/comments.component.spec.ts @@ -21,7 +21,7 @@ import { of, throwError } from 'rxjs'; import { CommentProcessService } from '../services/comment-process.service'; import { CommentsComponent } from './comments.component'; import { CommentContentService } from '../services/comment-content.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; describe('CommentsComponent', () => { diff --git a/lib/core/context-menu/context-menu-holder.component.spec.ts b/lib/core/context-menu/context-menu-holder.component.spec.ts index c7f33b6213..3117381f28 100644 --- a/lib/core/context-menu/context-menu-holder.component.spec.ts +++ b/lib/core/context-menu/context-menu-holder.component.spec.ts @@ -23,7 +23,7 @@ import { ContextMenuModule } from './context-menu.module'; import { ContextMenuService } from './context-menu.service'; import { CoreModule } from '../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; describe('ContextMenuHolderComponent', () => { let fixture: ComponentFixture; diff --git a/lib/core/context-menu/context-menu-overlay.service.spec.ts b/lib/core/context-menu/context-menu-overlay.service.spec.ts index fb5a180559..baac31c7e6 100644 --- a/lib/core/context-menu/context-menu-overlay.service.spec.ts +++ b/lib/core/context-menu/context-menu-overlay.service.spec.ts @@ -20,7 +20,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { CoreTestingModule } from '../testing/core.testing.module'; import { ContextMenuOverlayService } from './context-menu-overlay.service'; import { Injector } from '@angular/core'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { TestBed } from '@angular/core/testing'; describe('ContextMenuService', () => { diff --git a/lib/core/context-menu/context-menu.spec.ts b/lib/core/context-menu/context-menu.spec.ts index b266a830d1..0fb711288a 100644 --- a/lib/core/context-menu/context-menu.spec.ts +++ b/lib/core/context-menu/context-menu.spec.ts @@ -20,7 +20,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { ContextMenuModule } from './context-menu.module'; import { CoreModule } from '../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; @Component({ selector: 'adf-test-component', diff --git a/lib/core/data-column/data-column-list.component.spec.ts b/lib/core/data-column/data-column-list.component.spec.ts index 734df869bf..e9894790fd 100644 --- a/lib/core/data-column/data-column-list.component.spec.ts +++ b/lib/core/data-column/data-column-list.component.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { DataColumnListComponent } from './data-column-list.component'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; describe('DataColumnListComponent', () => { diff --git a/lib/core/data-column/data-column.component.spec.ts b/lib/core/data-column/data-column.component.spec.ts index 8db66179df..dc3319dd9c 100644 --- a/lib/core/data-column/data-column.component.spec.ts +++ b/lib/core/data-column/data-column.component.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { DataColumnComponent } from './data-column.component'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; describe('DataColumnListComponent', () => { diff --git a/lib/core/datatable/components/datatable/datatable.component.spec.ts b/lib/core/datatable/components/datatable/datatable.component.spec.ts index f71bad4ac1..49ca898008 100644 --- a/lib/core/datatable/components/datatable/datatable.component.spec.ts +++ b/lib/core/datatable/components/datatable/datatable.component.spec.ts @@ -24,7 +24,7 @@ import { DataSorting } from '../../data/data-sorting.model'; import { ObjectDataColumn } from '../../data/object-datacolumn.model'; import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter'; import { DataTableComponent } from './datatable.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { DataColumnListComponent } from '../../../data-column/data-column-list.component'; import { DataColumnComponent } from '../../../data-column/data-column.component'; diff --git a/lib/core/datatable/components/datatable/empty-list.component.spec.ts b/lib/core/datatable/components/datatable/empty-list.component.spec.ts index 4ef6f16067..c71704994a 100644 --- a/lib/core/datatable/components/datatable/empty-list.component.spec.ts +++ b/lib/core/datatable/components/datatable/empty-list.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { EmptyListComponent } from './empty-list.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; describe('EmptyListComponentComponent', () => { diff --git a/lib/core/datatable/components/datatable/json-cell.component.spec.ts b/lib/core/datatable/components/datatable/json-cell.component.spec.ts index 3365700534..77e7f24e8d 100644 --- a/lib/core/datatable/components/datatable/json-cell.component.spec.ts +++ b/lib/core/datatable/components/datatable/json-cell.component.spec.ts @@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ObjectDataTableAdapter } from './../../data/object-datatable-adapter'; import { ObjectDataColumn } from './../../data/object-datacolumn.model'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { JsonCellComponent } from './json-cell.component'; diff --git a/lib/core/datatable/components/datatable/location-cell.component.spec.ts b/lib/core/datatable/components/datatable/location-cell.component.spec.ts index 1bf3e69f3c..71f6d05afd 100644 --- a/lib/core/datatable/components/datatable/location-cell.component.spec.ts +++ b/lib/core/datatable/components/datatable/location-cell.component.spec.ts @@ -20,7 +20,7 @@ import { ObjectDataTableAdapter } from './../../data/object-datatable-adapter'; import { ObjectDataColumn } from './../../data/object-datacolumn.model'; import { LocationCellComponent } from './location-cell.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; describe('LocationCellComponent', () => { diff --git a/lib/core/datatable/directives/loading-template.directive.spec.ts b/lib/core/datatable/directives/loading-template.directive.spec.ts index b8972a73e7..95b7d8e8f7 100644 --- a/lib/core/datatable/directives/loading-template.directive.spec.ts +++ b/lib/core/datatable/directives/loading-template.directive.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { DataTableComponent } from '../components/datatable/datatable.component'; import { LoadingContentTemplateDirective } from './loading-template.directive'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; describe('LoadingContentTemplateDirective', () => { diff --git a/lib/core/datatable/directives/no-content-template.directive.spec.ts b/lib/core/datatable/directives/no-content-template.directive.spec.ts index 27df876a5b..78a9d219cf 100644 --- a/lib/core/datatable/directives/no-content-template.directive.spec.ts +++ b/lib/core/datatable/directives/no-content-template.directive.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { DataTableComponent } from '../components/datatable/datatable.component'; import { NoContentTemplateDirective } from './no-content-template.directive'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; describe('NoContentTemplateDirective', () => { diff --git a/lib/core/datatable/directives/no-permission-template.directive.spec.ts b/lib/core/datatable/directives/no-permission-template.directive.spec.ts index b87d11a79e..7379d03cca 100644 --- a/lib/core/datatable/directives/no-permission-template.directive.spec.ts +++ b/lib/core/datatable/directives/no-permission-template.directive.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { DataTableComponent } from '../components/datatable/datatable.component'; import { NoPermissionTemplateDirective } from './no-permission-template.directive'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; describe('NoPermissionTemplateDirective', () => { diff --git a/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts b/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts index 549e2c90dd..ce964aea26 100755 --- a/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts +++ b/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { DownloadZipDialogComponent } from './download-zip.dialog'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { DownloadZipService } from '../../services/download-zip.service'; import { Observable } from 'rxjs/index'; diff --git a/lib/core/directives/check-allowable-operation.directive.spec.ts b/lib/core/directives/check-allowable-operation.directive.spec.ts index 64ae74c23e..56d0358ab2 100644 --- a/lib/core/directives/check-allowable-operation.directive.spec.ts +++ b/lib/core/directives/check-allowable-operation.directive.spec.ts @@ -18,7 +18,7 @@ import { ChangeDetectorRef, Component, ElementRef, SimpleChange } from '@angular/core'; import { ContentService } from './../services/content.service'; import { CheckAllowableOperationDirective, NodeAllowableOperationSubject } from './check-allowable-operation.directive'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { TestBed } from '@angular/core/testing'; diff --git a/lib/core/directives/highlight.directive.spec.ts b/lib/core/directives/highlight.directive.spec.ts index b89b3f3c4b..86c1a06e2b 100644 --- a/lib/core/directives/highlight.directive.spec.ts +++ b/lib/core/directives/highlight.directive.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { HighlightTransformService } from '../services/highlight-transform.service'; import { HighlightDirective } from './highlight.directive'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; /* spellchecker: disable */ diff --git a/lib/core/directives/logout.directive.spec.ts b/lib/core/directives/logout.directive.spec.ts index 0fa406955d..703f381eed 100644 --- a/lib/core/directives/logout.directive.spec.ts +++ b/lib/core/directives/logout.directive.spec.ts @@ -21,7 +21,7 @@ import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of, throwError } from 'rxjs'; import { AuthenticationService } from '../services'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { LogoutDirective } from './logout.directive'; diff --git a/lib/core/directives/node-delete.directive.spec.ts b/lib/core/directives/node-delete.directive.spec.ts index 10805546d6..e289cc8851 100644 --- a/lib/core/directives/node-delete.directive.spec.ts +++ b/lib/core/directives/node-delete.directive.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AlfrescoApiService } from '../services/alfresco-api.service'; import { NodeDeleteDirective } from './node-delete.directive'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; import { TranslationService } from '../services/translation.service'; diff --git a/lib/core/directives/node-download.directive.spec.ts b/lib/core/directives/node-download.directive.spec.ts index 24ebe01f71..cb8a6ea9ce 100755 --- a/lib/core/directives/node-download.directive.spec.ts +++ b/lib/core/directives/node-download.directive.spec.ts @@ -19,7 +19,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MatDialog } from '@angular/material'; import { Component, DebugElement } from '@angular/core'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { DialogModule } from '../dialogs/dialog.module'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/directives/node-favorite.directive.spec.ts b/lib/core/directives/node-favorite.directive.spec.ts index f20dd37440..9d2ee726dc 100644 --- a/lib/core/directives/node-favorite.directive.spec.ts +++ b/lib/core/directives/node-favorite.directive.spec.ts @@ -20,7 +20,7 @@ import { fakeAsync, tick } from '@angular/core/testing'; import { NodeFavoriteDirective } from './node-favorite.directive'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; import { AppConfigService } from '../app-config/app-config.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { StorageService } from '../services/storage.service'; diff --git a/lib/core/directives/node-restore.directive.spec.ts b/lib/core/directives/node-restore.directive.spec.ts index 1883f42b42..40b1d463a9 100644 --- a/lib/core/directives/node-restore.directive.spec.ts +++ b/lib/core/directives/node-restore.directive.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AlfrescoApiService } from '../services/alfresco-api.service'; import { NodeRestoreDirective } from './node-restore.directive'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/form-field/form-field.component.spec.ts b/lib/core/form/components/form-field/form-field.component.spec.ts index 6f8b0c76aa..586a230970 100644 --- a/lib/core/form/components/form-field/form-field.component.spec.ts +++ b/lib/core/form/components/form-field/form-field.component.spec.ts @@ -20,7 +20,7 @@ import { FormRenderingService } from './../../services/form-rendering.service'; import { FormFieldModel, FormFieldTypes, FormModel } from './../widgets/core/index'; import { TextWidgetComponent, CheckboxWidgetComponent } from '../widgets/index'; import { FormFieldComponent } from './form-field.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreModule } from '../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/form-list.component.spec.ts b/lib/core/form/components/form-list.component.spec.ts index e72a47ba90..5c899c5e26 100644 --- a/lib/core/form/components/form-list.component.spec.ts +++ b/lib/core/form/components/form-list.component.spec.ts @@ -20,7 +20,7 @@ import { TranslationService, TranslationMock } from '../../index'; import { of } from 'rxjs'; import { FormService } from '../services/form.service'; import { FormListComponent } from './form-list.component'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/amount/amount.widget.spec.ts b/lib/core/form/components/widgets/amount/amount.widget.spec.ts index 5b825d1da5..0e37492012 100644 --- a/lib/core/form/components/widgets/amount/amount.widget.spec.ts +++ b/lib/core/form/components/widgets/amount/amount.widget.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormFieldModel } from './../core/form-field.model'; import { AmountWidgetComponent, ADF_AMOUNT_SETTINGS } from './amount.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/checkbox/checkbox.widget.spec.ts b/lib/core/form/components/widgets/checkbox/checkbox.widget.spec.ts index 05900920e1..970c435751 100644 --- a/lib/core/form/components/widgets/checkbox/checkbox.widget.spec.ts +++ b/lib/core/form/components/widgets/checkbox/checkbox.widget.spec.ts @@ -20,7 +20,7 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormFieldModel } from '../core/form-field.model'; import { FormModel } from '../core/form.model'; import { CheckboxWidgetComponent } from './checkbox.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { FormBaseModule } from 'core/form/form-base.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateService, TranslateStore, TranslateLoader } from '@ngx-translate/core'; diff --git a/lib/core/form/components/widgets/container/container.widget.spec.ts b/lib/core/form/components/widgets/container/container.widget.spec.ts index 9a98ebc028..8f6e1fb810 100644 --- a/lib/core/form/components/widgets/container/container.widget.spec.ts +++ b/lib/core/form/components/widgets/container/container.widget.spec.ts @@ -23,7 +23,7 @@ import { FormFieldModel } from './../core/form-field.model'; import { FormModel } from './../core/form.model'; import { ContainerWidgetComponent } from './container.widget'; import { ContainerWidgetComponentModel } from './container.widget.model'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/content/content.widget.spec.ts b/lib/core/form/components/widgets/content/content.widget.spec.ts index 8ae26aa2f6..cbb7c5f5f3 100644 --- a/lib/core/form/components/widgets/content/content.widget.spec.ts +++ b/lib/core/form/components/widgets/content/content.widget.spec.ts @@ -24,7 +24,7 @@ import { of } from 'rxjs'; import { ProcessContentService } from '../../../services/process-content.service'; import { ContentLinkModel } from '../index'; import { ContentWidgetComponent } from './content.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslationMock } from '../../../../mock/translation.service.mock'; diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.spec.ts b/lib/core/form/components/widgets/date-time/date-time.widget.spec.ts index aca2a7b4cd..7dc7e1404e 100644 --- a/lib/core/form/components/widgets/date-time/date-time.widget.spec.ts +++ b/lib/core/form/components/widgets/date-time/date-time.widget.spec.ts @@ -20,7 +20,7 @@ import moment from 'moment-es6'; import { FormFieldModel } from './../core/form-field.model'; import { FormModel } from './../core/form.model'; import { DateTimeWidgetComponent } from './date-time.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.ts b/lib/core/form/components/widgets/date-time/date-time.widget.ts index 5462bc0921..af78661b2d 100644 --- a/lib/core/form/components/widgets/date-time/date-time.widget.ts +++ b/lib/core/form/components/widgets/date-time/date-time.widget.ts @@ -24,7 +24,7 @@ import { MomentDatetimeAdapter, MAT_MOMENT_DATETIME_FORMATS } from '@mat-datetim import moment from 'moment-es6'; import { Moment } from 'moment'; import { UserPreferencesService, UserPreferenceValues } from '../../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../../utils/momentDateAdapter'; +import { MomentDateAdapter } from '../../../../utils/moment-date-adapter'; import { MOMENT_DATE_FORMATS } from '../../../../utils/moment-date-formats.model'; import { FormService } from './../../../services/form.service'; import { WidgetComponent } from './../widget.component'; diff --git a/lib/core/form/components/widgets/date/date.widget.spec.ts b/lib/core/form/components/widgets/date/date.widget.spec.ts index 3f94065877..6edfcebe9f 100644 --- a/lib/core/form/components/widgets/date/date.widget.spec.ts +++ b/lib/core/form/components/widgets/date/date.widget.spec.ts @@ -20,7 +20,7 @@ import moment from 'moment-es6'; import { FormFieldModel } from './../core/form-field.model'; import { FormModel } from './../core/form.model'; import { DateWidgetComponent } from './date.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/date/date.widget.ts b/lib/core/form/components/widgets/date/date.widget.ts index 4f8966de88..741a1e72e8 100644 --- a/lib/core/form/components/widgets/date/date.widget.ts +++ b/lib/core/form/components/widgets/date/date.widget.ts @@ -18,7 +18,7 @@ /* tslint:disable:component-selector */ import { UserPreferencesService, UserPreferenceValues } from '../../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../../utils/momentDateAdapter'; +import { MomentDateAdapter } from '../../../../utils/moment-date-adapter'; import { MOMENT_DATE_FORMATS } from '../../../../utils/moment-date-formats.model'; import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; diff --git a/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts b/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts index 075cd70bf8..26f43fb429 100644 --- a/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts +++ b/lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts @@ -24,7 +24,7 @@ import { FormFieldOption } from './../core/form-field-option'; import { FormFieldModel } from './../core/form-field.model'; import { FormModel } from './../core/form.model'; import { DropdownWidgetComponent } from './dropdown.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.spec.ts b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.spec.ts index 539b13e4ed..efcf0b386b 100644 --- a/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.spec.ts +++ b/lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.spec.ts @@ -23,7 +23,7 @@ import { DynamicTableColumn } from './dynamic-table-column.model'; import { DynamicTableRow } from './dynamic-table-row.model'; import { DynamicTableWidgetComponent } from './dynamic-table.widget'; import { DynamicTableModel } from './dynamic-table.widget.model'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.spec.ts b/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.spec.ts index d1c8b782c4..120d5a3949 100644 --- a/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.spec.ts +++ b/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.spec.ts @@ -21,7 +21,7 @@ import { DynamicTableColumn } from './../../dynamic-table-column.model'; import { DynamicTableRow } from './../../dynamic-table-row.model'; import { DynamicTableModel } from './../../dynamic-table.widget.model'; import { DateEditorComponent } from './date.editor'; -import { setupTestBed } from '../../../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; diff --git a/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.ts b/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.ts index d0ab7bf034..d8cf8d8f34 100644 --- a/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.ts +++ b/lib/core/form/components/widgets/dynamic-table/editors/date/date.editor.ts @@ -19,7 +19,7 @@ import { UserPreferencesService, UserPreferenceValues } from '../../../../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../../../../utils/momentDateAdapter'; +import { MomentDateAdapter } from '../../../../../../utils/moment-date-adapter'; import { MOMENT_DATE_FORMATS } from '../../../../../../utils/moment-date-formats.model'; import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS, MatDatepickerInputEvent } from '@angular/material'; diff --git a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts index e1a0dfa3e0..b6a4b6f184 100644 --- a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts +++ b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts @@ -22,7 +22,7 @@ import { DynamicTableColumn } from './../../dynamic-table-column.model'; import { DynamicTableRow } from './../../dynamic-table-row.model'; import { DynamicTableModel } from './../../dynamic-table.widget.model'; import { DateTimeEditorComponent } from './datetime.editor'; -import { setupTestBed } from '../../../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts index 3fb5ece2ae..e0997656bd 100644 --- a/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts +++ b/lib/core/form/components/widgets/dynamic-table/editors/datetime/datetime.editor.ts @@ -18,7 +18,7 @@ /* tslint:disable:component-selector */ import { UserPreferencesService, UserPreferenceValues } from '../../../../../../services/user-preferences.service'; -import { MomentDateAdapter } from '../../../../../../utils/momentDateAdapter'; +import { MomentDateAdapter } from '../../../../../../utils/moment-date-adapter'; import { MOMENT_DATE_FORMATS } from '../../../../../../utils/moment-date-formats.model'; import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; diff --git a/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts index 8c54da4e9a..07d6b9a23b 100644 --- a/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts +++ b/lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts @@ -25,7 +25,7 @@ import { DynamicTableColumn } from './../../dynamic-table-column.model'; import { DynamicTableRow } from './../../dynamic-table-row.model'; import { DynamicTableModel } from './../../dynamic-table.widget.model'; import { DropdownEditorComponent } from './dropdown.editor'; -import { setupTestBed } from '../../../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.spec.ts b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.spec.ts index 322e180390..1f37283db6 100644 --- a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.spec.ts +++ b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.spec.ts @@ -22,7 +22,7 @@ import { TranslateModule, TranslateStore, TranslateService } from '@ngx-translat import { WidgetComponent } from './../widget.component'; import { TranslationService } from '../../../../services'; import { HyperlinkWidgetComponent } from './hyperlink.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { TranslationMock } from '../../../../mock/translation.service.mock'; import { HttpClientModule } from '@angular/common/http'; diff --git a/lib/core/form/components/widgets/people/people.widget.spec.ts b/lib/core/form/components/widgets/people/people.widget.spec.ts index 1f7d0c6cc9..3d49bd7b9c 100644 --- a/lib/core/form/components/widgets/people/people.widget.spec.ts +++ b/lib/core/form/components/widgets/people/people.widget.spec.ts @@ -24,7 +24,7 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormFieldModel } from '../core/form-field.model'; import { FormModel } from '../core/form.model'; import { PeopleWidgetComponent } from './people.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateService } from '@ngx-translate/core'; diff --git a/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts b/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts index a7bc65598d..f12626af04 100644 --- a/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -24,7 +24,7 @@ import { FormFieldOption } from './../core/form-field-option'; import { FormFieldModel } from './../core/form-field.model'; import { FormModel } from './../core/form.model'; import { RadioButtonsWidgetComponent } from './radio-buttons.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/tabs/tabs.widget.spec.ts b/lib/core/form/components/widgets/tabs/tabs.widget.spec.ts index 4ad18e38ea..97476e3b78 100644 --- a/lib/core/form/components/widgets/tabs/tabs.widget.spec.ts +++ b/lib/core/form/components/widgets/tabs/tabs.widget.spec.ts @@ -21,7 +21,7 @@ import { FormFieldModel } from '../core/form-field.model'; import { FormModel } from '../core/form.model'; import { TabModel } from '../core/tab.model'; import { TabsWidgetComponent } from './tabs.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslationService } from '../../../../services/translation.service'; diff --git a/lib/core/form/components/widgets/text/text.widget.spec.ts b/lib/core/form/components/widgets/text/text.widget.spec.ts index 4f3f2cc38f..79a0a4b547 100644 --- a/lib/core/form/components/widgets/text/text.widget.spec.ts +++ b/lib/core/form/components/widgets/text/text.widget.spec.ts @@ -20,7 +20,7 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormFieldModel } from '../core/form-field.model'; import { FormModel } from '../core/form.model'; import { TextWidgetComponent } from './text.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts b/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts index e577445192..66b53b7b4e 100644 --- a/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts +++ b/lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts @@ -25,7 +25,7 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormFieldModel } from '../core/form-field.model'; import { FormModel } from '../core/form.model'; import { TypeaheadWidgetComponent } from './typeahead.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateService } from '@ngx-translate/core'; diff --git a/lib/core/form/components/widgets/upload/upload.widget.spec.ts b/lib/core/form/components/widgets/upload/upload.widget.spec.ts index 9fbd5f0039..fa9b067d73 100644 --- a/lib/core/form/components/widgets/upload/upload.widget.spec.ts +++ b/lib/core/form/components/widgets/upload/upload.widget.spec.ts @@ -25,7 +25,7 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormModel } from '../core/form.model'; import { FormFieldModel } from './../core/form-field.model'; import { UploadWidgetComponent } from './upload.widget'; -import { setupTestBed } from '../../../../testing/setupTestBed'; +import { setupTestBed } from '../../../../testing/setup-test-bed'; import { CoreModule } from '../../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/components/widgets/widget.component.spec.ts b/lib/core/form/components/widgets/widget.component.spec.ts index 97ff34825f..b55b63fc08 100644 --- a/lib/core/form/components/widgets/widget.component.spec.ts +++ b/lib/core/form/components/widgets/widget.component.spec.ts @@ -19,7 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormFieldModel } from './core/form-field.model'; import { FormModel } from './core/form.model'; import { WidgetComponent } from './widget.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreModule } from '../../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/services/ecm-model.service.spec.ts b/lib/core/form/services/ecm-model.service.spec.ts index ca1664fb6c..548f9516b6 100644 --- a/lib/core/form/services/ecm-model.service.spec.ts +++ b/lib/core/form/services/ecm-model.service.spec.ts @@ -18,7 +18,7 @@ import { Observable } from 'rxjs'; import { FormModel } from './../components/widgets/core/form.model'; import { EcmModelService } from './ecm-model.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { TestBed } from '@angular/core/testing'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; diff --git a/lib/core/form/services/form.service.spec.ts b/lib/core/form/services/form.service.spec.ts index 7cc56b5364..5bce67a941 100644 --- a/lib/core/form/services/form.service.spec.ts +++ b/lib/core/form/services/form.service.spec.ts @@ -20,7 +20,7 @@ import { Response, ResponseOptions } from '@angular/http'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { formModelTabs, AlfrescoApiServiceMock } from '../../mock'; import { FormService } from './form.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/form/services/node.service.spec.ts b/lib/core/form/services/node.service.spec.ts index 96bf6da487..39d574668c 100644 --- a/lib/core/form/services/node.service.spec.ts +++ b/lib/core/form/services/node.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { NodeMetadata } from '../models/node-metadata.model'; import { EcmModelService } from './ecm-model.service'; import { NodeService } from './node.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; diff --git a/lib/core/form/services/process-content.service.spec.ts b/lib/core/form/services/process-content.service.spec.ts index 148048cf98..b2595bc476 100644 --- a/lib/core/form/services/process-content.service.spec.ts +++ b/lib/core/form/services/process-content.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { ProcessContentService } from './process-content.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; diff --git a/lib/core/form/services/widget-visibility-cloud.service.spec.ts b/lib/core/form/services/widget-visibility-cloud.service.spec.ts index e5a799b7e5..10b4f38dcd 100644 --- a/lib/core/form/services/widget-visibility-cloud.service.spec.ts +++ b/lib/core/form/services/widget-visibility-cloud.service.spec.ts @@ -26,7 +26,7 @@ import { import { TaskProcessVariableModel } from './../models/task-process-variable.model'; import { WidgetVisibilityModel, WidgetTypeEnum } from './../models/widget-visibility.model'; import { WidgetVisibilityService } from './widget-visibility.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; diff --git a/lib/core/form/services/widget-visibility.service.spec.ts b/lib/core/form/services/widget-visibility.service.spec.ts index da9bfe2d0f..59daa792ca 100644 --- a/lib/core/form/services/widget-visibility.service.spec.ts +++ b/lib/core/form/services/widget-visibility.service.spec.ts @@ -26,7 +26,7 @@ import { import { TaskProcessVariableModel } from './../models/task-process-variable.model'; import { WidgetVisibilityModel } from './../models/widget-visibility.model'; import { WidgetVisibilityService } from './widget-visibility.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; diff --git a/lib/core/info-drawer/info-drawer.component.spec.ts b/lib/core/info-drawer/info-drawer.component.spec.ts index e69ee72e03..424561e159 100644 --- a/lib/core/info-drawer/info-drawer.component.spec.ts +++ b/lib/core/info-drawer/info-drawer.component.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatTabChangeEvent } from '@angular/material'; import { By } from '@angular/platform-browser'; import { InfoDrawerComponent } from './info-drawer.component'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; diff --git a/lib/core/language-menu/language-menu.component.spec.ts b/lib/core/language-menu/language-menu.component.spec.ts index 9d9432e34d..a1a99919fe 100644 --- a/lib/core/language-menu/language-menu.component.spec.ts +++ b/lib/core/language-menu/language-menu.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { LanguageMenuComponent } from './language-menu.component'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { UserPreferencesService } from '../services/user-preferences.service'; diff --git a/lib/core/layout/components/header/header.component.spec.ts b/lib/core/layout/components/header/header.component.spec.ts index 1a9a8c8f35..dec3b8c3a9 100644 --- a/lib/core/layout/components/header/header.component.spec.ts +++ b/lib/core/layout/components/header/header.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HeaderLayoutComponent } from './header.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { By } from '@angular/platform-browser'; import { LayoutModule } from '../..'; diff --git a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts index 2d4b873cdf..95c11a6ee9 100644 --- a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts +++ b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts @@ -19,7 +19,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../../../material.module'; import { SidebarActionMenuComponent } from './sidebar-action-menu.component'; -import { setupTestBed } from '../../../testing/setupTestBed'; +import { setupTestBed } from '../../../testing/setup-test-bed'; import { CoreTestingModule } from '../../../testing/core.testing.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/login/components/login-dialog-panel.component.spec.ts b/lib/core/login/components/login-dialog-panel.component.spec.ts index afd3b4ea69..9e8b2e062e 100644 --- a/lib/core/login/components/login-dialog-panel.component.spec.ts +++ b/lib/core/login/components/login-dialog-panel.component.spec.ts @@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AuthenticationService } from '../../services/authentication.service'; import { LoginDialogPanelComponent } from './login-dialog-panel.component'; import { of } from 'rxjs'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; describe('LoginDialogPanelComponent', () => { diff --git a/lib/core/login/components/login.component.spec.ts b/lib/core/login/components/login.component.spec.ts index 3019afc7c2..b81e5c9e3b 100644 --- a/lib/core/login/components/login.component.spec.ts +++ b/lib/core/login/components/login.component.spec.ts @@ -29,7 +29,7 @@ import { of, throwError } from 'rxjs'; import { OauthConfigModel } from '../../models/oauth-config.model'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { Observable } from 'rxjs/index'; diff --git a/lib/core/login/directives/login-footer.directive.spec.ts b/lib/core/login/directives/login-footer.directive.spec.ts index 25a2854cf1..c7207b218a 100644 --- a/lib/core/login/directives/login-footer.directive.spec.ts +++ b/lib/core/login/directives/login-footer.directive.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { LoginComponent } from '../components/login.component'; import { LoginFooterDirective } from './login-footer.directive'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; describe('LoginFooterDirective', () => { diff --git a/lib/core/login/directives/login-header.directive.spec.ts b/lib/core/login/directives/login-header.directive.spec.ts index c2fa6a7451..c0fe3eb91d 100644 --- a/lib/core/login/directives/login-header.directive.spec.ts +++ b/lib/core/login/directives/login-header.directive.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { LoginComponent } from '../components/login.component'; import { LoginHeaderDirective } from './login-header.directive'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; describe('LoginHeaderDirective', () => { diff --git a/lib/core/mock/AlfrescoApi.mock.ts b/lib/core/mock/alfresco-api.mock.ts similarity index 100% rename from lib/core/mock/AlfrescoApi.mock.ts rename to lib/core/mock/alfresco-api.mock.ts diff --git a/lib/core/mock/form/formDefinitionReadonly.mock.ts b/lib/core/mock/form/form-definition-readonly.mock.ts similarity index 100% rename from lib/core/mock/form/formDefinitionReadonly.mock.ts rename to lib/core/mock/form/form-definition-readonly.mock.ts diff --git a/lib/core/mock/form/formDefinitionVisibility.mock.ts b/lib/core/mock/form/form-definition-visibility.mock.ts similarity index 100% rename from lib/core/mock/form/formDefinitionVisibility.mock.ts rename to lib/core/mock/form/form-definition-visibility.mock.ts diff --git a/lib/core/mock/form/formDefinition.mock.ts b/lib/core/mock/form/form-definition.mock.ts similarity index 100% rename from lib/core/mock/form/formDefinition.mock.ts rename to lib/core/mock/form/form-definition.mock.ts diff --git a/lib/core/mock/public-api.ts b/lib/core/mock/public-api.ts index 758ec9ea81..34714f6134 100644 --- a/lib/core/mock/public-api.ts +++ b/lib/core/mock/public-api.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -export * from './AlfrescoApi.mock'; +export * from './alfresco-api.mock'; export * from './app-config.service.mock'; export * from './apps-service.mock'; export * from './authentication.service.mock'; @@ -24,15 +24,15 @@ export * from './comment-process-service.mock'; export * from './cookie.service.mock'; export * from './ecm-user.service.mock'; export * from './event.mock'; -export * from './renditionsService.mock'; +export * from './renditions-service.mock'; export * from './search.service.mock'; export * from './translation.service.mock'; export * from './alfresco-api.service.mock'; export * from './form/form.component.mock'; -export * from './form/formDefinition.mock'; -export * from './form/formDefinitionReadonly.mock'; -export * from './form/formDefinitionVisibility.mock'; +export * from './form/form-definition.mock'; +export * from './form/form-definition-readonly.mock'; +export * from './form/form-definition-visibility.mock'; export * from './form/start-form.component.mock'; export * from './form/form.service.mock'; export * from './form/widget-visibility.service.mock'; diff --git a/lib/core/mock/renditionsService.mock.ts b/lib/core/mock/renditions-service.mock.ts similarity index 100% rename from lib/core/mock/renditionsService.mock.ts rename to lib/core/mock/renditions-service.mock.ts diff --git a/lib/core/notifications/components/notification-history.component.spec.ts b/lib/core/notifications/components/notification-history.component.spec.ts index 33d27dc046..9697f83a0b 100644 --- a/lib/core/notifications/components/notification-history.component.spec.ts +++ b/lib/core/notifications/components/notification-history.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { NotificationHistoryComponent } from './notification-history.component'; import { OverlayContainer } from '@angular/cdk/overlay'; diff --git a/lib/core/notifications/services/notification.service.spec.ts b/lib/core/notifications/services/notification.service.spec.ts index d9664c47ed..5ce6f415e9 100644 --- a/lib/core/notifications/services/notification.service.spec.ts +++ b/lib/core/notifications/services/notification.service.spec.ts @@ -26,7 +26,7 @@ import { NotificationService } from './notification.service'; import { TranslationMock } from '../../mock/translation.service.mock'; import { TranslationService } from '../../services/translation.service'; import { HttpClientModule } from '@angular/common/http'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; @Component({ template: '', diff --git a/lib/core/pagination/infinite-pagination.component.spec.ts b/lib/core/pagination/infinite-pagination.component.spec.ts index cc8434618b..477ac0bdf5 100644 --- a/lib/core/pagination/infinite-pagination.component.spec.ts +++ b/lib/core/pagination/infinite-pagination.component.spec.ts @@ -21,7 +21,7 @@ import { Pagination } from '@alfresco/js-api'; import { InfinitePaginationComponent } from './infinite-pagination.component'; import { PaginatedComponent } from './paginated-component.interface'; import { BehaviorSubject } from 'rxjs'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { Component, ChangeDetectorRef } from '@angular/core'; import { PaginationModel } from '../models/pagination.model'; diff --git a/lib/core/pagination/pagination.component.spec.ts b/lib/core/pagination/pagination.component.spec.ts index 744d294633..9542f494a5 100644 --- a/lib/core/pagination/pagination.component.spec.ts +++ b/lib/core/pagination/pagination.component.spec.ts @@ -21,7 +21,7 @@ import { Pagination } from '@alfresco/js-api'; import { PaginationComponent } from './pagination.component'; import { PaginatedComponent } from './paginated-component.interface'; import { BehaviorSubject } from 'rxjs'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; class FakePaginationInput implements Pagination { diff --git a/lib/core/pipes/decimal-number.pipe.spec.ts b/lib/core/pipes/decimal-number.pipe.spec.ts index 03d1e62772..feaa92b53f 100644 --- a/lib/core/pipes/decimal-number.pipe.spec.ts +++ b/lib/core/pipes/decimal-number.pipe.spec.ts @@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { UserPreferencesService } from '../services/user-preferences.service'; import { of } from 'rxjs'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { DecimalNumberPipe } from './decimal-number.pipe'; diff --git a/lib/core/pipes/localized-date.pipe.spec.ts b/lib/core/pipes/localized-date.pipe.spec.ts index 71bf2ab9a7..934b1507e6 100644 --- a/lib/core/pipes/localized-date.pipe.spec.ts +++ b/lib/core/pipes/localized-date.pipe.spec.ts @@ -20,7 +20,7 @@ import { async, TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { UserPreferencesService } from '../services/user-preferences.service'; import { of } from 'rxjs'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { registerLocaleData } from '@angular/common'; import localeFr from '@angular/common/locales/fr'; diff --git a/lib/core/pipes/time-ago.pipe.spec.ts b/lib/core/pipes/time-ago.pipe.spec.ts index 07d70a439d..53fd3a9f05 100644 --- a/lib/core/pipes/time-ago.pipe.spec.ts +++ b/lib/core/pipes/time-ago.pipe.spec.ts @@ -19,7 +19,7 @@ import { TimeAgoPipe } from './time-ago.pipe'; import { async, TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { UserPreferencesService } from '../services/user-preferences.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { of } from 'rxjs'; diff --git a/lib/core/services/apps-process.service.spec.ts b/lib/core/services/apps-process.service.spec.ts index 953a4709bc..9f014dab8c 100644 --- a/lib/core/services/apps-process.service.spec.ts +++ b/lib/core/services/apps-process.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { fakeApps } from '../mock/apps-service.mock'; import { AppsProcessService } from './apps-process.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; declare let jasmine: any; diff --git a/lib/core/services/auth-guard-bpm.service.spec.ts b/lib/core/services/auth-guard-bpm.service.spec.ts index 88161cfbad..d10bfd7394 100644 --- a/lib/core/services/auth-guard-bpm.service.spec.ts +++ b/lib/core/services/auth-guard-bpm.service.spec.ts @@ -20,7 +20,7 @@ import { AppConfigService } from '../app-config/app-config.service'; import { AuthGuardBpm } from './auth-guard-bpm.service'; import { AuthenticationService } from './authentication.service'; import { RouterStateSnapshot, Router } from '@angular/router'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { MatDialog } from '@angular/material'; diff --git a/lib/core/services/auth-guard-ecm.service.spec.ts b/lib/core/services/auth-guard-ecm.service.spec.ts index 6521229188..ebd82bb627 100644 --- a/lib/core/services/auth-guard-ecm.service.spec.ts +++ b/lib/core/services/auth-guard-ecm.service.spec.ts @@ -20,7 +20,7 @@ import { AppConfigService } from '../app-config/app-config.service'; import { AuthGuardEcm } from './auth-guard-ecm.service'; import { AuthenticationService } from './authentication.service'; import { RouterStateSnapshot, Router } from '@angular/router'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { MatDialog } from '@angular/material'; diff --git a/lib/core/services/auth-guard-sso-role.service.spec.ts b/lib/core/services/auth-guard-sso-role.service.spec.ts index 7e215475d9..ab0acc0e43 100644 --- a/lib/core/services/auth-guard-sso-role.service.spec.ts +++ b/lib/core/services/auth-guard-sso-role.service.spec.ts @@ -17,7 +17,7 @@ import { async, TestBed } from '@angular/core/testing'; import { ActivatedRouteSnapshot, Router } from '@angular/router'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AuthGuardSsoRoleService } from './auth-guard-sso-role.service'; import { JwtHelperService } from './jwt-helper.service'; diff --git a/lib/core/services/auth-guard.service.spec.ts b/lib/core/services/auth-guard.service.spec.ts index 005f604b22..75bd0f819f 100644 --- a/lib/core/services/auth-guard.service.spec.ts +++ b/lib/core/services/auth-guard.service.spec.ts @@ -20,7 +20,7 @@ import { Router, RouterStateSnapshot } from '@angular/router'; import { AppConfigService } from '../app-config/app-config.service'; import { AuthGuard } from './auth-guard.service'; import { AuthenticationService } from './authentication.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; describe('AuthGuardService', () => { diff --git a/lib/core/services/authentication.service.spec.ts b/lib/core/services/authentication.service.spec.ts index 05dc1e727e..172f718af1 100644 --- a/lib/core/services/authentication.service.spec.ts +++ b/lib/core/services/authentication.service.spec.ts @@ -20,7 +20,7 @@ import { AlfrescoApiService } from './alfresco-api.service'; import { AuthenticationService } from './authentication.service'; import { CookieService } from './cookie.service'; import { AppConfigService } from '../app-config/app-config.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { UserRepresentation } from '@alfresco/js-api'; diff --git a/lib/core/services/bpm-user.service.spec.ts b/lib/core/services/bpm-user.service.spec.ts index 30ef108147..4f12182ad4 100644 --- a/lib/core/services/bpm-user.service.spec.ts +++ b/lib/core/services/bpm-user.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { BpmUserModel } from '../models/bpm-user.model'; import { BpmUserService } from '../services/bpm-user.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/services/comment-content.service.spec.ts b/lib/core/services/comment-content.service.spec.ts index c6eccd6baa..ec94153032 100644 --- a/lib/core/services/comment-content.service.spec.ts +++ b/lib/core/services/comment-content.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { CommentModel } from '../models/comment.model'; import { fakeContentComment, fakeContentComments } from '../mock/comment-content-service.mock'; import { CommentContentService } from './comment-content.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; declare let jasmine: any; diff --git a/lib/core/services/comment-process.service.spec.ts b/lib/core/services/comment-process.service.spec.ts index 0fe68bc925..ee38fbf6e7 100644 --- a/lib/core/services/comment-process.service.spec.ts +++ b/lib/core/services/comment-process.service.spec.ts @@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing'; import { CommentModel } from '../models/comment.model'; import { fakeProcessComment, fakeTasksComment, fakeUser1 } from '../mock/comment-process-service.mock'; import { CommentProcessService } from './comment-process.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { AlfrescoApiService } from './alfresco-api.service'; import { CoreTestingModule } from '../testing/core.testing.module'; diff --git a/lib/core/services/content.service.spec.ts b/lib/core/services/content.service.spec.ts index 8efdf830a5..6dea313e8e 100644 --- a/lib/core/services/content.service.spec.ts +++ b/lib/core/services/content.service.spec.ts @@ -22,7 +22,7 @@ import { AppConfigService } from '../app-config/app-config.service'; import { AuthenticationService } from './authentication.service'; import { CookieService } from './cookie.service'; import { StorageService } from './storage.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/services/directionality-config.service.spec.ts b/lib/core/services/directionality-config.service.spec.ts index 6605836292..b3b0405573 100644 --- a/lib/core/services/directionality-config.service.spec.ts +++ b/lib/core/services/directionality-config.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { DirectionalityConfigService } from './directionality-config.service'; import { CoreTestingModule } from '../testing/core.testing.module'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { UserPreferencesService } from './user-preferences.service'; describe('DirectionalityConfigService', () => { diff --git a/lib/core/services/discovery-api.service.spec.ts b/lib/core/services/discovery-api.service.spec.ts index d97ae0d6bc..a11c2d460b 100644 --- a/lib/core/services/discovery-api.service.spec.ts +++ b/lib/core/services/discovery-api.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model'; import { AppConfigService } from '../app-config/app-config.service'; import { DiscoveryApiService } from './discovery-api.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; declare let jasmine: any; diff --git a/lib/core/services/ecm-user.service.spec.ts b/lib/core/services/ecm-user.service.spec.ts index ed2c4bef71..9e915a627d 100644 --- a/lib/core/services/ecm-user.service.spec.ts +++ b/lib/core/services/ecm-user.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { AuthenticationService, ContentService, AlfrescoApiService } from '.'; import { fakeEcmUser } from '../mock/ecm-user.service.mock'; import { EcmUserService } from '../services/ecm-user.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/services/identity-user.service.spec.ts b/lib/core/services/identity-user.service.spec.ts index f292a16f19..94ed3822ca 100644 --- a/lib/core/services/identity-user.service.spec.ts +++ b/lib/core/services/identity-user.service.spec.ts @@ -38,7 +38,7 @@ import { mockJoinGroupRequest } from 'core/mock/identity-user.service.mock'; import { IdentityUserService } from '../services/identity-user.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiService } from './alfresco-api.service'; import { mockToken } from '../mock/jwt-helper.service.spec'; diff --git a/lib/core/services/jwt-helper.service.spec.ts b/lib/core/services/jwt-helper.service.spec.ts index 75778fba6b..2aa6d2548e 100644 --- a/lib/core/services/jwt-helper.service.spec.ts +++ b/lib/core/services/jwt-helper.service.spec.ts @@ -17,7 +17,7 @@ import { JwtHelperService } from './jwt-helper.service'; import { mockToken } from './../mock/jwt-helper.service.spec'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { TestBed } from '@angular/core/testing'; describe('JwtHelperService', () => { diff --git a/lib/core/services/lock.service.spec.ts b/lib/core/services/lock.service.spec.ts index c9328e83b6..f4f03946be 100644 --- a/lib/core/services/lock.service.spec.ts +++ b/lib/core/services/lock.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { LockService } from './lock.service'; import { CoreTestingModule } from '../testing/core.testing.module'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { Node } from '@alfresco/js-api'; import { AlfrescoApiServiceMock } from 'core/mock'; import { AlfrescoApiService } from './alfresco-api.service'; diff --git a/lib/core/services/log.service.spec.ts b/lib/core/services/log.service.spec.ts index 43f3648ca8..8ed605a92f 100644 --- a/lib/core/services/log.service.spec.ts +++ b/lib/core/services/log.service.spec.ts @@ -22,7 +22,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { LogService } from './log.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; @Component({ template: '', diff --git a/lib/core/services/login-dialog.service.spec.ts b/lib/core/services/login-dialog.service.spec.ts index e111488baf..5d32a010e2 100644 --- a/lib/core/services/login-dialog.service.spec.ts +++ b/lib/core/services/login-dialog.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { MatDialog } from '@angular/material'; import { LoginDialogService } from './login-dialog.service'; import { Subject, of } from 'rxjs'; diff --git a/lib/core/services/page-title.service.spec.ts b/lib/core/services/page-title.service.spec.ts index 760507468e..3ee3dca00e 100644 --- a/lib/core/services/page-title.service.spec.ts +++ b/lib/core/services/page-title.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AppConfigService } from '../app-config/app-config.service'; import { PageTitleService } from './page-title.service'; diff --git a/lib/core/services/people-process.service.spec.ts b/lib/core/services/people-process.service.spec.ts index a4df9151d2..9a059eae9b 100644 --- a/lib/core/services/people-process.service.spec.ts +++ b/lib/core/services/people-process.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { UserProcessModel } from '../models'; import { PeopleProcessService } from './people-process.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; declare let jasmine: any; diff --git a/lib/core/services/renditions.service.spec.ts b/lib/core/services/renditions.service.spec.ts index f7a9a444c4..ece73f9ed5 100644 --- a/lib/core/services/renditions.service.spec.ts +++ b/lib/core/services/renditions.service.spec.ts @@ -16,9 +16,9 @@ */ import { TestBed } from '@angular/core/testing'; -import { fakeRendition, fakeRenditionCreated, fakeRenditionsList, fakeRenditionsListWithACreated } from '../mock/renditionsService.mock'; +import { fakeRendition, fakeRenditionCreated, fakeRenditionsList, fakeRenditionsListWithACreated } from '../mock/renditions-service.mock'; import { RenditionsService } from './renditions.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/services/search.service.spec.ts b/lib/core/services/search.service.spec.ts index 17351e67e2..1ab1ff4b04 100644 --- a/lib/core/services/search.service.spec.ts +++ b/lib/core/services/search.service.spec.ts @@ -20,7 +20,7 @@ import { searchMockApi, mockError, fakeSearch } from '../mock/search.service.moc import { CookieServiceMock } from './../mock/cookie.service.mock'; import { CookieService } from './cookie.service'; import { SearchService } from './search.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; diff --git a/lib/core/services/sites.service.spec.ts b/lib/core/services/sites.service.spec.ts index c18ca0cd3f..e94a572b9f 100644 --- a/lib/core/services/sites.service.spec.ts +++ b/lib/core/services/sites.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { SitesService } from './sites.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; declare let jasmine: any; diff --git a/lib/core/services/storage.service.spec.ts b/lib/core/services/storage.service.spec.ts index 8c7d8b31e7..a5c178682b 100644 --- a/lib/core/services/storage.service.spec.ts +++ b/lib/core/services/storage.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '../app-config/app-config.service'; import { StorageService } from './storage.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AppConfigServiceMock } from '../mock/app-config.service.mock'; diff --git a/lib/core/services/thumbnail.service.spec.ts b/lib/core/services/thumbnail.service.spec.ts index 3f3b9e1111..29845c40cb 100644 --- a/lib/core/services/thumbnail.service.spec.ts +++ b/lib/core/services/thumbnail.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { ThumbnailService } from './thumbnail.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AlfrescoApiService } from './alfresco-api.service'; diff --git a/lib/core/services/translate-loader.spec.ts b/lib/core/services/translate-loader.spec.ts index 424881b89b..bfc1f6f63c 100644 --- a/lib/core/services/translate-loader.spec.ts +++ b/lib/core/services/translate-loader.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { TranslateLoaderService } from './translate-loader.service'; import { TranslationService } from './translation.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreModule } from '../core.module'; declare let jasmine: any; diff --git a/lib/core/services/upload.service.spec.ts b/lib/core/services/upload.service.spec.ts index b3190ec4a7..c4b3efba9f 100644 --- a/lib/core/services/upload.service.spec.ts +++ b/lib/core/services/upload.service.spec.ts @@ -23,7 +23,7 @@ import { UploadService } from './upload.service'; import { AppConfigService } from '../app-config/app-config.service'; import { AlfrescoApiService } from './alfresco-api.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AssocChildBody, AssociationBody } from '@alfresco/js-api'; diff --git a/lib/core/services/user-preferences.service.spec.ts b/lib/core/services/user-preferences.service.spec.ts index 010044bbd2..0205cb31cb 100644 --- a/lib/core/services/user-preferences.service.spec.ts +++ b/lib/core/services/user-preferences.service.spec.ts @@ -20,7 +20,7 @@ import { TranslateService } from '@ngx-translate/core'; import { AppConfigService } from '../app-config/app-config.service'; import { StorageService } from './storage.service'; import { UserPreferencesService, UserPreferenceValues } from './user-preferences.service'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AppConfigServiceMock } from '../mock/app-config.service.mock'; import { AlfrescoApiService } from './alfresco-api.service'; diff --git a/lib/core/settings/host-settings.component.spec.ts b/lib/core/settings/host-settings.component.spec.ts index 4555adf67e..7e09a2f7e3 100644 --- a/lib/core/settings/host-settings.component.spec.ts +++ b/lib/core/settings/host-settings.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HostSettingsComponent } from './host-settings.component'; -import { setupTestBed } from '../testing/setupTestBed'; +import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AppConfigService } from '../app-config/app-config.service'; diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index 9e39f96a34..8a5b186638 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -16,10 +16,10 @@ @import '../toolbar/toolbar.component'; @import '../userinfo/components/user-info.component'; @import '../viewer/components/viewer.component'; -@import '../viewer/components/pdfViewer.component'; -@import '../viewer/components/pdfViewer-thumbnails.component'; -@import '../viewer/components/txtViewer.component'; -@import '../viewer/components/imgViewer.component'; +@import '../viewer/components/pdf-viewer.component'; +@import '../viewer/components/pdf-viewer-thumbnails.component'; +@import '../viewer/components/txt-viewer.component'; +@import '../viewer/components/img-viewer.component'; @import '../form/components/form-renderer.component'; @import '../layout/components/sidebar-action/sidebar-action-menu.component'; @import '../layout/components/header/header.component'; diff --git a/lib/core/templates/error-content/error-content.component.spec.ts b/lib/core/templates/error-content/error-content.component.spec.ts index 01a6adf9e5..23ae59d892 100644 --- a/lib/core/templates/error-content/error-content.component.spec.ts +++ b/lib/core/templates/error-content/error-content.component.spec.ts @@ -20,7 +20,7 @@ import { CoreTestingModule } from '../../testing/core.testing.module'; import { ErrorContentComponent } from './error-content.component'; import { TranslationService } from '../../services/translation.service'; import { TranslationMock } from '../../mock/translation.service.mock'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; diff --git a/lib/core/testing/index.ts b/lib/core/testing/index.ts index 9706b868d1..d13cfa51d6 100644 --- a/lib/core/testing/index.ts +++ b/lib/core/testing/index.ts @@ -15,4 +15,4 @@ * limitations under the License. */ -export * from './setupTestBed'; +export * from './setup-test-bed'; diff --git a/lib/core/testing/setupTestBed.ts b/lib/core/testing/setup-test-bed.ts similarity index 100% rename from lib/core/testing/setupTestBed.ts rename to lib/core/testing/setup-test-bed.ts diff --git a/lib/core/userinfo/components/user-info.component.spec.ts b/lib/core/userinfo/components/user-info.component.spec.ts index 9ac803969d..e87b92abd8 100644 --- a/lib/core/userinfo/components/user-info.component.spec.ts +++ b/lib/core/userinfo/components/user-info.component.spec.ts @@ -28,7 +28,7 @@ import { BpmUserModel } from '../../models/bpm-user.model'; import { EcmUserModel } from '../../models/ecm-user.model'; import { UserInfoComponent } from './user-info.component'; import { of } from 'rxjs'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; class FakeSanitizer extends DomSanitizer { diff --git a/lib/core/utils/momentDateAdapter.ts b/lib/core/utils/moment-date-adapter.ts similarity index 100% rename from lib/core/utils/momentDateAdapter.ts rename to lib/core/utils/moment-date-adapter.ts diff --git a/lib/core/utils/public-api.ts b/lib/core/utils/public-api.ts index 9302b4d895..6ec1e00e61 100644 --- a/lib/core/utils/public-api.ts +++ b/lib/core/utils/public-api.ts @@ -18,4 +18,4 @@ export * from './object-utils'; export * from './file-utils'; export * from './moment-date-formats.model'; -export * from './momentDateAdapter'; +export * from './moment-date-adapter'; diff --git a/lib/core/viewer/components/imgViewer.component.html b/lib/core/viewer/components/img-viewer.component.html similarity index 100% rename from lib/core/viewer/components/imgViewer.component.html rename to lib/core/viewer/components/img-viewer.component.html diff --git a/lib/core/viewer/components/imgViewer.component.scss b/lib/core/viewer/components/img-viewer.component.scss similarity index 100% rename from lib/core/viewer/components/imgViewer.component.scss rename to lib/core/viewer/components/img-viewer.component.scss diff --git a/lib/core/viewer/components/imgViewer.component.spec.ts b/lib/core/viewer/components/img-viewer.component.spec.ts similarity index 99% rename from lib/core/viewer/components/imgViewer.component.spec.ts rename to lib/core/viewer/components/img-viewer.component.spec.ts index 46a4430cc9..453bc89453 100644 --- a/lib/core/viewer/components/imgViewer.component.spec.ts +++ b/lib/core/viewer/components/img-viewer.component.spec.ts @@ -19,8 +19,8 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentService } from '../../services/content.service'; -import { ImgViewerComponent } from './imgViewer.component'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { ImgViewerComponent } from './img-viewer.component'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core'; diff --git a/lib/core/viewer/components/imgViewer.component.ts b/lib/core/viewer/components/img-viewer.component.ts similarity index 98% rename from lib/core/viewer/components/imgViewer.component.ts rename to lib/core/viewer/components/img-viewer.component.ts index 355ce95a14..544c0ec3cc 100644 --- a/lib/core/viewer/components/imgViewer.component.ts +++ b/lib/core/viewer/components/img-viewer.component.ts @@ -31,8 +31,8 @@ import { DomSanitizer, SafeStyle } from '@angular/platform-browser'; @Component({ selector: 'adf-img-viewer', - templateUrl: './imgViewer.component.html', - styleUrls: ['./imgViewer.component.scss'], + templateUrl: './img-viewer.component.html', + styleUrls: ['./img-viewer.component.scss'], host: { 'class': 'adf-image-viewer' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/mediaPlayer.component.html b/lib/core/viewer/components/media-player.component.html similarity index 100% rename from lib/core/viewer/components/mediaPlayer.component.html rename to lib/core/viewer/components/media-player.component.html diff --git a/lib/core/viewer/components/mediaPlayer.component.scss b/lib/core/viewer/components/media-player.component.scss similarity index 100% rename from lib/core/viewer/components/mediaPlayer.component.scss rename to lib/core/viewer/components/media-player.component.scss diff --git a/lib/core/viewer/components/mediaPlayer.component.ts b/lib/core/viewer/components/media-player.component.ts similarity index 93% rename from lib/core/viewer/components/mediaPlayer.component.ts rename to lib/core/viewer/components/media-player.component.ts index 64e4bbc58e..758a703dd3 100644 --- a/lib/core/viewer/components/mediaPlayer.component.ts +++ b/lib/core/viewer/components/media-player.component.ts @@ -20,8 +20,8 @@ import { ContentService } from '../../services/content.service'; @Component({ selector: 'adf-media-player', - templateUrl: './mediaPlayer.component.html', - styleUrls: ['./mediaPlayer.component.scss'], + templateUrl: './media-player.component.html', + styleUrls: ['./media-player.component.scss'], host: { 'class': 'adf-media-player' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/pdfViewerHost.component.scss b/lib/core/viewer/components/pdf-viewer-host.component.scss similarity index 100% rename from lib/core/viewer/components/pdfViewerHost.component.scss rename to lib/core/viewer/components/pdf-viewer-host.component.scss diff --git a/lib/core/viewer/components/pdfViewer-password-dialog.html b/lib/core/viewer/components/pdf-viewer-password-dialog.html similarity index 100% rename from lib/core/viewer/components/pdfViewer-password-dialog.html rename to lib/core/viewer/components/pdf-viewer-password-dialog.html diff --git a/lib/core/viewer/components/pdfViewer-password-dialog.scss b/lib/core/viewer/components/pdf-viewer-password-dialog.scss similarity index 100% rename from lib/core/viewer/components/pdfViewer-password-dialog.scss rename to lib/core/viewer/components/pdf-viewer-password-dialog.scss diff --git a/lib/core/viewer/components/pdfViewer-password-dialog.spec.ts b/lib/core/viewer/components/pdf-viewer-password-dialog.spec.ts similarity index 95% rename from lib/core/viewer/components/pdfViewer-password-dialog.spec.ts rename to lib/core/viewer/components/pdf-viewer-password-dialog.spec.ts index 3c72ab43dc..035b6d5144 100644 --- a/lib/core/viewer/components/pdfViewer-password-dialog.spec.ts +++ b/lib/core/viewer/components/pdf-viewer-password-dialog.spec.ts @@ -17,8 +17,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { PdfPasswordDialogComponent } from './pdfViewer-password-dialog'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/lib/core/viewer/components/pdfViewer-password-dialog.ts b/lib/core/viewer/components/pdf-viewer-password-dialog.ts similarity index 93% rename from lib/core/viewer/components/pdfViewer-password-dialog.ts rename to lib/core/viewer/components/pdf-viewer-password-dialog.ts index 6aeb638b38..9c4588c576 100644 --- a/lib/core/viewer/components/pdfViewer-password-dialog.ts +++ b/lib/core/viewer/components/pdf-viewer-password-dialog.ts @@ -23,8 +23,8 @@ declare const pdfjsLib: any; @Component({ selector: 'adf-pdf-viewer-password-dialog', - templateUrl: './pdfViewer-password-dialog.html', - styleUrls: [ './pdfViewer-password-dialog.scss' ] + templateUrl: './pdf-viewer-password-dialog.html', + styleUrls: [ './pdf-viewer-password-dialog.scss' ] }) export class PdfPasswordDialogComponent implements OnInit { passwordFormControl: FormControl; diff --git a/lib/core/viewer/components/pdfViewer-thumb.component.html b/lib/core/viewer/components/pdf-viewer-thumb.component.html similarity index 100% rename from lib/core/viewer/components/pdfViewer-thumb.component.html rename to lib/core/viewer/components/pdf-viewer-thumb.component.html diff --git a/lib/core/viewer/components/pdfViewer-thumb.component.spec.ts b/lib/core/viewer/components/pdf-viewer-thumb.component.spec.ts similarity index 94% rename from lib/core/viewer/components/pdfViewer-thumb.component.spec.ts rename to lib/core/viewer/components/pdf-viewer-thumb.component.spec.ts index 44a17d6946..cb4ab0aaf0 100644 --- a/lib/core/viewer/components/pdfViewer-thumb.component.spec.ts +++ b/lib/core/viewer/components/pdf-viewer-thumb.component.spec.ts @@ -17,8 +17,8 @@ import { DomSanitizer } from '@angular/platform-browser'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { PdfThumbComponent } from './pdfViewer-thumb.component'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { PdfThumbComponent } from './pdf-viewer-thumb.component'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; describe('PdfThumbComponent', () => { diff --git a/lib/core/viewer/components/pdfViewer-thumb.component.ts b/lib/core/viewer/components/pdf-viewer-thumb.component.ts similarity index 97% rename from lib/core/viewer/components/pdfViewer-thumb.component.ts rename to lib/core/viewer/components/pdf-viewer-thumb.component.ts index e89ae335e7..22ef6e6c61 100644 --- a/lib/core/viewer/components/pdfViewer-thumb.component.ts +++ b/lib/core/viewer/components/pdf-viewer-thumb.component.ts @@ -20,7 +20,7 @@ import { DomSanitizer } from '@angular/platform-browser'; @Component({ selector: 'adf-pdf-thumb', - templateUrl: './pdfViewer-thumb.component.html', + templateUrl: './pdf-viewer-thumb.component.html', encapsulation: ViewEncapsulation.None }) export class PdfThumbComponent implements OnInit { diff --git a/lib/core/viewer/components/pdfViewer-thumbnails.component.html b/lib/core/viewer/components/pdf-viewer-thumbnails.component.html similarity index 100% rename from lib/core/viewer/components/pdfViewer-thumbnails.component.html rename to lib/core/viewer/components/pdf-viewer-thumbnails.component.html diff --git a/lib/core/viewer/components/pdfViewer-thumbnails.component.scss b/lib/core/viewer/components/pdf-viewer-thumbnails.component.scss similarity index 100% rename from lib/core/viewer/components/pdfViewer-thumbnails.component.scss rename to lib/core/viewer/components/pdf-viewer-thumbnails.component.scss diff --git a/lib/core/viewer/components/pdfViewer-thumbnails.component.spec.ts b/lib/core/viewer/components/pdf-viewer-thumbnails.component.spec.ts similarity index 97% rename from lib/core/viewer/components/pdfViewer-thumbnails.component.spec.ts rename to lib/core/viewer/components/pdf-viewer-thumbnails.component.spec.ts index c2fea8367f..a2eb94ce83 100644 --- a/lib/core/viewer/components/pdfViewer-thumbnails.component.spec.ts +++ b/lib/core/viewer/components/pdf-viewer-thumbnails.component.spec.ts @@ -18,8 +18,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { PdfThumbListComponent } from './pdfViewer-thumbnails.component'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { PdfThumbListComponent } from './pdf-viewer-thumbnails.component'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; declare const pdfjsViewer: any; diff --git a/lib/core/viewer/components/pdfViewer-thumbnails.component.ts b/lib/core/viewer/components/pdf-viewer-thumbnails.component.ts similarity index 97% rename from lib/core/viewer/components/pdfViewer-thumbnails.component.ts rename to lib/core/viewer/components/pdf-viewer-thumbnails.component.ts index 121b25d6c2..5c1ad81112 100644 --- a/lib/core/viewer/components/pdfViewer-thumbnails.component.ts +++ b/lib/core/viewer/components/pdf-viewer-thumbnails.component.ts @@ -22,8 +22,8 @@ import { @Component({ selector: 'adf-pdf-thumbnails', - templateUrl: './pdfViewer-thumbnails.component.html', - styleUrls: ['./pdfViewer-thumbnails.component.scss'], + templateUrl: './pdf-viewer-thumbnails.component.html', + styleUrls: ['./pdf-viewer-thumbnails.component.scss'], host: { 'class': 'adf-pdf-thumbnails' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/pdfViewer.component.html b/lib/core/viewer/components/pdf-viewer.component.html similarity index 100% rename from lib/core/viewer/components/pdfViewer.component.html rename to lib/core/viewer/components/pdf-viewer.component.html diff --git a/lib/core/viewer/components/pdfViewer.component.scss b/lib/core/viewer/components/pdf-viewer.component.scss similarity index 100% rename from lib/core/viewer/components/pdfViewer.component.scss rename to lib/core/viewer/components/pdf-viewer.component.scss diff --git a/lib/core/viewer/components/pdfViewer.component.spec.ts b/lib/core/viewer/components/pdf-viewer.component.spec.ts similarity index 99% rename from lib/core/viewer/components/pdfViewer.component.spec.ts rename to lib/core/viewer/components/pdf-viewer.component.spec.ts index 89758cdf76..22c2c535de 100644 --- a/lib/core/viewer/components/pdfViewer.component.spec.ts +++ b/lib/core/viewer/components/pdf-viewer.component.spec.ts @@ -19,11 +19,11 @@ import { Component, SimpleChange, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { EventMock } from '../../mock/event.mock'; import { RenderingQueueServices } from '../services/rendering-queue.services'; -import { PdfViewerComponent } from './pdfViewer.component'; +import { PdfViewerComponent } from './pdf-viewer.component'; import { RIGHT_ARROW, LEFT_ARROW } from '@angular/cdk/keycodes'; import { MatDialog } from '@angular/material'; import { of } from 'rxjs'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { TranslationService } from '../../services/translation.service'; import { TranslationMock } from '../../mock/translation.service.mock'; diff --git a/lib/core/viewer/components/pdfViewer.component.ts b/lib/core/viewer/components/pdf-viewer.component.ts similarity index 98% rename from lib/core/viewer/components/pdfViewer.component.ts rename to lib/core/viewer/components/pdf-viewer.component.ts index 815ef9db60..e1fcff1f3b 100644 --- a/lib/core/viewer/components/pdfViewer.component.ts +++ b/lib/core/viewer/components/pdf-viewer.component.ts @@ -30,7 +30,7 @@ import { import { MatDialog } from '@angular/material'; import { LogService } from '../../services/log.service'; import { RenderingQueueServices } from '../services/rendering-queue.services'; -import { PdfPasswordDialogComponent } from './pdfViewer-password-dialog'; +import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog'; import { AppConfigService } from './../../app-config/app-config.service'; import { PDFDocumentProxy, PDFSource } from 'pdfjs-dist'; @@ -39,10 +39,10 @@ declare const pdfjsViewer: any; @Component({ selector: 'adf-pdf-viewer', - templateUrl: './pdfViewer.component.html', + templateUrl: './pdf-viewer.component.html', styleUrls: [ - './pdfViewer.component.scss', - './pdfViewerHost.component.scss' + './pdf-viewer.component.scss', + './pdf-viewer-host.component.scss' ], providers: [RenderingQueueServices], host: { 'class': 'adf-pdf-viewer' }, diff --git a/lib/core/viewer/components/txtViewer.component.html b/lib/core/viewer/components/txt-viewer.component.html similarity index 100% rename from lib/core/viewer/components/txtViewer.component.html rename to lib/core/viewer/components/txt-viewer.component.html diff --git a/lib/core/viewer/components/txtViewer.component.scss b/lib/core/viewer/components/txt-viewer.component.scss similarity index 100% rename from lib/core/viewer/components/txtViewer.component.scss rename to lib/core/viewer/components/txt-viewer.component.scss diff --git a/lib/core/viewer/components/txtViewer.component.spec.ts b/lib/core/viewer/components/txt-viewer.component.spec.ts similarity index 95% rename from lib/core/viewer/components/txtViewer.component.spec.ts rename to lib/core/viewer/components/txt-viewer.component.spec.ts index d502c02e26..0cf052b2cf 100644 --- a/lib/core/viewer/components/txtViewer.component.spec.ts +++ b/lib/core/viewer/components/txt-viewer.component.spec.ts @@ -17,8 +17,8 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TxtViewerComponent } from './txtViewer.component'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { TxtViewerComponent } from './txt-viewer.component'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; describe('Text View component', () => { diff --git a/lib/core/viewer/components/txtViewer.component.ts b/lib/core/viewer/components/txt-viewer.component.ts similarity index 96% rename from lib/core/viewer/components/txtViewer.component.ts rename to lib/core/viewer/components/txt-viewer.component.ts index 30c4b8c3f4..63c51250b6 100644 --- a/lib/core/viewer/components/txtViewer.component.ts +++ b/lib/core/viewer/components/txt-viewer.component.ts @@ -21,8 +21,8 @@ import { AppConfigService } from './../../app-config/app-config.service'; @Component({ selector: 'adf-txt-viewer', - templateUrl: './txtViewer.component.html', - styleUrls: ['./txtViewer.component.scss'], + templateUrl: './txt-viewer.component.html', + styleUrls: ['./txt-viewer.component.scss'], host: { 'class': 'adf-txt-viewer' }, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/viewer/components/viewer.component.spec.ts b/lib/core/viewer/components/viewer.component.spec.ts index c3333637de..98f49aab44 100644 --- a/lib/core/viewer/components/viewer.component.spec.ts +++ b/lib/core/viewer/components/viewer.component.spec.ts @@ -27,7 +27,7 @@ import { throwError } from 'rxjs'; import { EventMock } from '../../mock/event.mock'; import { RenderingQueueServices } from '../services/rendering-queue.services'; import { ViewerComponent } from './viewer.component'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock'; import { NodeEntry } from '@alfresco/js-api'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/lib/core/viewer/directives/viewer-extension.directive.spec.ts b/lib/core/viewer/directives/viewer-extension.directive.spec.ts index 4970b21fbe..632291dd04 100644 --- a/lib/core/viewer/directives/viewer-extension.directive.spec.ts +++ b/lib/core/viewer/directives/viewer-extension.directive.spec.ts @@ -21,7 +21,7 @@ import { ElementRef } from '@angular/core'; import { async, TestBed } from '@angular/core/testing'; import { ViewerComponent } from '../components/viewer.component'; import { ViewerExtensionDirective } from './viewer-extension.directive'; -import { setupTestBed } from '../../testing/setupTestBed'; +import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreModule } from '../../core.module'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/lib/core/viewer/public-api.ts b/lib/core/viewer/public-api.ts index f033da4d8e..5e1f6d727a 100644 --- a/lib/core/viewer/public-api.ts +++ b/lib/core/viewer/public-api.ts @@ -17,12 +17,12 @@ export * from './services/view-util.service'; export * from './components/viewer.component'; -export * from './components/imgViewer.component'; -export * from './components/mediaPlayer.component'; -export * from './components/pdfViewer.component'; -export * from './components/pdfViewer-thumbnails.component'; -export * from './components/pdfViewer-thumb.component'; -export * from './components/txtViewer.component'; +export * from './components/img-viewer.component'; +export * from './components/media-player.component'; +export * from './components/pdf-viewer.component'; +export * from './components/pdf-viewer-thumbnails.component'; +export * from './components/pdf-viewer-thumb.component'; +export * from './components/txt-viewer.component'; export * from './components/unknown-format/unknown-format.component'; export * from './components/viewer-more-actions.component'; export * from './components/viewer-open-with.component'; diff --git a/lib/core/viewer/viewer.module.ts b/lib/core/viewer/viewer.module.ts index 4a70bb4ef3..c190fd3549 100644 --- a/lib/core/viewer/viewer.module.ts +++ b/lib/core/viewer/viewer.module.ts @@ -26,13 +26,13 @@ import { ExtensionsModule } from '@alfresco/adf-extensions'; import { MaterialModule } from '../material.module'; import { ToolbarModule } from '../toolbar/toolbar.module'; import { PipeModule } from '../pipes/pipe.module'; -import { ImgViewerComponent } from './components/imgViewer.component'; -import { MediaPlayerComponent } from './components/mediaPlayer.component'; -import { PdfViewerComponent } from './components/pdfViewer.component'; -import { PdfPasswordDialogComponent } from './components/pdfViewer-password-dialog'; -import { PdfThumbComponent } from './components/pdfViewer-thumb.component'; -import { PdfThumbListComponent } from './components/pdfViewer-thumbnails.component'; -import { TxtViewerComponent } from './components/txtViewer.component'; +import { ImgViewerComponent } from './components/img-viewer.component'; +import { MediaPlayerComponent } from './components/media-player.component'; +import { PdfViewerComponent } from './components/pdf-viewer.component'; +import { PdfPasswordDialogComponent } from './components/pdf-viewer-password-dialog'; +import { PdfThumbComponent } from './components/pdf-viewer-thumb.component'; +import { PdfThumbListComponent } from './components/pdf-viewer-thumbnails.component'; +import { TxtViewerComponent } from './components/txt-viewer.component'; import { UnknownFormatComponent } from './components/unknown-format/unknown-format.component'; import { ViewerMoreActionsComponent } from './components/viewer-more-actions.component'; import { ViewerOpenWithComponent } from './components/viewer-open-with.component'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts index 3288f281e6..dd931d83be 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts @@ -18,7 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Chart } from '../../diagram/models/chart/chart.model'; -import { ReportQuery } from '../../diagram/models/report/reportQuery.model'; +import { ReportQuery } from '../../diagram/models/report/report-query.model'; import * as analyticMock from '../../mock'; import { AnalyticsGeneratorComponent } from '../components/analytics-generator.component'; import { setupTestBed } from '@alfresco/adf-core'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts index 6f92785389..f7726a57e8 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation } from '@angular/core'; -import { ReportQuery } from '../../diagram/models/report/reportQuery.model'; +import { ReportQuery } from '../../diagram/models/report/report-query.model'; import { Chart } from '../../diagram/models/chart/chart.model'; import { AnalyticsService } from '../services/analytics.service'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts index 3244c9dd3f..6a04941b80 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AnalyticsReportListComponent } from '../components/analytics-report-list.component'; -import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model'; +import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts index 3b9285296f..a2ee09fd89 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { Observable, Observer } from 'rxjs'; -import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model'; +import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; import { AnalyticsService } from '../services/analytics.service'; import { share } from 'rxjs/operators'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts index fd6c255327..1ef789df98 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model'; +import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; import * as analyticParamsMock from '../../mock'; import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; import { setupTestBed } from '@alfresco/adf-core'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts index 3214f9e767..237b060707 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts @@ -32,10 +32,10 @@ import { import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material'; import moment from 'moment-es6'; -import { ParameterValueModel } from '../../diagram/models/report/parameterValue.model'; -import { ReportParameterDetailsModel } from '../../diagram/models/report/reportParameterDetails.model'; -import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model'; -import { ReportQuery } from '../../diagram/models/report/reportQuery.model'; +import { ParameterValueModel } from '../../diagram/models/report/parameter-value.model'; +import { ReportParameterDetailsModel } from '../../diagram/models/report/report-parameter-details.model'; +import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; +import { ReportQuery } from '../../diagram/models/report/report-query.model'; import { AnalyticsService } from '../services/analytics.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/lib/insights/src/lib/analytics-process/components/analytics.component.ts b/lib/insights/src/lib/analytics-process/components/analytics.component.ts index 26b9aad7fa..fda41a62ef 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, ViewChild, ViewEncapsulation } from '@angular/core'; -import { ReportQuery } from '../../diagram/models/report/reportQuery.model'; +import { ReportQuery } from '../../diagram/models/report/report-query.model'; import { AnalyticsGeneratorComponent } from './analytics-generator.component'; @Component({ diff --git a/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts index 38349200c5..e83efd2e59 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts @@ -19,8 +19,8 @@ import { Component, ElementRef, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { ParameterValueModel } from '../../../../diagram/models/report/parameterValue.model'; -import { ReportParameterDetailsModel } from '../../../../diagram/models/report/reportParameterDetails.model'; +import { ParameterValueModel } from '../../../../diagram/models/report/parameter-value.model'; +import { ReportParameterDetailsModel } from '../../../../diagram/models/report/report-parameter-details.model'; import { NumberWidgetAnalyticsComponent } from './../number/number.widget'; @Component({ diff --git a/lib/insights/src/lib/analytics-process/services/analytics.service.ts b/lib/insights/src/lib/analytics-process/services/analytics.service.ts index 5e1c850b08..03893bbd53 100644 --- a/lib/insights/src/lib/analytics-process/services/analytics.service.ts +++ b/lib/insights/src/lib/analytics-process/services/analytics.service.ts @@ -19,15 +19,15 @@ import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable, from, throwError, of } from 'rxjs'; -import { ParameterValueModel } from '../../diagram/models/report/parameterValue.model'; -import { ReportParametersModel } from '../../diagram/models/report/reportParameters.model'; -import { BarChart } from '../../diagram/models/chart/barChart.model'; +import { ParameterValueModel } from '../../diagram/models/report/parameter-value.model'; +import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; +import { BarChart } from '../../diagram/models/chart/bar-chart.model'; import { Chart } from '../../diagram/models/chart/chart.model'; -import { DetailsTableChart } from '../../diagram/models/chart/detailsTableChart.model'; -import { HeatMapChart } from '../../diagram/models/chart/heatMapChart.model'; -import { MultiBarChart } from '../../diagram/models/chart/multiBarChart.model'; -import { PieChart } from '../../diagram/models/chart/pieChart.model'; -import { TableChart } from '../../diagram/models/chart/tableChart.model'; +import { DetailsTableChart } from '../../diagram/models/chart/details-table-chart.model'; +import { HeatMapChart } from '../../diagram/models/chart/heat-map-chart.model'; +import { MultiBarChart } from '../../diagram/models/chart/multi-bar-chart.model'; +import { PieChart } from '../../diagram/models/chart/pie-chart.model'; +import { TableChart } from '../../diagram/models/chart/table-chart.model'; import { map, catchError } from 'rxjs/operators'; @Injectable() diff --git a/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts index bfd9e4b761..e289dd1ed2 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as diagramsActivitiesMock from '../../mock/diagram/diagramActivities.mock'; +import * as diagramsActivitiesMock from '../../mock/diagram/diagram-activities.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts index 91225ba821..8752536602 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as boundaryEventMock from '../../mock/diagram/diagramBoundary.mock'; +import * as boundaryEventMock from '../../mock/diagram/diagram-boundary.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts index 02c892ee05..788793b3bd 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as intermediateCatchingMock from '../../mock/diagram/diagramIntermediate.mock'; +import * as intermediateCatchingMock from '../../mock/diagram/diagram-intermediate.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts index 77207dd107..93ecbd7063 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as diagramsEventsMock from '../../mock/diagram/diagramEvents.mock'; +import * as diagramsEventsMock from '../../mock/diagram/diagram-events.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts index 1a470c9d27..cb8b5c01c0 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as flowsMock from '../../mock/diagram/diagramFlows.mock'; +import * as flowsMock from '../../mock/diagram/diagram-flows.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts index d72c798542..b5316d2561 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as diagramsGatewaysMock from '../../mock/diagram/diagramGateways.mock'; +import * as diagramsGatewaysMock from '../../mock/diagram/diagram-gateways.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts index 7fe85a6a15..e5fac958d3 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as structuralMock from '../../mock/diagram/diagramStructural.mock'; +import * as structuralMock from '../../mock/diagram/diagram-structural.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts index d339f0cc72..ccb7d0080b 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as swimLanesMock from '../../mock/diagram/diagramSwimlanes.mock'; +import * as swimLanesMock from '../../mock/diagram/diagram-swimlanes.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts index 9fb3d54ae8..a31d75099b 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import * as throwEventMock from '../../mock/diagram/diagramThrow.mock'; +import * as throwEventMock from '../../mock/diagram/diagram-throw.mock'; import { DiagramComponent } from './diagram.component'; import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.ts b/lib/insights/src/lib/diagram/components/diagram.component.ts index ffd2cf8650..f3983183f5 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; -import { DiagramElementModel } from '../models/diagram/diagramElement.model'; +import { DiagramElementModel } from '../models/diagram/diagram-element.model'; import { DiagramModel } from '../models/diagram/diagram.model'; import { DiagramColorService } from '../services/diagram-color.service'; import { DiagramsService } from '../services/diagrams.service'; diff --git a/lib/insights/src/lib/diagram/models/chart/barChart.model.ts b/lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/chart/barChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/bar-chart.model.ts diff --git a/lib/insights/src/lib/diagram/models/chart/detailsTableChart.model.ts b/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts similarity index 95% rename from lib/insights/src/lib/diagram/models/chart/detailsTableChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts index d5dafba816..7c8e885cb8 100644 --- a/lib/insights/src/lib/diagram/models/chart/detailsTableChart.model.ts +++ b/lib/insights/src/lib/diagram/models/chart/details-table-chart.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { TableChart } from './tableChart.model'; +import { TableChart } from './table-chart.model'; export class DetailsTableChart extends TableChart { detailsTable: any; diff --git a/lib/insights/src/lib/diagram/models/chart/heatMapChart.model.ts b/lib/insights/src/lib/diagram/models/chart/heat-map-chart.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/chart/heatMapChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/heat-map-chart.model.ts diff --git a/lib/insights/src/lib/diagram/models/chart/lineChart.model.ts b/lib/insights/src/lib/diagram/models/chart/line-chart.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/chart/lineChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/line-chart.model.ts diff --git a/lib/insights/src/lib/diagram/models/chart/multiBarChart.model.ts b/lib/insights/src/lib/diagram/models/chart/multi-bar-chart.model.ts similarity index 94% rename from lib/insights/src/lib/diagram/models/chart/multiBarChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/multi-bar-chart.model.ts index 1f696e2eca..e1a3b22a75 100644 --- a/lib/insights/src/lib/diagram/models/chart/multiBarChart.model.ts +++ b/lib/insights/src/lib/diagram/models/chart/multi-bar-chart.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { BarChart } from './barChart.model'; +import { BarChart } from './bar-chart.model'; export class MultiBarChart extends BarChart { diff --git a/lib/insights/src/lib/diagram/models/chart/pieChart.model.ts b/lib/insights/src/lib/diagram/models/chart/pie-chart.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/chart/pieChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/pie-chart.model.ts diff --git a/lib/insights/src/lib/diagram/models/chart/tableChart.model.ts b/lib/insights/src/lib/diagram/models/chart/table-chart.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/chart/tableChart.model.ts rename to lib/insights/src/lib/diagram/models/chart/table-chart.model.ts diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramElementProperty.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-element-property.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/diagram/diagramElementProperty.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-element-property.model.ts diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramElement.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-element.model.ts similarity index 92% rename from lib/insights/src/lib/diagram/models/diagram/diagramElement.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-element.model.ts index 940466ac9b..97f0d18a1a 100644 --- a/lib/insights/src/lib/diagram/models/diagram/diagramElement.model.ts +++ b/lib/insights/src/lib/diagram/models/diagram/diagram-element.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DiagramElementPropertyModel } from './diagramElementProperty.model'; -import { DiagramEventDefinitionModel } from './diagramEventDefinition.model'; +import { DiagramElementPropertyModel } from './diagram-element-property.model'; +import { DiagramEventDefinitionModel } from './diagram-event-definition.model'; export class DiagramElementModel { completed: boolean; diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramEventDefinition.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-event-definition.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/diagram/diagramEventDefinition.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-event-definition.model.ts diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramFlowElement.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-flow-element.model.ts similarity index 95% rename from lib/insights/src/lib/diagram/models/diagram/diagramFlowElement.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-flow-element.model.ts index 8d7fe7c35e..eada8eb460 100644 --- a/lib/insights/src/lib/diagram/models/diagram/diagramFlowElement.model.ts +++ b/lib/insights/src/lib/diagram/models/diagram/diagram-flow-element.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DiagramWayPointModel } from './diagramWayPoint.model'; +import { DiagramWayPointModel } from './diagram-way-point.model'; export class DiagramFlowElementModel { completed: boolean; diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramLaneElement.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-lane-element.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/diagram/diagramLaneElement.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-lane-element.model.ts diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramPoolElement.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-pool-element.model.ts similarity index 94% rename from lib/insights/src/lib/diagram/models/diagram/diagramPoolElement.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-pool-element.model.ts index 3af113ed82..d306faa432 100644 --- a/lib/insights/src/lib/diagram/models/diagram/diagramPoolElement.model.ts +++ b/lib/insights/src/lib/diagram/models/diagram/diagram-pool-element.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DiagramLaneElementModel } from './diagramLaneElement.model'; +import { DiagramLaneElementModel } from './diagram-lane-element.model'; export class DiagramPoolElementModel { height: string; diff --git a/lib/insights/src/lib/diagram/models/diagram/diagramWayPoint.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram-way-point.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/diagram/diagramWayPoint.model.ts rename to lib/insights/src/lib/diagram/models/diagram/diagram-way-point.model.ts diff --git a/lib/insights/src/lib/diagram/models/diagram/diagram.model.ts b/lib/insights/src/lib/diagram/models/diagram/diagram.model.ts index 482e55646a..a50b5eacee 100644 --- a/lib/insights/src/lib/diagram/models/diagram/diagram.model.ts +++ b/lib/insights/src/lib/diagram/models/diagram/diagram.model.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { DiagramElementModel } from './diagramElement.model'; -import { DiagramFlowElementModel } from './diagramFlowElement.model'; -import { DiagramPoolElementModel } from './diagramPoolElement.model'; +import { DiagramElementModel } from './diagram-element.model'; +import { DiagramFlowElementModel } from './diagram-flow-element.model'; +import { DiagramPoolElementModel } from './diagram-pool-element.model'; export class DiagramModel { diagramBeginX: number; diff --git a/lib/insights/src/lib/diagram/models/report/parameterValue.model.ts b/lib/insights/src/lib/diagram/models/report/parameter-value.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/report/parameterValue.model.ts rename to lib/insights/src/lib/diagram/models/report/parameter-value.model.ts diff --git a/lib/insights/src/lib/diagram/models/report/reportDateRange.model.ts b/lib/insights/src/lib/diagram/models/report/report-date-range.model.ts similarity index 100% rename from lib/insights/src/lib/diagram/models/report/reportDateRange.model.ts rename to lib/insights/src/lib/diagram/models/report/report-date-range.model.ts diff --git a/lib/insights/src/lib/diagram/models/report/reportDefinition.model.ts b/lib/insights/src/lib/diagram/models/report/report-definition.model.ts similarity index 93% rename from lib/insights/src/lib/diagram/models/report/reportDefinition.model.ts rename to lib/insights/src/lib/diagram/models/report/report-definition.model.ts index 982f788eab..1abf7b03b1 100644 --- a/lib/insights/src/lib/diagram/models/report/reportDefinition.model.ts +++ b/lib/insights/src/lib/diagram/models/report/report-definition.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ReportParameterDetailsModel } from './reportParameterDetails.model'; +import { ReportParameterDetailsModel } from './report-parameter-details.model'; export class ReportDefinitionModel { parameters: ReportParameterDetailsModel[] = []; diff --git a/lib/insights/src/lib/diagram/models/report/reportParameterDetails.model.ts b/lib/insights/src/lib/diagram/models/report/report-parameter-details.model.ts similarity index 94% rename from lib/insights/src/lib/diagram/models/report/reportParameterDetails.model.ts rename to lib/insights/src/lib/diagram/models/report/report-parameter-details.model.ts index 1653543cda..9445c7df38 100644 --- a/lib/insights/src/lib/diagram/models/report/reportParameterDetails.model.ts +++ b/lib/insights/src/lib/diagram/models/report/report-parameter-details.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ParameterValueModel } from './parameterValue.model'; +import { ParameterValueModel } from './parameter-value.model'; export class ReportParameterDetailsModel { id: string; diff --git a/lib/insights/src/lib/diagram/models/report/reportParameters.model.ts b/lib/insights/src/lib/diagram/models/report/report-parameters.model.ts similarity index 94% rename from lib/insights/src/lib/diagram/models/report/reportParameters.model.ts rename to lib/insights/src/lib/diagram/models/report/report-parameters.model.ts index e4702cda2f..859f39f479 100644 --- a/lib/insights/src/lib/diagram/models/report/reportParameters.model.ts +++ b/lib/insights/src/lib/diagram/models/report/report-parameters.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ReportDefinitionModel } from './reportDefinition.model'; +import { ReportDefinitionModel } from './report-definition.model'; export class ReportParametersModel { id: number; diff --git a/lib/insights/src/lib/diagram/models/report/reportQuery.model.ts b/lib/insights/src/lib/diagram/models/report/report-query.model.ts similarity index 96% rename from lib/insights/src/lib/diagram/models/report/reportQuery.model.ts rename to lib/insights/src/lib/diagram/models/report/report-query.model.ts index b82d9abdcd..7f7ecdd7fa 100644 --- a/lib/insights/src/lib/diagram/models/report/reportQuery.model.ts +++ b/lib/insights/src/lib/diagram/models/report/report-query.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ReportDateRange } from './reportDateRange.model'; +import { ReportDateRange } from './report-date-range.model'; export class ReportQuery { reportName: string; diff --git a/lib/insights/src/lib/diagram/public-api.ts b/lib/insights/src/lib/diagram/public-api.ts index 1d7e85ee4d..6b320c9f7c 100644 --- a/lib/insights/src/lib/diagram/public-api.ts +++ b/lib/insights/src/lib/diagram/public-api.ts @@ -22,28 +22,28 @@ export * from './services/diagram-color.service'; export * from './services/diagrams.service'; export * from './models/diagram/diagram.model'; -export * from './models/diagram/diagramElement.model'; -export * from './models/diagram/diagramElementProperty.model'; -export * from './models/diagram/diagramEventDefinition.model'; -export * from './models/diagram/diagramFlowElement.model'; -export * from './models/diagram/diagramLaneElement.model'; -export * from './models/diagram/diagramPoolElement.model'; -export * from './models/diagram/diagramWayPoint.model'; +export * from './models/diagram/diagram-element.model'; +export * from './models/diagram/diagram-element-property.model'; +export * from './models/diagram/diagram-event-definition.model'; +export * from './models/diagram/diagram-flow-element.model'; +export * from './models/diagram/diagram-lane-element.model'; +export * from './models/diagram/diagram-pool-element.model'; +export * from './models/diagram/diagram-way-point.model'; -export * from './models/chart/barChart.model'; +export * from './models/chart/bar-chart.model'; export * from './models/chart/chart.model'; -export * from './models/chart/detailsTableChart.model'; -export * from './models/chart/heatMapChart.model'; -export * from './models/chart/lineChart.model'; -export * from './models/chart/multiBarChart.model'; -export * from './models/chart/pieChart.model'; -export * from './models/chart/tableChart.model'; +export * from './models/chart/details-table-chart.model'; +export * from './models/chart/heat-map-chart.model'; +export * from './models/chart/line-chart.model'; +export * from './models/chart/multi-bar-chart.model'; +export * from './models/chart/pie-chart.model'; +export * from './models/chart/table-chart.model'; -export * from './models/report/parameterValue.model'; -export * from './models/report/reportDateRange.model'; -export * from './models/report/reportDefinition.model'; -export * from './models/report/reportParameterDetails.model'; -export * from './models/report/reportParameters.model'; -export * from './models/report/reportQuery.model'; +export * from './models/report/parameter-value.model'; +export * from './models/report/report-date-range.model'; +export * from './models/report/report-definition.model'; +export * from './models/report/report-parameter-details.model'; +export * from './models/report/report-parameters.model'; +export * from './models/report/report-query.model'; export * from './diagram.module'; diff --git a/lib/insights/src/lib/mock/analytics/analyticsComponent.mock.ts b/lib/insights/src/lib/mock/analytics/analytics-component.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/analytics/analyticsComponent.mock.ts rename to lib/insights/src/lib/mock/analytics/analytics-component.mock.ts diff --git a/lib/insights/src/lib/mock/analytics/analyticsParamsReportComponent.mock.ts b/lib/insights/src/lib/mock/analytics/analytics-params-report-component.mock.ts similarity index 99% rename from lib/insights/src/lib/mock/analytics/analyticsParamsReportComponent.mock.ts rename to lib/insights/src/lib/mock/analytics/analytics-params-report-component.mock.ts index f5b78d35c4..8d96c6c09b 100644 --- a/lib/insights/src/lib/mock/analytics/analyticsParamsReportComponent.mock.ts +++ b/lib/insights/src/lib/mock/analytics/analytics-params-report-component.mock.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ReportParameterDetailsModel } from '../../diagram/models/report/reportParameterDetails.model'; +import { ReportParameterDetailsModel } from '../../diagram/models/report/report-parameter-details.model'; export let reportDefParamStatus = { 'id': 2005, diff --git a/lib/insights/src/lib/mock/diagram/diagramActivities.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-activities.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramActivities.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-activities.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramBoundary.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-boundary.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramBoundary.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-boundary.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramEvents.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-events.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramEvents.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-events.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramFlows.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-flows.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramFlows.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-flows.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramGateways.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-gateways.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramGateways.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-gateways.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramIntermediate.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-intermediate.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramIntermediate.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-intermediate.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramStructural.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-structural.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramStructural.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-structural.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramSwimlanes.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-swimlanes.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramSwimlanes.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-swimlanes.mock.ts diff --git a/lib/insights/src/lib/mock/diagram/diagramThrow.mock.ts b/lib/insights/src/lib/mock/diagram/diagram-throw.mock.ts similarity index 100% rename from lib/insights/src/lib/mock/diagram/diagramThrow.mock.ts rename to lib/insights/src/lib/mock/diagram/diagram-throw.mock.ts diff --git a/lib/insights/src/lib/mock/public-api.ts b/lib/insights/src/lib/mock/public-api.ts index c287e9ae0a..658227b91c 100644 --- a/lib/insights/src/lib/mock/public-api.ts +++ b/lib/insights/src/lib/mock/public-api.ts @@ -16,14 +16,14 @@ */ export * from './analytics/analytics.service.mock'; -export * from './analytics/analyticsComponent.mock'; -export * from './analytics/analyticsParamsReportComponent.mock'; +export * from './analytics/analytics-component.mock'; +export * from './analytics/analytics-params-report-component.mock'; -export * from './diagram/diagramActivities.mock'; -export * from './diagram/diagramBoundary.mock'; -export * from './diagram/diagramFlows.mock'; -export * from './diagram/diagramGateways.mock'; -export * from './diagram/diagramIntermediate.mock'; -export * from './diagram/diagramStructural.mock'; -export * from './diagram/diagramSwimlanes.mock'; -export * from './diagram/diagramThrow.mock'; +export * from './diagram/diagram-activities.mock'; +export * from './diagram/diagram-boundary.mock'; +export * from './diagram/diagram-flows.mock'; +export * from './diagram/diagram-gateways.mock'; +export * from './diagram/diagram-intermediate.mock'; +export * from './diagram/diagram-structural.mock'; +export * from './diagram/diagram-swimlanes.mock'; +export * from './diagram/diagram-throw.mock'; diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts index 941cb823e2..2f08b178f6 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { AppConfigService, setupTestBed, CoreModule, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { TaskListCloudService } from '../services/task-list-cloud.service'; import { TaskListCloudComponent } from './task-list-cloud.component'; -import { fakeGlobalTask, fakeCustomSchema } from '../mock/fakeTaskResponseMock'; +import { fakeGlobalTask, fakeCustomSchema } from '../mock/fake-task-response.mock'; import { of } from 'rxjs'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { TaskListCloudModule } from '../task-list-cloud.module'; diff --git a/lib/process-services-cloud/src/lib/task/task-list/mock/fakeTaskResponseMock.ts b/lib/process-services-cloud/src/lib/task/task-list/mock/fake-task-response.mock.ts similarity index 100% rename from lib/process-services-cloud/src/lib/task/task-list/mock/fakeTaskResponseMock.ts rename to lib/process-services-cloud/src/lib/task/task-list/mock/fake-task-response.mock.ts diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts index ef9e58ad4a..7be6aa31b9 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts @@ -17,7 +17,7 @@ import { async } from '@angular/core/testing'; import { setupTestBed, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; -import { fakeTaskCloudList } from '../mock/fakeTaskResponseMock'; +import { fakeTaskCloudList } from '../mock/fake-task-response.mock'; import { TaskListCloudService } from './task-list-cloud.service'; import { TaskQueryCloudRequestModel } from '../models/filter-cloud-model'; diff --git a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts index 1fd1884047..4bd3fc8031 100644 --- a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts +++ b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts @@ -21,7 +21,7 @@ import { FormControl } from '@angular/forms'; import { debounceTime, switchMap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; import { PerformSearchCallback } from '../../interfaces/perform-search-callback.interface'; -import { getDisplayUser } from '../../helpers/getDisplayUser'; +import { getDisplayUser } from '../../helpers/get-display-user'; @Component({ selector: 'adf-people-search-field', diff --git a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts index af36b3e3b1..0d1a60d9fa 100644 --- a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts +++ b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts @@ -19,7 +19,7 @@ import { Component, ViewChild, ViewEncapsulation, EventEmitter, Input, Output } import { PerformSearchCallback } from '../../interfaces/perform-search-callback.interface'; import { PeopleProcessService, UserProcessModel, LogService, TranslationService } from '@alfresco/adf-core'; import { PeopleSearchFieldComponent } from '../people-search-field/people-search-field.component'; -import { getDisplayUser } from '../../helpers/getDisplayUser'; +import { getDisplayUser } from '../../helpers/get-display-user'; import { Observable, of } from 'rxjs'; import { catchError } from 'rxjs/operators'; diff --git a/lib/process-services/src/lib/people/helpers/getDisplayUser.ts b/lib/process-services/src/lib/people/helpers/get-display-user.ts similarity index 100% rename from lib/process-services/src/lib/people/helpers/getDisplayUser.ts rename to lib/process-services/src/lib/people/helpers/get-display-user.ts diff --git a/lib/testing/src/lib/content-services/pages/search/public-api.ts b/lib/testing/src/lib/content-services/pages/search/public-api.ts index 526c595e10..b2df99dfc0 100644 --- a/lib/testing/src/lib/content-services/pages/search/public-api.ts +++ b/lib/testing/src/lib/content-services/pages/search/public-api.ts @@ -18,7 +18,7 @@ export * from './search-categories.page'; export * from './date-range-filter.page'; export * from './number-range-filter.page'; -export * from './search-checkList.page'; +export * from './search-check-list.page'; export * from './search-radio.page'; export * from './search-slider.page'; export * from './search-sorting-picker.page'; diff --git a/lib/testing/src/lib/content-services/pages/search/search-categories.page.ts b/lib/testing/src/lib/content-services/pages/search/search-categories.page.ts index bb370816f3..5e41bf686b 100644 --- a/lib/testing/src/lib/content-services/pages/search/search-categories.page.ts +++ b/lib/testing/src/lib/content-services/pages/search/search-categories.page.ts @@ -17,7 +17,7 @@ import { by, ElementFinder } from 'protractor'; import { SearchTextPage } from './search-text.page'; -import { SearchCheckListPage } from './search-checkList.page'; +import { SearchCheckListPage } from './search-check-list.page'; import { SearchRadioPage } from './search-radio.page'; import { DateRangeFilterPage } from './date-range-filter.page'; import { NumberRangeFilterPage } from './number-range-filter.page'; diff --git a/lib/testing/src/lib/content-services/pages/search/search-checkList.page.ts b/lib/testing/src/lib/content-services/pages/search/search-check-list.page.ts similarity index 100% rename from lib/testing/src/lib/content-services/pages/search/search-checkList.page.ts rename to lib/testing/src/lib/content-services/pages/search/search-check-list.page.ts diff --git a/lib/testing/src/lib/core/pages/form/formFields.ts b/lib/testing/src/lib/core/pages/form/form-fields.ts similarity index 100% rename from lib/testing/src/lib/core/pages/form/formFields.ts rename to lib/testing/src/lib/core/pages/form/form-fields.ts diff --git a/lib/testing/src/lib/core/pages/form/formPage.ts b/lib/testing/src/lib/core/pages/form/form.page.ts similarity index 100% rename from lib/testing/src/lib/core/pages/form/formPage.ts rename to lib/testing/src/lib/core/pages/form/form.page.ts diff --git a/lib/testing/src/lib/core/pages/form/public-api.ts b/lib/testing/src/lib/core/pages/form/public-api.ts index f9243f3478..f054db74bd 100644 --- a/lib/testing/src/lib/core/pages/form/public-api.ts +++ b/lib/testing/src/lib/core/pages/form/public-api.ts @@ -17,5 +17,5 @@ export * from './widgets/public-api'; -export * from './formFields'; -export * from './formPage'; +export * from './form-fields'; +export * from './form.page'; diff --git a/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/amount-widget.page.ts similarity index 96% rename from lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/amount-widget.page.ts index 05e1cf3338..4bb2cc29d8 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/amountWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/amount-widget.page.ts @@ -17,9 +17,9 @@ import { element, by, Locator } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; -export class AmountWidget { +export class AmountWidgetPage { currency: Locator = by.css('span[class="adf-amount-widget__prefix-spacing"]'); formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/attach-file-widget.page.ts similarity index 96% rename from lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/attach-file-widget.page.ts index f24ba538d8..86dbad25fd 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/attach-file-widget.page.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; import * as remote from 'selenium-webdriver/remote'; import { element, by, browser, ElementFinder } from 'protractor'; -export class AttachFileWidget { +export class AttachFileWidgetPage { formFields: FormFields = new FormFields(); uploadLocator = by.css('button[id="attachfile"]'); diff --git a/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/checkbox-widget.page.ts similarity index 96% rename from lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/checkbox-widget.page.ts index 89ebbed1e6..10d26e3548 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/checkbox-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { BrowserActions, BrowserVisibility } from '../../../utils/public-api'; import { by, element, Locator, ElementFinder } from 'protractor'; -export class CheckboxWidget { +export class CheckboxWidgetPage { formFields: FormFields = new FormFields(); checkboxLabel: ElementFinder = element(by.css('span[class*="mat-checkbox-label"]')); diff --git a/lib/testing/src/lib/core/pages/form/widgets/containerWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/container-widget.page.ts similarity index 91% rename from lib/testing/src/lib/core/pages/form/widgets/containerWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/container-widget.page.ts index f6bddae230..a98eb62313 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/containerWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/container-widget.page.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, Locator } from 'protractor'; -export class ContainerWidget { +export class ContainerWidgetPage { formFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/dateTimeWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/date-time-widget.page.ts similarity index 97% rename from lib/testing/src/lib/core/pages/form/widgets/dateTimeWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/date-time-widget.page.ts index f9e8a31afc..53aaf115c7 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/dateTimeWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/date-time-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class DateTimeWidget { +export class DateTimeWidgetPage { formFields: FormFields = new FormFields(); outsideLayer: ElementFinder = element(by.css('div[class*="cdk-overlay-container"]')); diff --git a/lib/testing/src/lib/core/pages/form/widgets/dateWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/date-widget.page.ts similarity index 97% rename from lib/testing/src/lib/core/pages/form/widgets/dateWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/date-widget.page.ts index efad78dcbe..331fddf60d 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/dateWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/date-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { element, by } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class DateWidget { +export class DateWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/displayTextWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/display-text-widget.page.ts similarity index 93% rename from lib/testing/src/lib/core/pages/form/widgets/displayTextWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/display-text-widget.page.ts index 6a8d24daf3..2aee565287 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/displayTextWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/display-text-widget.page.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, Locator } from 'protractor'; -export class DisplayTextWidget { +export class DisplayTextWidgetPage { formFields: FormFields = new FormFields(); labelLocator: Locator = by.css('div[class*="adf-display-text-widget"]'); diff --git a/lib/testing/src/lib/core/pages/form/widgets/displayValueWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/display-value-widget.page.ts similarity index 95% rename from lib/testing/src/lib/core/pages/form/widgets/displayValueWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/display-value-widget.page.ts index ae75273cfe..c4121a3639 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/displayValueWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/display-value-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, element, Locator } from 'protractor'; import { BrowserVisibility } from '../../../utils/public-api'; -export class DisplayValueWidget { +export class DisplayValueWidgetPage { formFields: FormFields = new FormFields(); labelLocator: Locator = by.css("label[class*='adf-label']"); diff --git a/lib/testing/src/lib/core/pages/form/widgets/documentWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/document-widget.page.ts similarity index 92% rename from lib/testing/src/lib/core/pages/form/widgets/documentWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/document-widget.page.ts index e8918a65eb..a862190138 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/documentWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/document-widget.page.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, Locator } from 'protractor'; -export class DocumentWidget { +export class DocumentWidgetPage { formFields: FormFields = new FormFields(); fileLocator: Locator = by.css("div [class*='upload-widget__content-text']"); diff --git a/lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/dropdown-widget.page.ts similarity index 95% rename from lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/dropdown-widget.page.ts index ff073a508f..700b553735 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/dropdownWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/dropdown-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, element } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class DropdownWidget { +export class DropdownWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/dynamicTableWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/dynamic-table-widget.page.ts similarity index 98% rename from lib/testing/src/lib/core/pages/form/widgets/dynamicTableWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/dynamic-table-widget.page.ts index 0fb6fd9ac4..6edad3bbd3 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/dynamicTableWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/dynamic-table-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, element, ElementArrayFinder, ElementFinder, Locator, protractor } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class DynamicTableWidget { +export class DynamicTableWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/headerWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/header-widget.page.ts similarity index 92% rename from lib/testing/src/lib/core/pages/form/widgets/headerWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/header-widget.page.ts index 8634d9e352..d223a563a7 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/headerWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/header-widget.page.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, Locator } from 'protractor'; -export class HeaderWidget { +export class HeaderWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/hyperlinkWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/hyperlink-widget.page.ts similarity index 93% rename from lib/testing/src/lib/core/pages/form/widgets/hyperlinkWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/hyperlink-widget.page.ts index d974ee6ffa..b3fa19db0d 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/hyperlinkWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/hyperlink-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, element, Locator } from 'protractor'; import { BrowserActions } from '../../../utils/public-api'; -export class HyperlinkWidget { +export class HyperlinkWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/multilineTextWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/multiline-text-widget.page.ts similarity index 94% rename from lib/testing/src/lib/core/pages/form/widgets/multilineTextWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/multiline-text-widget.page.ts index dd29b77c07..59823aa26b 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/multilineTextWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/multiline-text-widget.page.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, Locator } from 'protractor'; -export class MultilineTextWidget { +export class MultilineTextWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/numberWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/number-widget.page.ts similarity index 96% rename from lib/testing/src/lib/core/pages/form/widgets/numberWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/number-widget.page.ts index c0f8c9bb4b..240c0d9813 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/numberWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/number-widget.page.ts @@ -16,10 +16,10 @@ */ import { element, by } from 'protractor'; -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class NumberWidget { +export class NumberWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/peopleWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/people-widget.page.ts similarity index 97% rename from lib/testing/src/lib/core/pages/form/widgets/peopleWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/people-widget.page.ts index f7c1110ec9..14a63ac273 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/peopleWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/people-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, element, ElementFinder, Locator } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class PeopleWidget { +export class PeopleWidgetPage { peopleField: ElementFinder = element(by.css('input[data-automation-id="adf-people-search-input"]')); firstResult: ElementFinder = element(by.id('adf-people-widget-user-0')); diff --git a/lib/testing/src/lib/core/pages/form/widgets/radioButtonsWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/radio-buttons-widget.page.ts similarity index 96% rename from lib/testing/src/lib/core/pages/form/widgets/radioButtonsWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/radio-buttons-widget.page.ts index 6aaeb32732..08592c3120 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/radioButtonsWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/radio-buttons-widget.page.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, element, Locator } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; -export class RadioButtonsWidget { +export class RadioButtonsWidgetPage { selectedOption: Locator = by.css('mat-radio-button[ng-pristine]'); diff --git a/lib/testing/src/lib/core/pages/form/widgets/tab.ts b/lib/testing/src/lib/core/pages/form/widgets/tab.page.ts similarity index 98% rename from lib/testing/src/lib/core/pages/form/widgets/tab.ts rename to lib/testing/src/lib/core/pages/form/widgets/tab.page.ts index bbeaaa1284..05fceaf22c 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/tab.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/tab.page.ts @@ -18,7 +18,7 @@ import { by, element, browser } from 'protractor'; import { BrowserActions, BrowserVisibility } from '../../../utils/public-api'; -export class Tab { +export class TabPage { async clickTabByLabel(tabLabel): Promise { const user = element(by.cssContainingText('.mat-tab-label-content', tabLabel)); diff --git a/lib/testing/src/lib/core/pages/form/widgets/textWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/text-widget.page.ts similarity index 95% rename from lib/testing/src/lib/core/pages/form/widgets/textWidget.ts rename to lib/testing/src/lib/core/pages/form/widgets/text-widget.page.ts index f60387a09e..f6ad852077 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/textWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/text-widget.page.ts @@ -15,10 +15,10 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; +import { FormFields } from '../form-fields'; import { by, Locator } from 'protractor'; -export class TextWidget { +export class TextWidgetPage { formFields: FormFields = new FormFields(); diff --git a/lib/testing/src/lib/core/pages/form/widgets/widget.ts b/lib/testing/src/lib/core/pages/form/widgets/widget.ts index 60fe01534d..e8a0b176ac 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/widget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/widget.ts @@ -15,106 +15,101 @@ * limitations under the License. */ -import { MultilineTextWidget } from './multilineTextWidget'; -import { HeaderWidget } from './headerWidget'; -import { DisplayTextWidget } from './displayTextWidget'; -import { DisplayValueWidget } from './displayValueWidget'; -import { AttachFileWidget } from './attachFileWidget'; -import { RadioButtonsWidget } from './radioButtonsWidget'; -import { HyperlinkWidget } from './hyperlinkWidget'; -import { DropdownWidget } from './dropdownWidget'; -import { DynamicTableWidget } from './dynamicTableWidget'; -import { TextWidget } from './textWidget'; -import { CheckboxWidget } from './checkboxWidget'; -import { DateWidget } from './dateWidget'; -import { DateTimeWidget } from './dateTimeWidget'; -import { NumberWidget } from './numberWidget'; -import { AmountWidget } from './amountWidget'; -import { ContainerWidget } from './containerWidget'; -import { PeopleWidget } from './peopleWidget'; -import { Tab } from './tab'; -import { DocumentWidget } from './documentWidget'; -import { AttachFileWidgetCloud } from './attachFileWidgetCloud'; +import { MultilineTextWidgetPage } from './multiline-text-widget.page'; +import { HeaderWidgetPage } from './header-widget.page'; +import { DisplayTextWidgetPage } from './display-text-widget.page'; +import { DisplayValueWidgetPage } from './display-value-widget.page'; +import { AttachFileWidgetPage } from './attach-file-widget.page'; +import { RadioButtonsWidgetPage } from './radio-buttons-widget.page'; +import { HyperlinkWidgetPage } from './hyperlink-widget.page'; +import { DropdownWidgetPage } from './dropdown-widget.page'; +import { DynamicTableWidgetPage } from './dynamic-table-widget.page'; +import { TextWidgetPage } from './text-widget.page'; +import { CheckboxWidgetPage } from './checkbox-widget.page'; +import { DateWidgetPage } from './date-widget.page'; +import { DateTimeWidgetPage } from './date-time-widget.page'; +import { NumberWidgetPage } from './number-widget.page'; +import { AmountWidgetPage } from './amount-widget.page'; +import { ContainerWidgetPage } from './container-widget.page'; +import { PeopleWidgetPage } from './people-widget.page'; +import { TabPage } from './tab.page'; +import { DocumentWidgetPage } from './document-widget.page'; export class Widget { - multilineTextWidget(): MultilineTextWidget { - return new MultilineTextWidget(); + multilineTextWidget(): MultilineTextWidgetPage { + return new MultilineTextWidgetPage(); } - headerWidget(): HeaderWidget { - return new HeaderWidget(); + headerWidget(): HeaderWidgetPage { + return new HeaderWidgetPage(); } - displayTextWidget(): DisplayTextWidget { - return new DisplayTextWidget(); + displayTextWidget(): DisplayTextWidgetPage { + return new DisplayTextWidgetPage(); } - attachFileWidget(): AttachFileWidget { - return new AttachFileWidget(); + attachFileWidget(): AttachFileWidgetPage { + return new AttachFileWidgetPage(); } - attachFileWidgetCloud(fieldId: string): AttachFileWidgetCloud { - return new AttachFileWidgetCloud(fieldId); + displayValueWidget(): DisplayValueWidgetPage { + return new DisplayValueWidgetPage(); } - displayValueWidget(): DisplayValueWidget { - return new DisplayValueWidget(); + radioWidget(): RadioButtonsWidgetPage { + return new RadioButtonsWidgetPage(); } - radioWidget(): RadioButtonsWidget { - return new RadioButtonsWidget(); + hyperlink(): HyperlinkWidgetPage { + return new HyperlinkWidgetPage(); } - hyperlink(): HyperlinkWidget { - return new HyperlinkWidget(); + dropdown(): DropdownWidgetPage { + return new DropdownWidgetPage(); } - dropdown(): DropdownWidget { - return new DropdownWidget(); + dynamicTable(): DynamicTableWidgetPage { + return new DynamicTableWidgetPage(); } - dynamicTable(): DynamicTableWidget { - return new DynamicTableWidget(); + textWidget(): TextWidgetPage { + return new TextWidgetPage(); } - textWidget(): TextWidget { - return new TextWidget(); + documentWidget(): DocumentWidgetPage { + return new DocumentWidgetPage(); } - documentWidget(): DocumentWidget { - return new DocumentWidget(); + checkboxWidget(): CheckboxWidgetPage { + return new CheckboxWidgetPage(); } - checkboxWidget(): CheckboxWidget { - return new CheckboxWidget(); + dateWidget(): DateWidgetPage { + return new DateWidgetPage(); } - dateWidget(): DateWidget { - return new DateWidget(); + dateTimeWidget(): DateTimeWidgetPage { + return new DateTimeWidgetPage(); } - dateTimeWidget(): DateTimeWidget { - return new DateTimeWidget(); + numberWidget(): NumberWidgetPage { + return new NumberWidgetPage(); } - numberWidget(): NumberWidget { - return new NumberWidget(); + amountWidget(): AmountWidgetPage { + return new AmountWidgetPage(); } - amountWidget(): AmountWidget { - return new AmountWidget(); + containerWidget(): ContainerWidgetPage { + return new ContainerWidgetPage(); } - containerWidget(): ContainerWidget { - return new ContainerWidget(); + peopleWidget(): PeopleWidgetPage { + return new PeopleWidgetPage(); } - peopleWidget(): PeopleWidget { - return new PeopleWidget(); - } - - tab(): Tab { - return new Tab(); + tab(): TabPage { + return new TabPage(); } } diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index 7e982a72f0..6320125c4f 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/lib/testing/src/lib/core/pages/public-api.ts @@ -28,5 +28,5 @@ export * from './login.page'; export * from './notification-history.page'; export * from './form/public-api'; export * from './card-view/public-api'; -export * from './viewerPage'; +export * from './viewer.page'; export * from './config-editor-page'; diff --git a/lib/testing/src/lib/core/pages/viewerPage.ts b/lib/testing/src/lib/core/pages/viewer.page.ts similarity index 100% rename from lib/testing/src/lib/core/pages/viewerPage.ts rename to lib/testing/src/lib/core/pages/viewer.page.ts diff --git a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts b/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts similarity index 93% rename from lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts rename to lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts index d1b667a5be..4671f4765a 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/form/widget/attach-file-widget-cloud.page.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { FormFields } from '../formFields'; -import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; import * as remote from 'selenium-webdriver/remote'; import { element, by, browser, ElementFinder } from 'protractor'; +import { BrowserActions } from '../../../../core/utils/browser-actions'; +import { BrowserVisibility } from '../../../../core/utils/browser-visibility'; -export class AttachFileWidgetCloud { +export class AttachFileWidgetCloudPage { widget: ElementFinder; - formFields: FormFields = new FormFields(); filesListLocator = by.css('div[id="adf-attach-widget-readonly-list"]'); constructor(fieldId: string) { @@ -31,7 +30,7 @@ export class AttachFileWidgetCloud { } assignWidget(fieldId: string): void { - this.widget = this.formFields.getWidget(fieldId); + this.widget = element(by.css(`adf-form-field div[id='field-${fieldId}-container']`)); } async attachLocalFile(fileLocation: string): Promise { diff --git a/lib/testing/src/lib/process-services-cloud/pages/form/widget/process-cloud-widget.page.ts b/lib/testing/src/lib/process-services-cloud/pages/form/widget/process-cloud-widget.page.ts index 2699782bb9..74e099cf25 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/form/widget/process-cloud-widget.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/form/widget/process-cloud-widget.page.ts @@ -18,6 +18,7 @@ import { Widget } from '../../../../core/pages/form/widgets/widget'; import { PeopleCloudComponentPage } from '../../people-cloud-component.page'; import { GroupCloudComponentPage } from '../../group-cloud-component.page'; +import { AttachFileWidgetCloudPage } from './attach-file-widget-cloud.page'; export class ProcessCloudWidgetPage extends Widget { @@ -29,4 +30,8 @@ export class ProcessCloudWidgetPage extends Widget { return new GroupCloudComponentPage(); } + attachFileWidgetCloud(fieldId: string): AttachFileWidgetCloudPage { + return new AttachFileWidgetCloudPage(fieldId); + } + } diff --git a/lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts index 923a6ec20d..1b2474efaf 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/group-cloud-component.page.ts @@ -18,7 +18,7 @@ import { by, element, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { FormFields } from '../../core/pages/form/formFields'; +import { FormFields } from '../../core/pages/form/form-fields'; export class GroupCloudComponentPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts index 40e89a8085..454de3cc49 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts @@ -18,7 +18,7 @@ import { by, element, ElementFinder, Locator, protractor } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { FormFields } from '../../core/pages/form/formFields'; +import { FormFields } from '../../core/pages/form/form-fields'; export class PeopleCloudComponentPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/start-process-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/start-process-cloud-component.page.ts index ffbfac2c1c..12359b6b7e 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/start-process-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/start-process-cloud-component.page.ts @@ -18,7 +18,7 @@ import { by, element, Key, protractor, browser, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { FormFields } from '../../core/pages/form/formFields'; +import { FormFields } from '../../core/pages/form/form-fields'; export class StartProcessCloudPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts index eefc553c5f..fb6ee7574c 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts @@ -18,7 +18,7 @@ import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { FormFields } from '../../core/pages/form/formFields'; +import { FormFields } from '../../core/pages/form/form-fields'; export class TaskFormCloudComponent { diff --git a/package-lock.json b/package-lock.json index 5c95ed6baf..72376e8456 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { "name": "alfresco-ng2-components", - "version": "3.6.0", + "version": "3.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.7.0-beta6.tgz", - "integrity": "sha512-WT017HhsUNMUO2ojzonI2DX3oJGezdUQifuwABIb3cnnW7QXiOd+mWXnZ1gOt2ziS+4ImRNI8P2c7LK8k+fQWA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-3.7.0.tgz", + "integrity": "sha512-cp0S8TkWWeIRCfapiQq5AfVXyhljtK7gJ4K+MRsU8spaWYRfGUXgA/RMeHdddy+ksBt98dG9EvtYGXiIhq/syQ==", "requires": { + "@alfresco/adf-testing": "3.7.0", "@angular-devkit/core": "^7.2.15", "commander": "^4.0.0", "ejs": "^2.6.1", @@ -20,65 +21,65 @@ } }, "@alfresco/adf-content-services": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.7.0-beta6.tgz", - "integrity": "sha512-7gaU1GbIt0iboneXFyyT8UONHro1Gt6x5bcmo0iXNUzfbo3bFwieLOp8fs3JwuWDYZbsOrkqVC0mVnWTZvG5SA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.7.0.tgz", + "integrity": "sha512-AMFck7pdrYGL0I4AhbFV4RBNE5I273Q9/99m4tNcpctAQJVVo/ZeZ1dpgibkrz2LL9Bd+WwNsqWMUTf0e0ZIMQ==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.7.0-beta6.tgz", - "integrity": "sha512-TGm3HWU6KEgAwhIOVSp7LsHzxFL30FEt6cFjp7RCDxcBn6yFO3RYUihbIrihd4QWpbIjLwxDdqCCzFneQyBQ1Q==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.7.0.tgz", + "integrity": "sha512-A5z85OkZSG6CdH4KUbhDFchZp0mQderSjOPhjGw6EI409DpbZy4UcNf0dsocAMTIdDXh0s4ubmcWN+5NqZqQpw==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.7.0-beta6.tgz", - "integrity": "sha512-/F5GiUDQUEscS0hRG0979LG5DbVbyTZIEkg+l43dzASSydLde+ThXXDSEo1GfOZCK+ddeb26nflBlitC0/UU3A==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.7.0.tgz", + "integrity": "sha512-tYM6ddTKceTRemKW2nHiiHJJFH1a+U7l4LTdqNoRyTM66J4s5HDm/G+zsQBy1k7ybPTGC56d1mWA0jqq+gnEEQ==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-insights": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.7.0-beta6.tgz", - "integrity": "sha512-DUgZpacpcenfvaoHU2KhcC27QPTPYt3O2TZXUfENrJ3WCeBqrc0DYjMaUGXnXPaufnS6+zSe6T6MJqn+S7XUUg==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.7.0.tgz", + "integrity": "sha512-NvvQpM0u0w2qSR/2K7Vb7uRSEmuQcJyxcX5f0/qYsZNpbAqsiIW7QzgrTZ9tSSvxVZzBMd7OMwQQn89KV+s95g==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-process-services": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.7.0-beta6.tgz", - "integrity": "sha512-vq13EM06RS0lJXQ8RzbGC6iBcPJEQugUYLP/JVAAPrTUugbGMrMF/kbuIclLDbzOUjfbGREQLinryhfL+y1WQw==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.7.0.tgz", + "integrity": "sha512-a9mYsaf19qOdUYjAos5ym7T6roZJGvhYd3ghLs7CkJ7B12dEh+OtuBERAg0UbS+WxLx+tyUIxfBKu3e3SnmIPA==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-process-services-cloud": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.7.0-beta6.tgz", - "integrity": "sha512-FNfTITThu3+bSM96Q15cjNIOWMDt5aQTgykaNkFRuL6vFpInPZdJ49S4BCK3dAOxe/T7MqxpEgAfopZvxR1DOw==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.7.0.tgz", + "integrity": "sha512-4XGv9vLk5mBfMDoqV9+Qi2SciHzZfuWiG5ZYbDmqk6LSsjdsOF73bkAXeXVd5xhWigibIAuBvlaPL9Yb+lpWBQ==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-testing": { - "version": "3.7.0-beta6", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.7.0-beta6.tgz", - "integrity": "sha512-DU2B8qxVBoEXe/ZajFhgh2AmqFYDls7rsw2E3gzqz70hCmSITXnUU3oymdb5FUR9tkfBwrVp31iLrPg8xTwbZA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.7.0.tgz", + "integrity": "sha512-RvsWg3xHBtBZZ2x7zYhomsZ3gB93D5bmwphg/HeR90v53+ruu2hbgDk1+mv5qINhcbOF21cAcR4GtqVn0UnzVg==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/js-api": { - "version": "3.7.0-ea98d9e6f1c7110805b9f4a4cb2d05821a0bd5e6", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.7.0-ea98d9e6f1c7110805b9f4a4cb2d05821a0bd5e6.tgz", - "integrity": "sha512-XCn3ikVi9YwKhh5bcJ8JKvStLz0sOPFMYnzALtCzyBe0nKhRB0Qvis0WyW52Bb1H0JoUeIlByvpsnGdgDrqMiw==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.7.0.tgz", + "integrity": "sha512-5bAk+RVC/VkmYHTI+LQVrOC2xqE308ns/Z4FF+FYUikhhqgB1OJIyt3vPSVP4hNSaxFsvan1owmVXMVqqCCgeA==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", @@ -16802,9 +16803,9 @@ } }, "superagent": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.2.1.tgz", - "integrity": "sha512-46b4Lkwnlz7Ebdv2FBbfuqb3kVkG1jV/SK3EW6NnwL9a3T4h5hHtegNEQfbXvTFbDoUZXId4W3dMgap2f6ic1g==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.2.2.tgz", + "integrity": "sha512-pMWBUnIllK4ZTw7p/UaobiQPwAO5w/1NRRTDpV0FTVNmECztsxKspj3ZWEordVEaqpZtmOQJJna4yTLyC/q7PQ==", "requires": { "component-emitter": "^1.3.0", "cookiejar": "^2.1.2", @@ -16848,9 +16849,9 @@ "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==" }, "readable-stream": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", - "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", diff --git a/protractor.conf.ts b/protractor.conf.ts index abd96e61e3..ff43cad69d 100644 --- a/protractor.conf.ts +++ b/protractor.conf.ts @@ -92,12 +92,20 @@ exports.config = { 'credentials_enable_service': false, 'download': { 'prompt_for_download': false, + "directory_upgrade": true, 'default_directory': downloadFolder + }, + "browser": { + "setDownloadBehavior": { + "behavior": "allow", + "downloadPath": downloadFolder + } } }, args: ['--incognito', `--window-size=${width},${height}`, '--disable-gpu', + '--no-sandbox', '--disable-web-security', '--disable-browser-side-navigation', ...(BROWSER_RUN === true ? [] : ['--headless'])] @@ -172,6 +180,11 @@ exports.config = { paths: tsConfig.compilerOptions.paths }); + browser.driver.sendChromiumCommand('Page.setDownloadBehavior', { + behavior: 'allow', + downloadPath: downloadFolder + }); + browser.manage().window().setSize(width, height); jasmine.getEnv().addReporter( diff --git a/scripts/travis/e2e/content-services-e2e.sh b/scripts/travis/e2e/content-services-e2e.sh index ee8b90ee51..d102c14905 100755 --- a/scripts/travis/e2e/content-services-e2e.sh +++ b/scripts/travis/e2e/content-services-e2e.sh @@ -12,7 +12,7 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 -RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -save -b -m 3 || exit 1) +RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -save -m 2 || exit 1) if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]]; then $RUN_CHECK diff --git a/scripts/travis/e2e/core-e2e.sh b/scripts/travis/e2e/core-e2e.sh index f2171a0d2c..f31a50c9a0 100755 --- a/scripts/travis/e2e/core-e2e.sh +++ b/scripts/travis/e2e/core-e2e.sh @@ -13,7 +13,7 @@ AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/ node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 -RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b -m 3 ) +RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -m 2 ) if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]]; then diff --git a/scripts/travis/e2e/process-services-cloud-e2e.sh b/scripts/travis/e2e/process-services-cloud-e2e.sh index d0bd57bac2..9e57eaa2ca 100755 --- a/scripts/travis/e2e/process-services-cloud-e2e.sh +++ b/scripts/travis/e2e/process-services-cloud-e2e.sh @@ -13,7 +13,7 @@ export AUTH_TYPE="OAUTH" AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; -RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST_BPM" -u "$E2E_ADMIN_EMAIL_IDENTITY" -p "$E2E_ADMIN_PASSWORD_IDENTITY" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -identity_admin_email "$E2E_ADMIN_EMAIL_IDENTITY" -identity_admin_password "$E2E_ADMIN_PASSWORD_IDENTITY" -prefix $TRAVIS_BUILD_NUMBER -b --use-dist -m 3 ) +RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST_BPM" -u "$E2E_ADMIN_EMAIL_IDENTITY" -p "$E2E_ADMIN_PASSWORD_IDENTITY" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -identity_admin_email "$E2E_ADMIN_EMAIL_IDENTITY" -identity_admin_password "$E2E_ADMIN_PASSWORD_IDENTITY" -prefix $TRAVIS_BUILD_NUMBER --use-dist -m 2 ) ./node_modules/@alfresco/adf-cli/bin/adf-cli init-aae-env --host "$E2E_HOST_BPM" --oauth "$E2E_HOST_SSO" --modelerUsername "$E2E_MODELER_USERNAME" --modelerPassword "$E2E_MODELER_PASSWORD" --devopsUsername "$E2E_DEVOPS_USERNAME" --devopsPassword "$E2E_DEVOPS_PASSWORD" --clientId 'activiti' || exit 1 node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST_BPM" -u "$E2E_ADMIN_EMAIL_IDENTITY" -p "$E2E_ADMIN_PASSWORD_IDENTITY" || exit 1 diff --git a/scripts/travis/e2e/process-services-e2e.sh b/scripts/travis/e2e/process-services-e2e.sh index 0aa744b19a..e8d9bb2428 100755 --- a/scripts/travis/e2e/process-services-e2e.sh +++ b/scripts/travis/e2e/process-services-e2e.sh @@ -12,7 +12,7 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 -RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b -m 4 ) +RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -m 2 ) if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]]; then diff --git a/scripts/travis/e2e/search-e2e.sh b/scripts/travis/e2e/search-e2e.sh index 045a221050..7705a09c1b 100755 --- a/scripts/travis/e2e/search-e2e.sh +++ b/scripts/travis/e2e/search-e2e.sh @@ -12,7 +12,7 @@ AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 -RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b -m 2 ) +RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -m 2 ) if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "content-services" || $TRAVIS_PULL_REQUEST == "false" ]]; then diff --git a/tslint.json b/tslint.json index 1570c50413..a3ee0cf10c 100644 --- a/tslint.json +++ b/tslint.json @@ -186,6 +186,7 @@ "use-pipe-transform-interface": true, "component-class-suffix": true, "directive-class-suffix": true, + "file-name-casing": [true, "kebab-case"], "adf-file-name": true, "adf-class-name": true, "adf-prefix-name": true,