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