[ADF-5191] move reusable actions to testing package (#5842)

* [ADF-5191] move reusable actions to testing package

* * tenant added

* * improved logic

* fix circular deps error and warns

* fix unit test

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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 = {

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', () => {
 

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', () => {
 

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();

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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 = {

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', () => {
 

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 () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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';

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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();

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {

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', () => {
 

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', () => {

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;

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', () => {

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;

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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();

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', () => {
 

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', () => {
 

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', () => {
 

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', () => {
 

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';
 

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();
 

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', () => {
 

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';

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');

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', () => {
 

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';
 

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');

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';

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', () => {
 

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';

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', () => {
 

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', () => {
 

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', () => {

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';

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', () => {
 

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';

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');

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', () => {