diff --git a/e2e/content-services/about-content-services.component.e2e.ts b/e2e/content-services/about-content-services.component.e2e.ts index 88e8893fa7..dcb6c8a0b9 100644 --- a/e2e/content-services/about-content-services.component.e2e.ts +++ b/e2e/content-services/about-content-services.component.e2e.ts @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { LoginSSOPage, AboutPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { AboutPage, ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('About Content Services', () => { diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index 3f134d26c3..7f78719a7b 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -15,14 +15,21 @@ * limitations under the License. */ -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { CommentsPage } from '../../pages/adf/comments.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); -import { UsersActions } from '../../actions/users.actions'; describe('Comment Component', () => { diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts index 98f0d0b872..287392acea 100644 --- a/e2e/content-services/directives/create-folder-directive.e2e.ts +++ b/e2e/content-services/directives/create-folder-directive.e2e.ts @@ -15,13 +15,19 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, NotificationHistoryPage, StringUtil, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + NotificationHistoryPage, + StringUtil, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page'; import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { browser, Key } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Create folder directive', () => { diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index 4c7ddb35ac..39ee03f063 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/e2e/content-services/directives/create-library-directive.e2e.ts @@ -15,13 +15,12 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, StringUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, BrowserActions, LoginSSOPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { CreateLibraryDialogPage } from '../../pages/adf/dialog/create-library-dialog.page'; import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Create library directive', () => { diff --git a/e2e/content-services/directives/delete-directive.e2e.ts b/e2e/content-services/directives/delete-directive.e2e.ts index 8f21a7da49..41fc19e6f6 100644 --- a/e2e/content-services/directives/delete-directive.e2e.ts +++ b/e2e/content-services/directives/delete-directive.e2e.ts @@ -18,17 +18,18 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { + ApiService, BrowserActions, LoginSSOPage, - UploadActions, PaginationPage, - StringUtil, PermissionActions, - ApiService, UserModel + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../../models/ACS/folder.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Delete Directive', () => { diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index d40e097306..1f2c27d1b1 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/e2e/content-services/directives/download-directive.e2e.ts @@ -18,17 +18,17 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { - LoginSSOPage, - UploadActions, + ApiService, BrowserVisibility, FileBrowserUtil, - ApiService, - UserModel + LoginSSOPage, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; -import { UsersActions } from '../../actions/users.actions'; 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 02f7c05e7c..60bdf41255 100644 --- a/e2e/content-services/directives/edit-folder-directive.e2e.ts +++ b/e2e/content-services/directives/edit-folder-directive.e2e.ts @@ -21,14 +21,15 @@ import { LoginSSOPage, NotificationHistoryPage, StringUtil, - UploadActions, UserModel + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FolderDialogPage } from '../../pages/adf/dialog/folder-dialog.page'; import { browser, protractor } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Edit folder directive', () => { diff --git a/e2e/content-services/directives/favorite-directive.e2e.ts b/e2e/content-services/directives/favorite-directive.e2e.ts index 41a7df1a73..afcd691817 100644 --- a/e2e/content-services/directives/favorite-directive.e2e.ts +++ b/e2e/content-services/directives/favorite-directive.e2e.ts @@ -20,7 +20,9 @@ import { ContentNodeSelectorDialogPage, LoginSSOPage, StringUtil, - UploadActions, UserModel + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; @@ -29,7 +31,6 @@ import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page'; import { TrashcanPage } from '../../pages/adf/trashcan.page'; -import { UsersActions } from '../../actions/users.actions'; 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 58c4ea1291..3f8f091104 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/e2e/content-services/directives/restore-content-directive.e2e.ts @@ -22,15 +22,16 @@ import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { TrashcanPage } from '../../pages/adf/trashcan.page'; import { + ApiService, + BreadcrumbPage, + BrowserActions, LoginSSOPage, NotificationHistoryPage, StringUtil, UploadActions, - BrowserActions, - BreadcrumbPage, - ApiService, UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; -import { UsersActions } from '../../actions/users.actions'; 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 b20d56108a..faf2872d80 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -17,13 +17,16 @@ import { browser, by, element } from 'protractor'; import { + ApiService, BreadcrumbPage, + ContentNodeSelectorDialogPage, LoginSSOPage, PaginationPage, - UploadActions, StringUtil, - ContentNodeSelectorDialogPage, - ViewerPage, ApiService, UserModel + UploadActions, + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -31,7 +34,6 @@ import { FileModel } from '../../models/ACS/file.model'; import { BreadCrumbDropdownPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page'; import { InfinitePaginationPage } from '../../pages/adf/core/infinite-pagination.page'; import { FolderModel } from '../../models/ACS/folder.model'; -import { UsersActions } from '../../actions/users.actions'; 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 8b74fc76e7..5cc9db1a30 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -17,10 +17,9 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; import moment from 'moment-es6'; -import { UsersActions } from '../../actions/users.actions'; 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 39c548246e..d9653b519c 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 @@ -17,17 +17,20 @@ import { browser } from 'protractor'; import { - LoginSSOPage, - UploadActions, - StringUtil, + ApiService, + BrowserActions, ContentNodeSelectorDialogPage, - NotificationHistoryPage, BrowserActions, ApiService, UserModel + LoginSSOPage, + NotificationHistoryPage, + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); -import { UsersActions } from '../../actions/users.actions'; 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 d2af83c019..9fc526997a 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/e2e/content-services/document-list/document-list-gallery.e2e.ts @@ -17,10 +17,9 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; 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 55a909f57d..d55b20783e 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -16,14 +16,16 @@ */ import { + ApiService, ArrayUtil, - StringUtil, - LoginSSOPage, - UploadActions, - PaginationPage, - LocalStorageUtil, FileBrowserUtil, - ApiService, UserModel + LocalStorageUtil, + LoginSSOPage, + PaginationPage, + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -31,7 +33,6 @@ import { FolderModel } from '../../models/ACS/folder.model'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Document List - Pagination', () => { const pagination = { diff --git a/e2e/content-services/document-list/document-list-permissions.e2e.ts b/e2e/content-services/document-list/document-list-permissions.e2e.ts index dbc49354cd..57bbff8d95 100644 --- a/e2e/content-services/document-list/document-list-permissions.e2e.ts +++ b/e2e/content-services/document-list/document-list-permissions.e2e.ts @@ -18,8 +18,7 @@ import { browser } from 'protractor'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { LoginSSOPage, ErrorPage, StringUtil, BrowserActions, ApiService } from '@alfresco/adf-testing'; -import { UsersActions } from '../../actions/users.actions'; +import { ApiService, BrowserActions, ErrorPage, LoginSSOPage, StringUtil, UsersActions } from '@alfresco/adf-testing'; describe('Document List Component', () => { diff --git a/e2e/content-services/document-list/document-list-properties.e2e.ts b/e2e/content-services/document-list/document-list-properties.e2e.ts index abd93af1b2..bc346b69e0 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/e2e/content-services/document-list/document-list-properties.e2e.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { ApiService, DropActions, LoginSSOPage, UploadActions } from '@alfresco/adf-testing'; +import { ApiService, DropActions, LoginSSOPage, UploadActions, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Document List Component - Properties', () => { diff --git a/e2e/content-services/document-list/document-list-selection.e2e.ts b/e2e/content-services/document-list/document-list-selection.e2e.ts index f0cac1fd7e..a4ea27c285 100644 --- a/e2e/content-services/document-list/document-list-selection.e2e.ts +++ b/e2e/content-services/document-list/document-list-selection.e2e.ts @@ -15,14 +15,13 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, PaginationPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Document List - Selection', () => { const loginPage = new LoginSSOPage(); 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 2cc882a074..7a20534757 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 @@ -17,10 +17,9 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Document List Component', () => { diff --git a/e2e/content-services/lock-file.e2e.ts b/e2e/content-services/lock-file.e2e.ts index ed62bd5ce6..1797af30d3 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -15,14 +15,13 @@ * limitations under the License. */ -import { LoginSSOPage, UploadActions, StringUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ContentServicesPage } from '../pages/adf/content-services.page'; import { LockFilePage } from '../pages/adf/lock-file.page'; import { FileModel } from '../models/ACS/file.model'; -import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; +import CONSTANTS = require('../util/constants'); describe('Lock File', () => { diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index a3b5dc8e89..6a61e4d9c8 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -16,19 +16,20 @@ */ import { + ApiService, CheckboxPage, + LocalStorageUtil, LoginSSOPage, UploadActions, - LocalStorageUtil, - ViewerPage, - ApiService, UserModel + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UsersActions } from '../../actions/users.actions'; 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 f9693f0ae4..18a545b058 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -15,13 +15,20 @@ * limitations under the License. */ -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import CONSTANTS = require('../../util/constants'); -import { UsersActions } from '../../actions/users.actions'; describe('permissions', () => { diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index 68bbd8d0fb..7b41fc5995 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -15,13 +15,20 @@ * limitations under the License. */ -import { ApiService, CheckboxPage, LoginSSOPage, UploadActions, UserModel, ViewerPage } from '@alfresco/adf-testing'; +import { + ApiService, + CheckboxPage, + LoginSSOPage, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; -import { UsersActions } from '../../actions/users.actions'; 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 4d9d59c5d3..daa9e0833d 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -16,20 +16,22 @@ */ import { - LoginSSOPage, - LocalStorageUtil, + ApiService, BrowserActions, + LocalStorageUtil, + LoginSSOPage, + StringUtil, UploadActions, - ViewerPage, - StringUtil, ApiService, UserModel + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import moment = require('moment'); import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; +import moment = require('moment'); describe('Metadata component', () => { diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 0b41204007..18b476f4d6 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -19,20 +19,21 @@ import { PermissionsPage } from '../../pages/adf/permissions.page'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { - StringUtil, + ApiService, BrowserActions, - NotificationHistoryPage, LoginSSOPage, + NotificationHistoryPage, + StringUtil, UploadActions, - ViewerPage, - ApiService, UserModel + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../../models/ACS/folder.model'; import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Permissions Component', () => { diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index 87d128ec3b..e8d08020c1 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -17,22 +17,24 @@ import { PermissionsPage } from '../../pages/adf/permissions.page'; import { - LoginSSOPage, + ApiService, BrowserActions, - UploadActions, - StringUtil, + LoginSSOPage, NotificationHistoryPage, - ViewerPage, ApiService, UserModel + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import CONSTANTS = require('../../util/constants'); import { MetadataViewPage } from '../../pages/adf/metadata-view.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { VersionManagePage } from '../../pages/adf/version-manager.page'; -import { UsersActions } from '../../actions/users.actions'; +import CONSTANTS = require('../../util/constants'); describe('Permissions Component', () => { diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index 2d5fcac6c5..6b888fd6a1 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -16,12 +16,16 @@ */ import { - LoginSSOPage, + ApiService, + ApiUtil, BrowserActions, LocalStorageUtil, + LoginSSOPage, NotificationHistoryPage, UploadActions, - ViewerPage, ApiUtil, ApiService, UserModel + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -30,7 +34,6 @@ import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { SharedLinkEntry, SharedLinkPaging } from '@alfresco/js-api'; import { CustomSourcesPage } from '../../pages/adf/demo-shell/custom-sources.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Share file', () => { diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index 8b23c983bb..20517ef919 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -17,19 +17,21 @@ import CONSTANTS = require('../../util/constants'); import { - StringUtil, + ApiService, BrowserActions, - NotificationHistoryPage, - LoginSSOPage, ErrorPage, - UploadActions, ApiService, UserModel + LoginSSOPage, + NotificationHistoryPage, + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { ShareDialogPage } from '../../pages/adf/dialog/share-dialog.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { UsersActions } from '../../actions/users.actions'; describe('Unshare file', () => { diff --git a/e2e/content-services/social/social.component.e2e.ts b/e2e/content-services/social/social.component.e2e.ts index 3d6e9fa40a..c94d2d2af4 100644 --- a/e2e/content-services/social/social.component.e2e.ts +++ b/e2e/content-services/social/social.component.e2e.ts @@ -15,12 +15,19 @@ * limitations under the License. */ -import { LoginSSOPage, LikePage, RatePage, UploadActions, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LikePage, + LoginSSOPage, + RatePage, + UploadActions, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { SocialPage } from '../../pages/adf/demo-shell/social.page'; import { browser } from 'protractor'; -import { UsersActions } from '../../actions/users.actions'; 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 efb8988ac3..6891a4da74 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -20,16 +20,16 @@ import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { ApiService, - LoginSSOPage, - UploadActions, + FileBrowserUtil, IdentityService, + LoginSSOPage, SettingsPage, StringUtil, - FileBrowserUtil, + UploadActions, + UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/file.model'; -import { UsersActions } from '../../actions/users.actions'; 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 710d96e3ef..6ff4ce27ba 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/e2e/content-services/tag-component.e2e.ts @@ -16,11 +16,10 @@ */ import { FileModel } from '../models/ACS/file.model'; -import { LoginSSOPage, UploadActions, StringUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { TagPage } from '../pages/adf/tag.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Tag component', () => { diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index 6610b29506..3f7f6b95fb 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -15,12 +15,19 @@ * limitations under the License. */ -import { StringUtil, LoginSSOPage, PaginationPage, UploadActions, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + PaginationPage, + StringUtil, + UploadActions, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../models/ACS/folder.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TrashcanPage } from '../pages/adf/trashcan.page'; -import { UsersActions } from '../actions/users.actions'; describe('Trashcan - Pagination', () => { const pagination = { diff --git a/e2e/content-services/tree-view-component.e2e.ts b/e2e/content-services/tree-view-component.e2e.ts index 86925e63d6..3753e9887d 100644 --- a/e2e/content-services/tree-view-component.e2e.ts +++ b/e2e/content-services/tree-view-component.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, UploadActions, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TreeViewPage } from '../pages/adf/content-services/tree-view.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Tree View Component', () => { diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index 97f17eb394..99b3c7c850 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/e2e/content-services/upload/cancel-upload.e2e.ts @@ -16,12 +16,11 @@ */ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, UploadActions, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Upload component', async () => { diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index 41a511df50..82adbf73be 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -15,15 +15,21 @@ * limitations under the License. */ -import { element, by, browser } from 'protractor'; -import { DropActions, LoginSSOPage, LocalStorageUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { browser, by, element } from 'protractor'; +import { + ApiService, + DropActions, + LocalStorageUtil, + LoginSSOPage, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Upload component - Excluded Files', () => { diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index 1b6c3b9972..cda8f9b3a4 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/e2e/content-services/upload/upload-dialog.e2e.ts @@ -15,7 +15,14 @@ * limitations under the License. */ -import { ApiService, BrowserActions, LoginSSOPage, UploadActions, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + BrowserActions, + LoginSSOPage, + UploadActions, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; @@ -23,7 +30,6 @@ import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { VersionManagePage } from '../../pages/adf/version-manager.page'; import { FolderModel } from '../../models/ACS/folder.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Upload component', () => { diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index 4e0ec239a8..60a7ce9b31 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -15,15 +15,22 @@ * limitations under the License. */ -import { element, by, browser } from 'protractor'; +import { browser, by, element } from 'protractor'; -import { DropActions, LoginSSOPage, UploadActions, StringUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + DropActions, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { UploadTogglesPage } from '../../pages/adf/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Upload component', () => { diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index fbae310de6..1ff4ac664d 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -16,13 +16,12 @@ */ import { browser } from 'protractor'; -import { StringUtil, LoginSSOPage, NotificationHistoryPage, ApiService } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, NotificationHistoryPage, StringUtil, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); -import { UsersActions } from '../../actions/users.actions'; describe('Upload - User permission', () => { diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index 2a5ad7a04b..0cc651cdf7 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -21,7 +21,9 @@ import { BrowserVisibility, FileBrowserUtil, LoginSSOPage, - UploadActions, UserModel + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { browser, by, element } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; @@ -29,7 +31,6 @@ import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { VersionManagePage } from '../../pages/adf/version-manager.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Version component actions', () => { diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index bbd5cfb85d..187e37dcb4 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -15,14 +15,16 @@ * limitations under the License. */ -import { element, by, browser } from 'protractor'; +import { browser, by, element } from 'protractor'; import { - LoginSSOPage, + ApiService, BrowserActions, - UploadActions, - StringUtil, + LoginSSOPage, NotificationHistoryPage, - ApiService, UserModel + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { VersionManagePage } from '../../pages/adf/version-manager.page'; @@ -30,7 +32,6 @@ import { UploadDialogPage } from '../../pages/adf/dialog/upload-dialog.page'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); -import { UsersActions } from '../../actions/users.actions'; describe('Version component permissions', () => { diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index 0a89fcf58c..4813aca513 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -15,20 +15,20 @@ * limitations under the License. */ -import { by, element, browser } from 'protractor'; +import { browser, by, element } from 'protractor'; import { + ApiService, + BrowserActions, + BrowserVisibility, LoginSSOPage, UploadActions, - BrowserVisibility, - BrowserActions, - ApiService, - UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { VersionManagePage } from '../../pages/adf/version-manager.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; 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 1e09dd4183..6269b0e80a 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -17,18 +17,18 @@ import { browser } from 'protractor'; import { + ApiService, + BrowserActions, + BrowserVisibility, LoginSSOPage, UploadActions, - BrowserVisibility, - BrowserActions, - ApiService, - UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { VersionManagePage } from '../../pages/adf/version-manager.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Version component', () => { diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index 2b9b717470..86b4a2aaac 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/e2e/core/datatable/data-table-component-selection.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { ApiService, DataTableComponentPage, LoginSSOPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, DataTableComponentPage, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; 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 0a3c939048..b5587ea1ce 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -15,12 +15,18 @@ * limitations under the License. */ -import { ApiService, DropActions, LoginSSOPage, NotificationHistoryPage, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + DropActions, + LoginSSOPage, + NotificationHistoryPage, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; import { DataTablePage } from '../../pages/adf/demo-shell/data-table.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Datatable component', () => { diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index 90330a94e5..0d0e2821e4 100644 --- a/e2e/core/error-component.e2e.ts +++ b/e2e/core/error-component.e2e.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { LoginSSOPage, ErrorPage, BrowserActions, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, BrowserActions, ErrorPage, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('Error Component', () => { diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 51ce44c032..92c01aa1e8 100644 --- a/e2e/core/header-component.e2e.ts +++ b/e2e/core/header-component.e2e.ts @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ApiService, HeaderPage, LoginSSOPage, SettingsPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, HeaderPage, LoginSSOPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('Header Component', () => { diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts index 1acc56697b..706fc2ee78 100644 --- a/e2e/core/icons-component.e2e.ts +++ b/e2e/core/icons-component.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { IconsPage } from '../pages/adf/icons.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Universal Icon component', () => { diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index 16df50e7ac..c46847bbf4 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/e2e/core/infinite-scrolling.e2e.ts @@ -15,13 +15,20 @@ * limitations under the License. */ -import { StringUtil, LocalStorageUtil, LoginSSOPage, UploadActions, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LocalStorageUtil, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../models/ACS/folder.model'; import { ContentServicesPage } from '../pages/adf/content-services.page'; import { InfinitePaginationPage } from '../pages/adf/core/infinite-pagination.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('Enable infinite scrolling', () => { diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index 8f86a0feb5..a9f4cbd2a4 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -21,14 +21,14 @@ import { ErrorPage, LocalStorageUtil, UserInfoPage, - UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page'; import { LoginPage } from '../../pages/adf/demo-shell/login.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Login component', () => { diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index 5918ef47a3..f2e9b20582 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -17,13 +17,19 @@ import { browser } from 'protractor'; -import { SettingsPage, UploadActions, StringUtil, ApiService, LocalStorageUtil } from '@alfresco/adf-testing'; +import { + ApiService, + LocalStorageUtil, + SettingsPage, + StringUtil, + UploadActions, + UsersActions +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { ProcessServicesPage } from '../../pages/adf/process-services/process-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { LogoutPage } from '../../pages/adf/demo-shell/logout.page'; import { LoginPage } from '../../pages/adf/demo-shell/login.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Login component - Redirect', () => { diff --git a/e2e/core/notifications-component.e2e.ts b/e2e/core/notifications-component.e2e.ts index 732c02b72d..cac6c31211 100644 --- a/e2e/core/notifications-component.e2e.ts +++ b/e2e/core/notifications-component.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NotificationDemoPage } from '../pages/adf/demo-shell/notification.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('Notifications Component', () => { diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 5af5a17c58..5ebabba32b 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -16,20 +16,20 @@ */ import { + ApiService, ArrayUtil, - StringUtil, LoginSSOPage, PaginationPage, + StringUtil, UploadActions, - ViewerPage, - ApiService, - UserModel + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; import { FolderModel } from '../models/ACS/folder.model'; import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { UsersActions } from '../actions/users.actions'; describe('Pagination - returns to previous page when current is empty', () => { diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index 56e4a05a60..19f1ed9f26 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/e2e/core/user-info-component-cloud.e2e.ts @@ -15,14 +15,8 @@ * limitations under the License. */ -import { - ApiService, - LoginSSOPage, - SettingsPage, - UserInfoPage -} from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('User Info - SSO', () => { diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index 5baff615cb..dd2ec447df 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -16,9 +16,8 @@ */ import { PeopleApi } from '@alfresco/js-api'; -import { ApiService, LocalStorageUtil, LoginSSOPage, UserInfoPage } from '@alfresco/adf-testing'; +import { ApiService, LocalStorageUtil, LoginSSOPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import * as path from 'path'; 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 a495626a73..6f51b73585 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts @@ -16,12 +16,19 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folder.model'; import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { diff --git a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts index 55d730e1a3..9830badfdf 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -16,13 +16,20 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FileModel } from '../../../models/ACS/file.model'; import { FolderModel } from '../../../models/ACS/folder.model'; import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { diff --git a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts index 81c58c0040..f1a7147074 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -16,11 +16,18 @@ */ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, StringUtil, UploadActions, ViewerPage, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folder.model'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); 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 54bcf14b99..52ec887bf6 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -16,11 +16,18 @@ */ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, StringUtil, UploadActions, ViewerPage, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folder.model'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); 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 f2fe936bd0..51a40c02a2 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -15,12 +15,19 @@ * limitations under the License. */ -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folder.model'; import { browser } from 'protractor'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { 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 3acc363155..0b7f2be0f3 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -16,11 +16,18 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folder.model'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); 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 006d16b3c0..6aad09c447 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -16,12 +16,19 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/content-services.page'; -import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folder.model'; import { NavigationBarPage } from '../../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../../actions/users.actions'; +import CONSTANTS = require('../../../util/constants'); describe('Viewer', () => { diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index 56ff910df7..ccb88d0790 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -16,12 +16,19 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, StringUtil, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; 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/file.model'; -import { UsersActions } from '../../actions/users.actions'; +import CONSTANTS = require('../../util/constants'); 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 693a945e2e..2ce8555e05 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -16,11 +16,10 @@ */ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, UploadActions, ViewerPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Content Services Viewer', () => { const acsUser = new UserModel(); diff --git a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts index 1b23f1acf2..bc20450f13 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -16,11 +16,10 @@ */ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, UploadActions, ViewerPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; describe('Viewer', () => { diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index eebccc109e..318af046bb 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -16,11 +16,18 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, DataTableComponentPage, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + DataTableComponentPage, + LoginSSOPage, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; -import { UsersActions } from '../../actions/users.actions'; describe('Viewer - properties', () => { diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index d5a0c618fa..f3c9a75655 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -15,14 +15,22 @@ * limitations under the License. */ -import { LoginSSOPage, UploadActions, StringUtil, BrowserActions, ViewerPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + BrowserActions, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { ShareDialogPage } from '../../pages/adf/dialog/share-dialog.page'; -import CONSTANTS = require('../../util/constants'); import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { UsersActions } from '../../actions/users.actions'; +import CONSTANTS = require('../../util/constants'); describe('Viewer', () => { diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index a992092447..5564fdd0a7 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -15,13 +15,12 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AnalyticsPage } from '../pages/adf/process-services/analytics.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Analytics Smoke Test', () => { diff --git a/e2e/process-services/about-process-services.e2e.ts b/e2e/process-services/about-process-services.e2e.ts index 8b870cecc8..621debafae 100644 --- a/e2e/process-services/about-process-services.e2e.ts +++ b/e2e/process-services/about-process-services.e2e.ts @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { LoginSSOPage, AboutPage, ApiService } from '@alfresco/adf-testing'; +import { AboutPage, ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; describe('About Process Services', () => { diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index c7444682a3..1c89ca36a6 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -16,12 +16,11 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import CONSTANTS = require('../util/constants'); -import { UsersActions } from '../actions/users.actions'; import { ModelsActions } from '../actions/APS/models.actions'; +import CONSTANTS = require('../util/constants'); describe('Modify applications', () => { diff --git a/e2e/process-services/attach-file-content-service.e2e.ts b/e2e/process-services/attach-file-content-service.e2e.ts index 902e9eb85f..7725b63afd 100644 --- a/e2e/process-services/attach-file-content-service.e2e.ts +++ b/e2e/process-services/attach-file-content-service.e2e.ts @@ -20,15 +20,17 @@ import { ApplicationsUtil, ContentNodeSelectorDialogPage, ExternalNodeSelectorDialogPage, - IntegrationService, LocalStorageUtil, + IntegrationService, + LocalStorageUtil, LoginSSOPage, - UploadActions, UserModel, + UploadActions, + UserModel, + UsersActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; import CONSTANTS = require('../util/constants'); describe('Attach File - Content service', () => { diff --git a/e2e/process-services/attach-file-widget-start-task-app.e2e.ts b/e2e/process-services/attach-file-widget-start-task-app.e2e.ts index f667c1b97a..093ea7e810 100644 --- a/e2e/process-services/attach-file-widget-start-task-app.e2e.ts +++ b/e2e/process-services/attach-file-widget-start-task-app.e2e.ts @@ -15,13 +15,20 @@ * limitations under the License. */ -import { LoginSSOPage, Widget, ViewerPage, ApplicationsUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + UserModel, + UsersActions, + ViewerPage, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../util/constants'); import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; +import CONSTANTS = require('../util/constants'); describe('Start Task - Task App', () => { const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST; diff --git a/e2e/process-services/attach-folder.e2e.ts b/e2e/process-services/attach-folder.e2e.ts index 7f71e30ec3..acd011f004 100644 --- a/e2e/process-services/attach-folder.e2e.ts +++ b/e2e/process-services/attach-folder.e2e.ts @@ -19,14 +19,16 @@ import { ApiService, ApplicationsUtil, ContentNodeSelectorDialogPage, - IntegrationService, LocalStorageUtil, - LoginSSOPage, UserModel, + IntegrationService, + LocalStorageUtil, + LoginSSOPage, + UserModel, + UsersActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; import CONSTANTS = require('../util/constants'); describe('Attach Folder', () => { diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index bb2a5997a3..5b7f62cfc6 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { FormFields, LoginSSOPage, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, FormFields, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AttachFormPage } from '../pages/adf/process-services/attach-form.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; -import CONSTANTS = require('../util/constants'); import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('Attach Form Component', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index fd582084bc..319ef2f377 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -15,17 +15,16 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ChecklistDialog } from '../pages/adf/process-services/dialog/create-checklist-dialog.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import * as fs from 'fs'; import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('Checklist component', () => { diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index f5fe778645..a532ea339c 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -16,11 +16,10 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { CommentsPage } from '../pages/adf/comments.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('Comment component for Processes', () => { diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index 066b428aa2..8bd656cbfc 100644 --- a/e2e/process-services/comment-component-tasks.e2e.ts +++ b/e2e/process-services/comment-component-tasks.e2e.ts @@ -17,13 +17,13 @@ import { browser } from 'protractor'; -import { LoginSSOPage, ApplicationsUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { CommentsPage } from '../pages/adf/comments.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import CONSTANTS = require('../util/constants'); -import { UsersActions } from '../actions/users.actions'; + import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('Comment component for Processes', () => { diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index d01c740311..4e4cae6880 100644 --- a/e2e/process-services/custom-process-filters-sorting.e2e.ts +++ b/e2e/process-services/custom-process-filters-sorting.e2e.ts @@ -17,11 +17,10 @@ import { browser } from 'protractor'; -import { LoginSSOPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { FiltersPage } from '../pages/adf/process-services/filters.page'; -import { UsersActions } from '../actions/users.actions'; describe('Sorting for process filters', () => { diff --git a/e2e/process-services/custom-process-filters.e2e.ts b/e2e/process-services/custom-process-filters.e2e.ts index e8ac4b4ad5..7c5d80fc39 100644 --- a/e2e/process-services/custom-process-filters.e2e.ts +++ b/e2e/process-services/custom-process-filters.e2e.ts @@ -17,14 +17,12 @@ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { AppSettingsTogglesPage } from '../pages/adf/process-services/dialog/app-settings-toggles.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; - describe('New Process Filters', () => { const loginPage = new LoginSSOPage(); diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index 9aa169343c..b35688133d 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -16,21 +16,21 @@ */ import { + ApiService, + ApplicationsUtil, ArrayUtil, DateUtil, LoginSSOPage, PaginationPage, - ApplicationsUtil, ProcessUtil, - ApiService + UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { AppsRuntimeActions } from '../actions/APS/apps-runtime.actions'; -import { UsersActions } from '../actions/users.actions'; import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/task-list-demo.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import moment = require('moment'); import { TaskRepresentation } from '@alfresco/js-api'; +import moment = require('moment'); describe('Start Task - Custom App', () => { diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index 9dda572e66..d262afb357 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -16,18 +16,18 @@ */ import { - LoginSSOPage, - Widget, + ApiService, + ApplicationsUtil, DatePickerCalendarPage, DateUtil, - ApplicationsUtil, - ApiService + LoginSSOPage, + UsersActions, + Widget } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Dynamic Table', () => { diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index c638046dd0..6dbf3951a4 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -16,13 +16,12 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, ApplicationsUtil, StartProcessPage, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; -import { UsersActions } from '../actions/users.actions'; describe('Empty Process List Test', () => { diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index 722c067d7e..c6d561fb7e 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { LoginSSOPage, Widget, FormPage, ApiService } from '@alfresco/adf-testing'; +import { ApiService, FormPage, LoginSSOPage, UsersActions, Widget } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Form Component', () => { diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index e3461831e1..c249fa841d 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -15,12 +15,18 @@ * limitations under the License. */ -import { LoginSSOPage, Widget, ApplicationsUtil, StartProcessPage, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + StartProcessPage, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index 8234395115..c71f714b3c 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -15,13 +15,20 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; 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/navigation-bar.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; +import CONSTANTS = require('../util/constants'); +import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); const formInstance = new FormDefinitionModel(); diff --git a/e2e/process-services/info-drawer.e2e.ts b/e2e/process-services/info-drawer.e2e.ts index f8ca2430cd..ed08197c17 100644 --- a/e2e/process-services/info-drawer.e2e.ts +++ b/e2e/process-services/info-drawer.e2e.ts @@ -16,24 +16,25 @@ */ import { + ApiService, + ApplicationsUtil, BrowserActions, BrowserVisibility, LocalStorageUtil, LoginSSOPage, StringUtil, - ApplicationsUtil, - ApiService, UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { AppDefinitionRepresentation } from '@alfresco/js-api'; import { browser, by, element } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../util/constants'); -import moment = require('moment'); 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'; +import CONSTANTS = require('../util/constants'); +import moment = require('moment'); describe('Info Drawer', () => { diff --git a/e2e/process-services/pagination-processlist-adding-processes.e2e.ts b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts index 583411dbe2..9ae9638499 100644 --- a/e2e/process-services/pagination-processlist-adding-processes.e2e.ts +++ b/e2e/process-services/pagination-processlist-adding-processes.e2e.ts @@ -15,9 +15,15 @@ * limitations under the License. */ -import { LoginSSOPage, PaginationPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + PaginationPage, + ProcessUtil, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; 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'; diff --git a/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts index 0554dd22b3..74e970fe2d 100644 --- a/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts @@ -15,9 +15,15 @@ * limitations under the License. */ -import { LoginSSOPage, PaginationPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + PaginationPage, + ProcessUtil, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 4432c85921..5d609c6c89 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -15,16 +15,15 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import * as fs from 'fs'; import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('People component', () => { diff --git a/e2e/process-services/process-attachment-list-action-menu.e2e.ts b/e2e/process-services/process-attachment-list-action-menu.e2e.ts index fadd1c8410..3663f7455f 100644 --- a/e2e/process-services/process-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/process-attachment-list-action-menu.e2e.ts @@ -16,18 +16,18 @@ */ import { - LoginSSOPage, - FileBrowserUtil, - ViewerPage, + ApiService, ApplicationsUtil, + FileBrowserUtil, + LoginSSOPage, ProcessUtil, - ApiService + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; import { FileModel } from '../models/ACS/file.model'; import { browser } from 'protractor'; diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index a6e89a6cee..5027e4e06a 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -15,16 +15,21 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, ApplicationsUtil, StartProcessPage, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + StartProcessPage, + UsersActions +} from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ProcessFiltersPage } from '../pages/adf/process-services/process-filters.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { ProcessDetailsPage } from '../pages/adf/process-services/process-details.page'; import { ProcessListPage } from '../pages/adf/process-services/process-list.page'; - import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; -import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/process-list-demo.page'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/process-instance-details.e2e.ts b/e2e/process-services/process-instance-details.e2e.ts index d8e1c94fab..192509a1b2 100644 --- a/e2e/process-services/process-instance-details.e2e.ts +++ b/e2e/process-services/process-instance-details.e2e.ts @@ -16,9 +16,8 @@ */ import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; +import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import { LoginSSOPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; 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'; diff --git a/e2e/process-services/process-list-component.e2e.ts b/e2e/process-services/process-list-component.e2e.ts index 4a123954d3..80169428e3 100644 --- a/e2e/process-services/process-list-component.e2e.ts +++ b/e2e/process-services/process-list-component.e2e.ts @@ -15,10 +15,16 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, ProcessUtil, ApiService, ApplicationsUtil } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions +} from '@alfresco/adf-testing'; import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/process-list-demo.page'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; describe('Process List Test', () => { diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index 6a06675c7d..803992afbc 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -15,9 +15,15 @@ * limitations under the License. */ -import { LoginSSOPage, PaginationPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + PaginationPage, + ProcessUtil, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; 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'; diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index 4d8cf44e1c..12ddd05c24 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -15,13 +15,19 @@ * limitations under the License. */ -import { StringUtil, LoginSSOPage, PaginationPage, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + PaginationPage, + StringUtil, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../util/constants'); import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('Task List Pagination - Sorting', () => { diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index 67b34186be..ee024c49a7 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -17,14 +17,13 @@ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import CONSTANTS = require('../util/constants'); -import Task = require('../models/APS/Task'); -import { UsersActions } from '../actions/users.actions'; import * as fs from 'fs'; import * as path from 'path'; +import CONSTANTS = require('../util/constants'); +import Task = require('../models/APS/Task'); describe('Start Task - Task App', () => { diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index f203bad2e9..a5985012a3 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -17,13 +17,18 @@ import CONSTANTS = require('../util/constants'); import { - FileBrowserUtil, - LoginSSOPage, SelectAppsDialog, - ProcessInstanceTasksPage, - StringUtil, - Widget, + ApiService, ApplicationsUtil, - StartProcessPage, ApiService, UserModel, LocalStorageUtil + FileBrowserUtil, + LocalStorageUtil, + LoginSSOPage, + ProcessInstanceTasksPage, + SelectAppsDialog, + StartProcessPage, + StringUtil, + UserModel, + UsersActions, + Widget } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FileModel } from '../models/ACS/file.model'; @@ -34,7 +39,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/process-filter import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { ContentServicesPage } from '../pages/adf/content-services.page'; -import { UsersActions } from '../actions/users.actions'; import { UploadDialogPage } from '../pages/adf/dialog/upload-dialog.page'; describe('Start Process Component', () => { diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index 07c64f5999..7ea551021b 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { LoginSSOPage, ApplicationsUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; + import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index bb556bc766..bf519f0aa2 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -15,19 +15,18 @@ * limitations under the License. */ -import { ApiService, LoginSSOPage, StringUtil, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; import { ChecklistDialog } from '../pages/adf/process-services/dialog/create-checklist-dialog.page'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../util/constants'); import * as fs from 'fs'; import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('Start Task - Task App', () => { diff --git a/e2e/process-services/stencil.e2e.ts b/e2e/process-services/stencil.e2e.ts index 7e6b4253bb..7a39f5f8ab 100644 --- a/e2e/process-services/stencil.e2e.ts +++ b/e2e/process-services/stencil.e2e.ts @@ -15,8 +15,14 @@ * limitations under the License. */ -import { UsersActions } from '../actions/users.actions'; -import { LoginSSOPage, ApplicationsUtil, StartProcessPage, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + StartProcessPage, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; diff --git a/e2e/process-services/task-assignee.e2e.ts b/e2e/process-services/task-assignee.e2e.ts index db33dee20b..b088f450eb 100644 --- a/e2e/process-services/task-assignee.e2e.ts +++ b/e2e/process-services/task-assignee.e2e.ts @@ -16,12 +16,13 @@ */ import { - LoginSSOPage, + ApiService, ApplicationsUtil, + LoginSSOPage, ProcessUtil, StartProcessPage, - ApiService, - UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; @@ -29,7 +30,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/process-filter 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 { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/task-attachment-list-action-menu.e2e.ts b/e2e/process-services/task-attachment-list-action-menu.e2e.ts index 9095155f3a..9196d4c8b3 100644 --- a/e2e/process-services/task-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/task-attachment-list-action-menu.e2e.ts @@ -16,16 +16,22 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, FileBrowserUtil, ViewerPage, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + FileBrowserUtil, + LoginSSOPage, + UsersActions, + ViewerPage +} from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; -import CONSTANTS = require('../util/constants'); import * as fs from 'fs'; import * as path from 'path'; -import { UsersActions } from '../actions/users.actions'; import { FileModel } from '../models/ACS/file.model'; import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); 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 5ea6d5a008..5667b1f9f0 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { LoginSSOPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { LoginSSOPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { TaskRepresentation } from '@alfresco/js-api'; describe('Task Audit', () => { diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index eccfd67664..f543000e85 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -15,18 +15,25 @@ * limitations under the License. */ -import { LoginSSOPage, StringUtil, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + ProcessUtil, + StringUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FormModelActions } from '../actions/APS/form-model.actions'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { FiltersPage } from '../pages/adf/process-services/filters.page'; import { TaskDetailsPage } from '../pages/adf/process-services/task-details.page'; import { TasksListPage } from '../pages/adf/process-services/tasks-list.page'; -import CONSTANTS = require('../util/constants'); import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { AttachFormPage } from '../pages/adf/process-services/attach-form.page'; import { TaskRepresentation } from '@alfresco/js-api'; +import CONSTANTS = require('../util/constants'); describe('Task Details - Form', () => { const loginPage = new LoginSSOPage(); diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index 8e156cd258..87b6172ddc 100644 --- a/e2e/process-services/task-details-no-form.e2e.ts +++ b/e2e/process-services/task-details-no-form.e2e.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { LoginSSOPage, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; +import CONSTANTS = require('../util/constants'); describe('Task Details - No form', () => { diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 9bd1ec762c..4091169bf6 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -15,24 +15,24 @@ * limitations under the License. */ -import { UsersActions } from '../actions/users.actions'; -import Task = require('../models/APS/Task'); -import TaskModel = require('../models/APS/TaskModel'); -import FormModel = require('../models/APS/FormModel'); -import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; -import CONSTANTS = require('../util/constants'); -import moment = require('moment'); import { - LoginSSOPage, - BrowserActions, - StringUtil, + ApiService, ApplicationsUtil, + BrowserActions, + LoginSSOPage, ProcessUtil, - ApiService + StringUtil, + UsersActions } from '@alfresco/adf-testing'; +import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { TaskRepresentation } from '@alfresco/js-api'; +import Task = require('../models/APS/Task'); +import TaskModel = require('../models/APS/TaskModel'); +import FormModel = require('../models/APS/FormModel'); +import CONSTANTS = require('../util/constants'); +import moment = require('moment'); 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 92958d864f..c399be3ef0 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LoginSSOPage, ApplicationsUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; @@ -25,7 +25,6 @@ import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process- 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 { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; -import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; describe('Task', () => { diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index 113d1f8385..75e0dd3bb8 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LoginSSOPage, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { ProcessServicesPage } from '../pages/adf/process-services/process-services.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; @@ -23,7 +23,6 @@ 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 { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; -import { UsersActions } from '../actions/users.actions'; import { browser } from 'protractor'; describe('Task Filters Sorting', () => { diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 5d493dec5c..0bfb1d80ad 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -15,9 +15,16 @@ * limitations under the License. */ -import { LoginSSOPage, PaginationPage, ApplicationsUtil, ProcessUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + LoginSSOPage, + PaginationPage, + ProcessUtil, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../actions/users.actions'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index d1d6053609..e85484ef81 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; 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-file-widget.e2e.ts b/e2e/process-services/widgets/attach-file-widget.e2e.ts index a5f11597c6..81eef68450 100644 --- a/e2e/process-services/widgets/attach-file-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-file-widget.e2e.ts @@ -15,16 +15,23 @@ * limitations under the License. */ -import { LoginSSOPage, Widget, ViewerPage, FileBrowserUtil, ApplicationsUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + FileBrowserUtil, + LoginSSOPage, + UsersActions, + ViewerPage, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; -import { UsersActions } from '../../actions/users.actions'; import { TaskDetailsPage } from '../../pages/adf/process-services/task-details.page'; import { TasksListPage } from '../../pages/adf/process-services/tasks-list.page'; import { FiltersPage } from '../../pages/adf/process-services/filters.page'; +import CONSTANTS = require('../../util/constants'); describe('Attach widget - File', () => { diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index 11123e462a..1d93892ab9 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Attach Folder widget', () => { diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index 03abf2cedd..f3af428c46 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Checkbox Widget', () => { diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 432ea9c290..9356837ece 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Date and time widget', () => { diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index 25408fc7cb..3b83e2c43d 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -15,21 +15,21 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; import { - LoginSSOPage, - BrowserActions, - Widget, - FormPage, + ApiService, ApplicationsUtil, + BrowserActions, + FormPage, + LoginSSOPage, ProcessUtil, - ApiService + UsersActions, + Widget } from '@alfresco/adf-testing'; 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/form-demo.page'; import { customDateFormAPS1 } from '../../resources/forms/custom-date-form'; +import CONSTANTS = require('../../util/constants'); 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 461a8b5cc9..6f54e61c0c 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Document Template widget', () => { diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index a5f122b04e..074dae2a70 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Dropdown widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.DROPDOWN; diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index 70a144fac8..9a23cb1eda 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -15,12 +15,19 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; +import CONSTANTS = require('../../util/constants'); describe('Dynamic Table widget ', () => { diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 93e538d601..be4a659b59 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Header widget', async () => { diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index 6df65c467b..f42d961f6a 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Hyperlink widget', () => { diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index a1adae7b02..4035485876 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Multi-line Widget', () => { const app = browser.params.resources.Files.WIDGET_CHECK_APP.MULTILINE_TEXT; diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index f4a1ef207f..d2eb8eb04b 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Number widget', () => { diff --git a/e2e/process-services/widgets/people-group-widget.e2e.ts b/e2e/process-services/widgets/people-group-widget.e2e.ts index ea7c2980ca..847159c5b8 100644 --- a/e2e/process-services/widgets/people-group-widget.e2e.ts +++ b/e2e/process-services/widgets/people-group-widget.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, Widget, ApplicationsUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index 3b3338c768..6ec49e9ad5 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('People widget', () => { diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index 3fdc797e82..ff6cfcbb91 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Radio Buttons Widget', () => { diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index 1af3070da9..cc5dabbda5 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; -import CONSTANTS = require('../../util/constants'); import { browser } from 'protractor'; +import CONSTANTS = require('../../util/constants'); describe('Text widget', () => { diff --git a/e2e/process-services/widgets/typeahead-widget.e2e.ts b/e2e/process-services/widgets/typeahead-widget.e2e.ts index d08de5c7b7..64cc06267d 100644 --- a/e2e/process-services/widgets/typeahead-widget.e2e.ts +++ b/e2e/process-services/widgets/typeahead-widget.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { UsersActions } from '../../actions/users.actions'; -import { LoginSSOPage, Widget, ApplicationsUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, ApplicationsUtil, LoginSSOPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasks.page'; import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; diff --git a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts index 0b836b6f45..bd76c525c0 100644 --- a/e2e/process-services/widgets/widget-visibility-condition.e2e.ts +++ b/e2e/process-services/widgets/widget-visibility-condition.e2e.ts @@ -15,11 +15,18 @@ * limitations under the License. */ -import { LoginSSOPage, Widget, BrowserActions, ApplicationsUtil, ProcessUtil, ApiService } from '@alfresco/adf-testing'; +import { + ApiService, + ApplicationsUtil, + BrowserActions, + LoginSSOPage, + ProcessUtil, + UsersActions, + Widget +} from '@alfresco/adf-testing'; import { browser } from 'protractor'; -import { UsersActions } from '../../actions/users.actions'; -import CONSTANTS = require('../../util/constants'); import { TasksPage } from '../../pages/adf/process-services/tasks.page'; +import CONSTANTS = require('../../util/constants'); const widgets = { textOneId: 'text1', diff --git a/e2e/search/components/search-check-list.e2e.ts b/e2e/search/components/search-check-list.e2e.ts index 8be362bccc..4a1bc61cb6 100644 --- a/e2e/search/components/search-check-list.e2e.ts +++ b/e2e/search/components/search-check-list.e2e.ts @@ -16,13 +16,14 @@ */ import { - LoginSSOPage, - BrowserActions, - UploadActions, - StringUtil, - LocalStorageUtil, ApiService, - UserModel + BrowserActions, + LocalStorageUtil, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { SearchResultsPage } from '../../pages/adf/search-results.page'; import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; @@ -30,7 +31,6 @@ import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { SearchConfiguration } from '../search.config'; import { browser } from 'protractor'; -import { UsersActions } from '../../actions/users.actions'; describe('Search Checklist Component', () => { diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index 020cfcf7b7..3b4246ed5c 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -16,13 +16,14 @@ */ import { - LoginSSOPage, - LocalStorageUtil, - UploadActions, + ApiService, DataTableComponentPage, DateUtil, - ApiService, - UserModel + LocalStorageUtil, + LoginSSOPage, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { SearchResultsPage } from '../../pages/adf/search-results.page'; @@ -31,7 +32,6 @@ import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser, ElementFinder } from 'protractor'; import { SearchConfiguration } from '../search.config'; -import { UsersActions } from '../../actions/users.actions'; describe('Search Number Range Filter', () => { diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index fcd50b4eaf..af321b7749 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -16,13 +16,14 @@ */ import { - LoginSSOPage, - BrowserActions, - StringUtil, - LocalStorageUtil, - UploadActions, ApiService, - UserModel + BrowserActions, + LocalStorageUtil, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; import { SearchResultsPage } from '../../pages/adf/search-results.page'; @@ -30,7 +31,6 @@ import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { SearchConfiguration } from '../search.config'; import { browser } from 'protractor'; -import { UsersActions } from '../../actions/users.actions'; describe('Search Radio Component', () => { diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index 6f40d7f97b..1b09b2307f 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -16,12 +16,13 @@ */ import { - LoginSSOPage, - LocalStorageUtil, - UploadActions, - DataTableComponentPage, ApiService, - UserModel + DataTableComponentPage, + LocalStorageUtil, + LoginSSOPage, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { SearchResultsPage } from '../../pages/adf/search-results.page'; @@ -30,7 +31,6 @@ import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser, ElementFinder } from 'protractor'; import { SearchConfiguration } from '../search.config'; -import { UsersActions } from '../../actions/users.actions'; describe('Search Slider Filter', () => { diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 209c3faff5..f915d2c391 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -16,12 +16,13 @@ */ import { - LoginSSOPage, + ApiService, LocalStorageUtil, + LoginSSOPage, SearchSortingPickerPage, UploadActions, - ApiService, - UserModel + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { SearchResultsPage } from '../../pages/adf/search-results.page'; @@ -30,7 +31,6 @@ import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { browser } from 'protractor'; import { SearchConfiguration } from '../search.config'; -import { UsersActions } from '../../actions/users.actions'; describe('Search Sorting Picker', () => { diff --git a/e2e/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts index 829cdb40ac..afe77e5a3b 100644 --- a/e2e/search/components/search-text.e2e.ts +++ b/e2e/search/components/search-text.e2e.ts @@ -19,14 +19,20 @@ import { browser } from 'protractor'; import { FolderModel } from '../../models/ACS/folder.model'; -import { LoginSSOPage, LocalStorageUtil, BrowserActions, ApiService, UserModel } from '@alfresco/adf-testing'; +import { + ApiService, + BrowserActions, + LocalStorageUtil, + LoginSSOPage, + UserModel, + UsersActions +} from '@alfresco/adf-testing'; import { SearchDialogPage } from '../../pages/adf/dialog/search-dialog.page'; import { SearchResultsPage } from '../../pages/adf/search-results.page'; import { SearchFiltersPage } from '../../pages/adf/search-filters.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { SearchConfiguration } from '../search.config'; -import { UsersActions } from '../../actions/users.actions'; describe('Search component - Text widget', () => { diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index c63c4b8aa2..e4b1c3bf5d 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -18,14 +18,15 @@ import { browser } from 'protractor'; import { - LoginSSOPage, - UploadActions, - StringUtil, - LocalStorageUtil, - BrowserActions, - ViewerPage, ApiService, - UserModel + BrowserActions, + LocalStorageUtil, + LoginSSOPage, + StringUtil, + UploadActions, + UserModel, + UsersActions, + ViewerPage } from '@alfresco/adf-testing'; import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; import { ContentServicesPage } from '../pages/adf/content-services.page'; @@ -34,7 +35,6 @@ import { FileModel } from '../models/ACS/file.model'; import { FolderModel } from '../models/ACS/folder.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { SearchConfiguration } from './search.config'; -import { UsersActions } from '../actions/users.actions'; describe('Search component - Search Bar', () => { diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index 00872958ab..c362458699 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -21,19 +21,19 @@ import { SearchResultsPage } from '../pages/adf/search-results.page'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { - StringUtil, - DocumentListPage, - PaginationPage, - LoginSSOPage, - LocalStorageUtil, - UploadActions, - BrowserActions, ApiService, - UserModel + BrowserActions, + DocumentListPage, + LocalStorageUtil, + LoginSSOPage, + PaginationPage, + StringUtil, + UploadActions, + UserModel, + UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { SearchConfiguration } from './search.config'; -import { UsersActions } from '../actions/users.actions'; describe('Search Filters', () => { diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index e68be2ecbe..eb9fb3d884 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { StringUtil, UploadActions, LoginSSOPage, ApiService, UserModel } from '@alfresco/adf-testing'; -import CONSTANTS = require('../util/constants'); +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; import { SearchResultsPage } from '../pages/adf/search-results.page'; import { SearchFiltersPage } from '../pages/adf/search-filters.page'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; +import CONSTANTS = require('../util/constants'); describe('Search Component - Multi-Select Facet', () => { const loginPage = new LoginSSOPage(); diff --git a/e2e/search/search-page.e2e.ts b/e2e/search/search-page.e2e.ts index 0859e8f9e5..15034913bf 100644 --- a/e2e/search/search-page.e2e.ts +++ b/e2e/search/search-page.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { LoginSSOPage, UploadActions, StringUtil, ApiService, UserModel } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { SearchDialogPage } from '../pages/adf/dialog/search-dialog.page'; import { ContentServicesPage } from '../pages/adf/content-services.page'; @@ -25,7 +25,6 @@ import { SearchResultsPage } from '../pages/adf/search-results.page'; import { FolderModel } from '../models/ACS/folder.model'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import { UsersActions } from '../actions/users.actions'; describe('Search component - Search Page', () => { const search = { diff --git a/lib/testing/src/lib/core/actions/public-api.ts b/lib/testing/src/lib/core/actions/public-api.ts index 13086ece5b..a7e39b5397 100644 --- a/lib/testing/src/lib/core/actions/public-api.ts +++ b/lib/testing/src/lib/core/actions/public-api.ts @@ -18,6 +18,7 @@ export * from './identity/public-api'; export * from './api.service'; export * from './drop.actions'; +export * from './users.actions'; export * from './api'; export * from './api.util'; export * from './e2e-request-api.helper'; diff --git a/e2e/actions/users.actions.ts b/lib/testing/src/lib/core/actions/users.actions.ts similarity index 77% rename from e2e/actions/users.actions.ts rename to lib/testing/src/lib/core/actions/users.actions.ts index e61ca9ae40..76762e46db 100644 --- a/e2e/actions/users.actions.ts +++ b/lib/testing/src/lib/core/actions/users.actions.ts @@ -21,8 +21,11 @@ import * as remote from 'selenium-webdriver/remote'; import { browser } from 'protractor'; import { ImageUploadRepresentation, UserRepresentation } from '@alfresco/js-api'; -import { ApiService, IdentityService, UserModel, Logger } from '@alfresco/adf-testing'; -import { Tenant } from '../models/APS/tenant'; +import { IdentityService } from './identity/identity.service'; +import { UserModel } from '../models/user.model'; +import { ApiService } from './api.service'; +import { Logger } from '../utils/logger'; +import { Tenant } from '../models/tenant'; export class UsersActions { @@ -36,17 +39,10 @@ export class UsersActions { } } - async createUser(emailOrUserModel?: string | UserModel, firstName?: string, lastName?: string, tenantId?: number, password?: string): Promise { - let user; - - if (typeof emailOrUserModel !== 'string') { - user = new UserModel(emailOrUserModel); - } else { - user = new UserModel({ emailOrUserModel, firstName, lastName, tenantId, password }); - } + async createUser(userModel?: UserModel): Promise { + const user = new UserModel({ ...(userModel ? userModel : {}) }); try { - if (this.api.apiService.isEcmConfiguration() || (this.api.apiService.isEcmBpmConfiguration())) { Logger.log('Create user ECM'); await this.api.apiService.core.peopleApi.addPerson({ @@ -60,25 +56,14 @@ export class UsersActions { if (this.api.apiService.isBpmConfiguration() || (this.api.apiService.isEcmBpmConfiguration())) { Logger.log('Create user BPM'); - - if (tenantId || (emailOrUserModel && typeof emailOrUserModel !== 'string' && emailOrUserModel.tenantId)) { - let tenantIdUser = 1; - - if (typeof emailOrUserModel !== 'string' && emailOrUserModel.tenantId) { - tenantIdUser = emailOrUserModel.tenantId; - } else if (tenantIdUser) { - tenantIdUser = tenantId; - } - - const apsUser = await this.createApsUser(tenantIdUser, user.email, user.firstName, user.lastName, user.password); + if (user.tenantId) { + const apsUser = await this.createApsUser(user.tenantId, user.email, user.firstName, user.lastName, user.password); user.id = apsUser.id; - } else { const apsUser = await this.createTenantAndUser(user.email, user.firstName, user.lastName, user.password); user.tenantId = apsUser.tenantId; user.id = apsUser.id; } - } if (this.api.apiService.isOauthConfiguration()) { diff --git a/lib/testing/src/lib/core/models/public-api.ts b/lib/testing/src/lib/core/models/public-api.ts index dee0bd51ba..738cb4ae36 100644 --- a/lib/testing/src/lib/core/models/public-api.ts +++ b/lib/testing/src/lib/core/models/public-api.ts @@ -17,3 +17,4 @@ export * from './user.model'; export * from './application-model'; +export * from './tenant'; diff --git a/e2e/models/APS/tenant.ts b/lib/testing/src/lib/core/models/tenant.ts similarity index 95% rename from e2e/models/APS/tenant.ts rename to lib/testing/src/lib/core/models/tenant.ts index dbf7c416ef..ec92848818 100644 --- a/e2e/models/APS/tenant.ts +++ b/lib/testing/src/lib/core/models/tenant.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { StringUtil } from '@alfresco/adf-testing'; +import { StringUtil } from '../utils/string.util'; /** * Create tenant JSON Object diff --git a/lib/testing/src/lib/core/models/user.model.ts b/lib/testing/src/lib/core/models/user.model.ts index a3ed8e53ae..df3ca0d2db 100644 --- a/lib/testing/src/lib/core/models/user.model.ts +++ b/lib/testing/src/lib/core/models/user.model.ts @@ -28,8 +28,8 @@ export class UserModel { username?: string; idIdentityService?: string; type = 'enterprise'; - tenantId; - company; + tenantId?: number; + company?: string; id: number; constructor(details: any = {}) { diff --git a/lib/testing/src/lib/core/pages/context-menu.page.ts b/lib/testing/src/lib/core/pages/context-menu.page.ts index 7dec35ee58..1b2024cd42 100644 --- a/lib/testing/src/lib/core/pages/context-menu.page.ts +++ b/lib/testing/src/lib/core/pages/context-menu.page.ts @@ -17,7 +17,7 @@ import { BrowserActions } from '../utils/browser-actions'; import { element, by } from 'protractor'; -import { BrowserVisibility } from '../public-api'; +import { BrowserVisibility } from '../utils/browser-visibility'; export class ContextMenuPage { contextMenu = element(by.id('adf-context-menu-content'));