Refactor e2e's ApiService (#7101)

* Refactor e2e's ApiService

* Fix bits here and there

* [ci:force] Remove unused imports

* [ci:force] Extract shared part from adf-testing

* [ci:force] Extract StringUtils as well

* Make protractor's Logger not have duplicated code

* [ci:force]

e2e/content-services/components/comment-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -40,7 +39,7 @@ describe('Comment', () => {
     const commentsPage: CommentsPage = new CommentsPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const commentsApi = new CommentsApi(apiService.getInstance());
 
     let userFullName, nodeId;

e2e/content-services/components/lock-file.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -41,7 +40,7 @@ describe('Lock File', () => {
 
     const adminUser = new UserModel();
     const managerUser = new UserModel();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     const waitActions = new WaitActions(apiService);

e2e/content-services/components/permissions-component.e2e.ts

@@ -18,8 +18,7 @@
 import { PermissionsPage } from '../../content-services/pages/permissions.page';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
-import {
+import { createApiService,
-    ApiService,
     BrowserActions, Logger,
     LoginPage,
     NotificationHistoryPage,
@@ -41,7 +40,7 @@ import { GroupsApi } from '@alfresco/js-api';
 
 describe('Permissions Component', () => {
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     const permissionsPage = new PermissionsPage();

e2e/content-services/components/share-file.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApiUtil,
     BrowserActions,
     LocalStorageUtil,
@@ -48,7 +47,7 @@ describe('Share file', () => {
 
     let acsUser: UserModel;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     const sharedLinksApi = new SharedlinksApi(apiService.getInstance());

e2e/content-services/components/site-permissions.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { PermissionsPage } from '../../content-services/pages/permissions.page';
-import {
+import { createApiService,
-    ApiService,
     BrowserActions, Logger,
     LoginPage,
     NotificationHistoryPage, SearchService,
@@ -40,7 +39,7 @@ import { NotificationDemoPage } from '../../core/pages/notification.page';
 
 describe('Permissions Component', () => {
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const searchService = new SearchService(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());

e2e/content-services/components/social.component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LikePage,
     LoginPage,
     RatePage,
@@ -41,7 +40,7 @@ describe('Social component', () => {
     const componentVisitor = new UserModel();
     const secondComponentVisitor = new UserModel();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());

e2e/content-services/components/tag-component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { FileModel } from '../../models/ACS/file.model';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -36,7 +35,7 @@ describe('Tag component', () => {
     const navigationBarPage = new NavigationBarPage();
 
     let acsUser: UserModel;
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const tagsApi = new TagsApi(apiService.getInstance());
 

e2e/content-services/components/tree-view-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { TreeViewPage } from './../pages/tree-view.page';
 import { NodesApi } from '@alfresco/js-api';
@@ -27,7 +27,7 @@ describe('Tree View Component', () => {
     const treeViewPage = new TreeViewPage();
 
     let acsUser: UserModel;
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());

e2e/content-services/components/unshare-file.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import CONSTANTS = require('../../util/constants');
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     ErrorPage,
     LoginPage,
@@ -44,7 +43,7 @@ describe('Unshare file', () => {
     const navigationBarPage = new NavigationBarPage();
     const shareDialog = new ShareDialogPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());

e2e/content-services/directives/create-folder-directive.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     NotificationHistoryPage,
     StringUtil,
@@ -38,7 +37,7 @@ describe('Create folder directive', () => {
     const metadataViewPage = new MetadataViewPage();
     let acsUser: UserModel;
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {

e2e/content-services/directives/create-library-directive.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { CreateLibraryDialogPage } from '../../core/pages/dialog/create-library-dialog.page';
 import { CustomSourcesPage } from '../../core/pages/custom-sources.page';
@@ -29,7 +29,7 @@ describe('Create library directive', () => {
     const createLibraryDialog = new CreateLibraryDialogPage();
     const customSourcesPage = new CustomSourcesPage();
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const visibility = {

e2e/content-services/directives/delete-directive.e2e.ts

@@ -17,8 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     LoginPage,
     PaginationPage,
@@ -46,7 +45,7 @@ describe('Delete Directive', () => {
     const acsUser = new UserModel();
     const secondAcsUser = new UserModel();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const permissionActions = new PermissionActions(apiService);
     const usersActions = new UsersActions(apiService);

e2e/content-services/directives/download-directive.e2e.ts

@@ -17,8 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
-import {
+import { createApiService,
-    ApiService,
     BrowserVisibility,
     FileBrowserUtil,
     LoginPage,
@@ -64,7 +63,7 @@ describe('Version component actions', () => {
         location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
     });
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/content-services/directives/edit-folder-directive.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     LoginPage,
     NotificationHistoryPage,
@@ -42,7 +41,7 @@ describe('Edit folder directive', () => {
     const navigationBarPage = new NavigationBarPage();
     const notificationHistoryPage = new NotificationHistoryPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());
 

e2e/content-services/directives/favorite-directive.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ContentNodeSelectorDialogPage,
     LoginPage,
     StringUtil,
@@ -42,7 +41,7 @@ describe('Favorite directive', () => {
     const trashcanPage = new TrashcanPage();
     const contentListPage = contentServicesPage.getDocumentList();
     const contentNodeSelector = new ContentNodeSelectorDialogPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const pdfFile = new FileModel({

e2e/content-services/directives/restore-content-directive.e2e.ts

@@ -21,8 +21,7 @@ import { NodeEntry } from '@alfresco/js-api';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { TrashcanPage } from '../../core/pages/trashcan.page';
-import {
+import { createApiService,
-    ApiService,
     BreadcrumbPage,
     LoginPage,
     NotificationHistoryPage,
@@ -44,7 +43,7 @@ describe('Restore content directive', () => {
     const breadCrumbPage = new BreadcrumbPage();
     const notificationHistoryPage = new NotificationHistoryPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const waitActions = new WaitActions(apiService);
 

e2e/content-services/directives/sso-download-directive-component.e2e.ts

@@ -18,8 +18,7 @@
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
-import {
+import { createApiService,
-    ApiService,
     FileBrowserUtil,
     IdentityService,
     LoginPage,
@@ -40,7 +39,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
     const loginSsoPage = new LoginPage();
     const viewerPage = new ViewerPage();
 
-    const apiService = new ApiService({ authType: 'OAUTH' });
+    const apiService = createApiService({ authType: 'OAUTH' });
     const uploadActions = new UploadActions(apiService);
     const identityService = new IdentityService(apiService);
     const usersActions = new UsersActions(apiService);

e2e/content-services/document-list/document-list-actions.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     ContentNodeSelectorDialogPage,
     LoginPage,
     StringUtil,
@@ -37,7 +36,7 @@ describe('Document List Component - Actions', () => {
     const navigationBarPage = new NavigationBarPage();
     const contentNodeSelector = new ContentNodeSelectorDialogPage();
     const viewerPage = new ViewerPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const uploadActions = new UploadActions(apiService);

e2e/content-services/document-list/document-list-component.e2e.ts

@@ -17,7 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { browser } from 'protractor';
-import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, StringUtil, UploadActions, UsersActions, ViewerPage } from '@alfresco/adf-testing';
 import { FileModel } from '../../models/ACS/file.model';
 import moment from 'moment-es6';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -30,7 +30,7 @@ describe('Document List Component', () => {
     const navigationBarPage = new NavigationBarPage();
 
     const contentServicesPage = new ContentServicesPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const uploadActions = new UploadActions(apiService);

e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     ContentNodeSelectorDialogPage,
     LoginPage,
@@ -41,7 +40,7 @@ describe('Document List Component', () => {
     const contentNodeSelector = new ContentNodeSelectorDialogPage();
     const notificationHistoryPage = new NotificationHistoryPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());
     const uploadActions = new UploadActions(apiService);

e2e/content-services/document-list/document-list-folder-actions.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { by, element } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     BreadcrumbPage,
     BreadcrumbDropdownPage,
     ContentNodeSelectorDialogPage,
@@ -44,7 +43,7 @@ describe('Document List Component - Actions', () => {
     const breadCrumbPage = new BreadcrumbPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const uploadActions = new UploadActions(apiService);

e2e/content-services/document-list/document-list-gallery.e2e.ts

@@ -17,7 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { browser } from 'protractor';
-import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
@@ -25,7 +25,7 @@ describe('Document List Component', () => {
 
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const uploadActions = new UploadActions(apiService);

e2e/content-services/document-list/document-list-pagination.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ArrayUtil,
     FileBrowserUtil,
     LocalStorageUtil,
@@ -62,7 +61,7 @@ describe('Document List - Pagination', () => {
     const folderThreeModel = new FolderModel({ name: 'folderThree' });
     const numberOfSubFolders = 6;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
 

e2e/content-services/document-list/document-list-permissions.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
-import { ApiService, BrowserActions, ErrorPage, LoginPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, BrowserActions, ErrorPage, LoginPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
 import { SitesApi } from '@alfresco/js-api';
 
 describe('Document List Component', () => {
@@ -27,7 +27,7 @@ describe('Document List Component', () => {
     const contentServicesPage = new ContentServicesPage();
     const errorPage = new ErrorPage();
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let privateSite;

e2e/content-services/document-list/document-list-properties.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, DropActions, LoginPage, UploadActions, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, DropActions, LoginPage, UploadActions, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { browser } from 'protractor';
@@ -28,7 +28,7 @@ describe('Document List Component - Properties', () => {
     const navigationBar = new NavigationBarPage();
 
     let subFolder, parentFolder;
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     let acsUser = null;
     const usersActions = new UsersActions(apiService);

e2e/content-services/document-list/document-list-selection.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, PaginationPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { FolderModel } from '../../models/ACS/folder.model';
@@ -36,7 +36,7 @@ describe('Document List - Selection', () => {
         'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
     });
     const displayColumnName = 'Display name';
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {

e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts

@@ -17,7 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { browser } from 'protractor';
-import { ApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, StringUtil, UploadActions, UsersActions } from '@alfresco/adf-testing';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
@@ -26,7 +26,7 @@ describe('Document List Component', () => {
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
     let uploadedFolder, uploadedFolderExtra;
-    const apiService = new ApiService();
+    const apiService = createApiService();
 
     const uploadActions = new UploadActions(apiService);
     let acsUser = null;

e2e/content-services/metadata/aspect-oriented-config.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     CheckboxPage,
     LocalStorageUtil,
     LoginPage,
@@ -42,7 +41,7 @@ describe('Aspect oriented config', () => {
     const modelOneName = 'modelOne', emptyAspectName = 'emptyAspect';
     const defaultModel = 'cm', defaultEmptyPropertiesAspect = 'taggable', aspectName = 'Taggable';
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());
     const customModelApi = new CustomModelApi(apiService.getInstance());

e2e/content-services/metadata/metadata-content-type.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     LoginPage,
     ModelActions,
@@ -35,7 +34,7 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 
 describe('content type', () => {
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const modelActions = new ModelActions(apiService);
     const uploadActions = new UploadActions(apiService);

e2e/content-services/metadata/metadata-permissions.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -60,7 +59,7 @@ describe('permissions', () => {
         name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
         location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path
     });
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const uploadActions = new UploadActions(apiService);

e2e/content-services/metadata/metadata-properties.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     CheckboxPage,
     LoginPage,
     UploadActions,
@@ -57,7 +56,7 @@ describe('CardView Component - properties', () => {
         name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
         location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path
     });
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/content-services/metadata/metadata-smoke-tests.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     LocalStorageUtil,
     LoginPage,
@@ -63,7 +62,7 @@ describe('Metadata component', () => {
         location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path
     });
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/content-services/upload/cancel-upload.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
 import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
@@ -24,7 +24,7 @@ import { FileModel } from '../../models/ACS/file.model';
 
 describe('Upload component', async () => {
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const contentServicesPage = new ContentServicesPage();
     const uploadDialog = new UploadDialogPage();
     const uploadToggles = new UploadTogglesPage();

e2e/content-services/upload/excluded-file.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser, by, element } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     DropActions,
     LocalStorageUtil,
     LoginPage,
@@ -38,7 +37,7 @@ describe('Upload component - Excluded Files', () => {
     const uploadToggles = new UploadTogglesPage();
     const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let acsUser: UserModel;

e2e/content-services/upload/upload-dialog.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
 import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
@@ -30,7 +30,7 @@ describe('Upload component', () => {
     const uploadToggles = new UploadTogglesPage();
     const loginPage = new LoginPage();
     const versionManagePage = new VersionManagePage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
 
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);

e2e/content-services/upload/uploader-component.e2e.ts

@@ -17,8 +17,7 @@
 
 import { browser, by, element } from 'protractor';
 
-import {
+import { createApiService,
-    ApiService,
     DropActions,
     LoginPage,
     StringUtil,
@@ -40,7 +39,7 @@ describe('Upload component', () => {
     const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
 

e2e/content-services/upload/user-permission.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginPage, NotificationHistoryPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, NotificationHistoryPage, StringUtil, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -31,7 +31,7 @@ describe('Upload - User permission', () => {
     const loginPage = new LoginPage();
     const navigationBarPage = new NavigationBarPage();
     const notificationHistoryPage = new NotificationHistoryPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const emptyFile = new FileModel({

e2e/content-services/upload/version-actions.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     BrowserVisibility,
     FileBrowserUtil,
@@ -40,7 +39,7 @@ describe('Version component actions', () => {
     const versionManagePage = new VersionManagePage();
     const navigationBarPage = new NavigationBarPage();
     const uploadDialog = new UploadDialogPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const viewerPage = new ViewerPage();
 

e2e/content-services/upload/version-permissions.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser, by, element } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     NotificationHistoryPage,
     StringUtil,
@@ -50,7 +49,7 @@ describe('Version component permissions', () => {
     const managerUser = new UserModel();
     const fileCreatorUser = new UserModel();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());
 

e2e/content-services/upload/version-properties.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser, by, element } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     BrowserVisibility,
     LoginPage,
     UploadActions,
@@ -37,7 +36,7 @@ describe('Version Properties', () => {
     const navigationBarPage = new NavigationBarPage();
     const viewerPage = new ViewerPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let acsUser: UserModel;

e2e/content-services/upload/version-smoke-tests.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { VersionManagePage } from '../../core/pages/version-manager.page';
 import { FileModel } from '../../models/ACS/file.model';
@@ -30,7 +30,7 @@ describe('Version component', () => {
     const navigationBarPage = new NavigationBarPage();
     const versionManagePage = new VersionManagePage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let acsUser: UserModel;

e2e/core/datatable/data-table-component-selection.e2e.ts

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { ApiService, DataTableComponentPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, DataTableComponentPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { DataTablePage } from '../../core/pages/data-table.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Datatable component - selection', () => {
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const dataTablePage = new DataTablePage();

e2e/core/datatable/data-table-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     DropActions,
     LoginPage,
     NotificationHistoryPage,
@@ -42,7 +41,7 @@ describe('Datatable component', () => {
         'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
     });
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {

e2e/core/infinite-scrolling.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LocalStorageUtil,
     LoginPage,
     StringUtil,
@@ -36,7 +35,7 @@ describe('Enable infinite scrolling', () => {
     const infinitePaginationPage = new InfinitePaginationPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const acsUser = new UserModel();

e2e/core/login/login-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     ErrorPage,
     LocalStorageUtil,
@@ -47,7 +46,7 @@ describe('Login component', () => {
         required: 'Required'
     };
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {

e2e/core/notifications-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NotificationDemoPage } from '../core/pages/notification.page';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
@@ -25,7 +25,7 @@ describe('Notifications Component', () => {
     const loginPage = new LoginPage();
     const notificationPage = new NotificationDemoPage();
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let acsUser: UserModel;

e2e/core/pagination-empty-current-page.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ArrayUtil,
     LoginPage,
     PaginationPage,
@@ -38,7 +37,7 @@ describe('Pagination - returns to previous page when current is empty', () => {
     const paginationPage = new PaginationPage();
 
     const viewerPage = new ViewerPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const acsUser = new UserModel();

e2e/core/user-info-component-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, SettingsPage, UserInfoPage, UsersActions } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 
 describe('User Info - SSO', () => {
@@ -24,7 +24,7 @@ describe('User Info - SSO', () => {
     const loginSSOPage = new LoginPage();
     const userInfoPage = new UserInfoPage();
 
-    const apiService = new ApiService({ authType: 'OAUTH', provider: 'ECM' });
+    const apiService = createApiService({ authType: 'OAUTH', provider: 'ECM' });
     const usersActions = new UsersActions(apiService);
 
     let identityUser;

e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -40,7 +39,7 @@ describe('Viewer', () => {
 
     let site;
     const acsUser = new UserModel();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const uploadActions = new UploadActions(apiService);

e2e/core/viewer/file-extensions/viewer-component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService, LocalStorageUtil,
-    ApiService, LocalStorageUtil,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -39,7 +38,7 @@ describe('Viewer', () => {
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService({ authType: 'ECM', provider: 'ECM' });
+    const apiService = createApiService({ provider: 'ECM', authType: 'BASIC' });
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -43,7 +42,7 @@ describe('Viewer', () => {
         'location': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_path
     });
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -36,7 +35,7 @@ describe('Viewer', () => {
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -36,7 +35,7 @@ describe('Viewer', () => {
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
 

e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -36,7 +35,7 @@ describe('Viewer', () => {
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     let site;

e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     LoginPage,
     StringUtil,
     UploadActions,
@@ -38,7 +37,7 @@ describe('Viewer', () => {
     const contentServicesPage = new ContentServicesPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     let site;

e2e/core/viewer/viewer-content-services-component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser, by, element, protractor } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     LoginPage,
     UploadActions,
@@ -83,7 +82,7 @@ describe('Content Services Viewer', () => {
         'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PPT.first_page_text
     });
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
 

e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, FileBrowserUtil, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
+import { createApiService, FileBrowserUtil, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -29,7 +29,7 @@ describe('Viewer', () => {
     const loginPage = new LoginPage();
     const contentServicesPage = new ContentServicesPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/core/viewer/viewer-properties.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     DataTableComponentPage,
     LoginPage,
     UploadActions,
@@ -47,7 +46,7 @@ describe('Viewer', () => {
         'name': 'fileForOverlay.png',
         'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path
     });
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
 

e2e/core/viewer/viewer-share-content.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     BrowserActions,
     LoginPage,
     StringUtil,
@@ -41,7 +40,7 @@ describe('Viewer', () => {
     const contentServicesPage = new ContentServicesPage();
     const shareDialog = new ShareDialogPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const uploadActions = new UploadActions(apiService);
     const sharedlinksApi = new SharedlinksApi(apiService);

e2e/insights/analytics-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 import { AnalyticsPage } from '../process-services/pages/analytics.page';
 import { ProcessServicesPage } from '../process-services/pages/process-services.page';
@@ -32,7 +32,7 @@ describe('Analytics Smoke Test', () => {
     const reportTitle = 'New Title';
     let procUserModel: UserModel;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {

e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService, AppListCloudPage, GroupIdentityService, IdentityService,
-    ApiService, AppListCloudPage, GroupIdentityService, IdentityService,
     LoginPage, NotificationHistoryPage, ProcessCloudWidgetPage, ProcessDefinitionsService,
     ProcessInstancesService, QueryService, TaskFormCloudComponent, TaskHeaderCloudPage,
     TasksService
@@ -40,7 +39,7 @@ describe('Form Field Component - Dropdown Widget', () => {
     const taskHeaderCloudPage = new TaskHeaderCloudPage();
     const widget = new ProcessCloudWidgetPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/form-field/json-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
@@ -47,7 +46,7 @@ describe('Form Field Component - JSON Widget', () => {
     const editJsonDialog = new EditJsonDialog();
     const widget = new ProcessCloudWidgetPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const tasksService = new TasksService(apiService);

e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts

@@ -19,8 +19,7 @@ import {
     LoginPage,
     AppListCloudPage,
     IdentityService,
-    GroupIdentityService,
+    GroupIdentityService, createApiService,
-    ApiService,
     StringUtil,
     StartTasksCloudPage,
     TaskFormCloudComponent,
@@ -53,7 +52,7 @@ describe('Task cloud visibility', async () => {
     const loginSSOPage = new LoginPage();
     const widget = new ProcessCloudWidgetPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
 

e2e/process-services-cloud/people/people-group-cloud-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     GroupCloudComponentPage,
     GroupIdentityService,
     IdentityService,
@@ -38,7 +37,7 @@ describe('People Groups Cloud Component', () => {
         const peopleCloudComponent = new PeopleCloudComponentPage();
         const groupCloudComponentPage = new GroupCloudComponentPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const rolesService = new RolesService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);

e2e/process-services-cloud/people/people-group-cloud-filter-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
+import { createApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { PeopleGroupCloudComponentPage } from './../pages/people-group-cloud-component.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -30,7 +30,7 @@ describe('People Groups Cloud Component', () => {
         const peopleCloudComponent = new PeopleCloudComponentPage();
         const groupCloudComponentPage = new GroupCloudComponentPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
 

e2e/process-services-cloud/process/process-custom-filters.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     BrowserActions,
     FilterProps,
@@ -65,7 +64,7 @@ describe('Process list cloud', () => {
 
         const tasksCloudDemoPage = new TasksCloudDemoPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/process/process-filter-results.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     DateUtil,
     GroupIdentityService,
@@ -59,7 +58,7 @@ describe('Process filters cloud', () => {
     const tasksCloudDemoPage = new TasksCloudDemoPage();
     const processListPage = new ProcessListPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/process/process-filter-task.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     LocalStorageUtil,
     LoginPage,
@@ -64,7 +63,7 @@ describe('Process filters cloud', () => {
     const taskHeaderCloudPage = new TaskHeaderCloudPage();
     const taskFormCloudComponent = new TaskFormCloudComponent();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const processDefinitionService = new ProcessDefinitionsService(apiService);
     const processInstancesService = new ProcessInstancesService(apiService);
     const queryService = new QueryService(apiService);

e2e/process-services-cloud/process/process-filters-cloud.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
@@ -44,7 +43,7 @@ describe('Process filters cloud', () => {
         const tasksCloudDemoPage = new TasksCloudDemoPage();
         const editProcessFilterCloudComponentPage = new EditProcessFilterCloudComponentPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/process/process-header-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing';
+import { createApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
 import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
@@ -48,7 +48,7 @@ describe('Process Header cloud component', () => {
         const editProcessFilterConfiguration = new EditProcessFilterConfiguration();
         const editProcessFilterConfigFile = editProcessFilterConfiguration.getConfiguration();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/process/process-list-selection-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing';
+import { createApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
 import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
@@ -42,7 +42,7 @@ describe('Process list cloud', () => {
         const tasksCloudDemoPage = new TasksCloudDemoPage();
         const processDetailsCloudDemoPage = new ProcessDetailsCloudDemoPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/process/process-task-attach-content-file-cloud.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     ContentNodeSelectorDialogPage,
     GroupIdentityService,
@@ -56,7 +55,7 @@ describe('Process Task - Attach content file', () => {
     const processCloudWidget = new ProcessCloudWidgetPage();
     const contentNodeSelectorDialog = new ContentNodeSelectorDialogPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const processDefinitionService = new ProcessDefinitionsService(apiService);
     const processInstancesService = new ProcessInstancesService(apiService);

e2e/process-services-cloud/start-task/start-process-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing';
+import { createApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing';
 import { browser, protractor } from 'protractor';
 import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -34,7 +34,7 @@ describe('Start Process', () => {
 
     const startProcessPage = new StartProcessCloudPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
 

e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts

@@ -25,8 +25,7 @@ import {
     TaskHeaderCloudPage,
     StartTasksCloudPage,
     PeopleCloudComponentPage,
-    TasksService,
+    TasksService, createApiService,
-    ApiService,
     IdentityService,
     GroupIdentityService
 } from '@alfresco/adf-testing';
@@ -48,7 +47,7 @@ describe('Start Task', () => {
     const startTask = new StartTasksCloudPage();
     const peopleCloudComponent = new PeopleCloudComponentPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
 

e2e/process-services-cloud/start-task/start-task-form-cloud.e2e.ts

@@ -23,8 +23,7 @@ import {
     AppListCloudPage,
     BreadcrumbDropdownPage,
     StringUtil,
-    StartTasksCloudPage,
+    StartTasksCloudPage, createApiService,
-    ApiService,
     IdentityService,
     GroupIdentityService,
     TaskFormCloudComponent,
@@ -72,7 +71,7 @@ describe('Start Task Form', () => {
     const taskHeaderCloudPage = new TaskHeaderCloudPage();
     const processHeaderCloud = new ProcessHeaderCloudPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);

e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts

@@ -25,8 +25,7 @@ import {
     GroupCloudComponentPage,
     StartTasksCloudPage,
     PeopleCloudComponentPage,
-    TasksService,
+    TasksService, createApiService,
-    ApiService,
     IdentityService,
     GroupIdentityService
 } from '@alfresco/adf-testing';
@@ -46,7 +45,7 @@ describe('Start Task - Group Cloud Component', () => {
     const peopleCloudComponent = new PeopleCloudComponentPage();
     const groupCloud = new GroupCloudComponentPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
 

e2e/process-services-cloud/task-list/apps-section-cloud.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
+import { createApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
@@ -27,7 +27,7 @@ describe('Applications list', () => {
     const navigationBarPage = new NavigationBarPage();
     const appListCloudPage = new AppListCloudPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const applicationsService = new Application(apiService);
     const identityService = new IdentityService(apiService);
 

e2e/process-services-cloud/task-list/edit-process-filters-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
@@ -40,7 +39,7 @@ describe('Edit process filters cloud', () => {
     const editProcessFilter = processCloudDemoPage.editProcessFilterCloudComponent();
     const processFilter = processCloudDemoPage.processFilterCloudComponent;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
 

e2e/process-services-cloud/task-list/edit-task-filters-component.e2e.ts

@@ -18,8 +18,7 @@
 import { browser } from 'protractor';
 import {
     AppListCloudPage,
-    StringUtil,
+    StringUtil, createApiService,
-    ApiService,
     LoginPage,
     TasksService,
     IdentityService,
@@ -40,7 +39,7 @@ describe('Edit task filters cloud', () => {
     const editTaskFilter = tasksCloudDemoPage.editTaskFilterCloud;
     const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const tasksService = new TasksService(apiService);

e2e/process-services-cloud/task-list/task-counters-cloud.e2e.ts

@@ -18,8 +18,7 @@
 import { browser } from 'protractor';
 import {
     LoginPage,
-    TasksService,
+    TasksService, createApiService,
-    ApiService,
     AppListCloudPage,
     StringUtil,
     IdentityService,
@@ -45,7 +44,7 @@ describe('Task counters cloud', () => {
         const notificationHistoryPage = new NotificationHistoryPage();
         const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const tasksService = new TasksService(apiService);

e2e/process-services-cloud/task-list/task-filters-cloud.e2e.ts

@@ -18,8 +18,7 @@
 import { browser } from 'protractor';
 import {
     LoginPage,
-    TasksService,
+    TasksService, createApiService,
-    ApiService,
     AppListCloudPage,
     StringUtil,
     IdentityService,
@@ -42,7 +41,7 @@ describe('Task filters cloud', () => {
         const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
         const taskList = tasksCloudDemoPage.taskListCloudComponent();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const queryService = new QueryService(apiService);
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);

e2e/process-services-cloud/task-list/task-form-cloud-component-tab.e2e.ts

@@ -18,8 +18,7 @@
 import { browser } from 'protractor';
 import {
     AppListCloudPage,
-    StringUtil,
+    StringUtil, createApiService,
-    ApiService,
     LoginPage,
     TasksService,
     ProcessDefinitionsService,
@@ -51,8 +50,8 @@ describe('Task form cloud component', () => {
     const candidateBaseApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.name;
     const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
     const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString();
-    const apiService = new ApiService();
+    const apiService = createApiService();
-    const apiServiceHrUser = new ApiService();
+    const apiServiceHrUser = createApiService();
 
     const visibilityConditionTasks = [];
 

e2e/process-services-cloud/task-list/task-form-cloud-component.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser, protractor } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     LoginPage,
     ProcessCloudWidgetPage,
@@ -55,7 +54,7 @@ describe('Task form cloud component', () => {
     const taskFormCloudComponent = new TaskFormCloudComponent();
     const widget = new ProcessCloudWidgetPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const tasksService = new TasksService(apiService);
     const queryService = new QueryService(apiService);
     const processDefinitionService = new ProcessDefinitionsService(apiService);

e2e/process-services-cloud/task-list/task-header-cloud.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import CONSTANTS = require('../../util/constants');
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
@@ -53,7 +52,7 @@ describe('Task Header cloud component', () => {
     const peopleCloudComponentPage = new PeopleCloudComponentPage();
     const taskHeaderCloudPage = new TaskHeaderCloudPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const tasksService = new TasksService(apiService);

e2e/process-services-cloud/task-list/task-list-properties-sort.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import {
     StringUtil, TasksService,
-    LoginPage, ApiService,
+    LoginPage, createApiService,
     AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService
 } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -40,7 +40,7 @@ describe('Edit task filters and task list properties', () => {
     const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
     const taskList = tasksCloudDemoPage.taskListCloudComponent();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const tasksService = new TasksService(apiService);

e2e/process-services-cloud/task-list/task-list-properties.e2e.ts

@@ -19,7 +19,7 @@ import { browser } from 'protractor';
 import {
     StringUtil, TasksService,
     ProcessDefinitionsService, ProcessInstancesService,
-    LoginPage, ApiService,
+    LoginPage, createApiService,
     AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil
 } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -42,7 +42,7 @@ describe('Edit task filters and task list properties', () => {
     const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
     const taskList = tasksCloudDemoPage.taskListCloudComponent();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const identityService = new IdentityService(apiService);
     const groupIdentityService = new GroupIdentityService(apiService);
     const tasksService = new TasksService(apiService);

e2e/process-services-cloud/task-list/task-list-selection.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
@@ -40,7 +39,7 @@ describe('Task list cloud - selection', () => {
         const tasksCloudDemoPage = new TasksCloudDemoPage();
         const taskFilter = tasksCloudDemoPage.taskFilterCloudComponent;
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const tasksService = new TasksService(apiService);

e2e/process-services-cloud/task-list/tasks-claim-release.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
+import { createApiService,
-    ApiService,
     AppListCloudPage,
     GroupIdentityService,
     IdentityService,
@@ -52,7 +51,7 @@ describe('Task claim/release', () => {
     const taskHeaderCloudPage = new TaskHeaderCloudPage();
     const taskFormCloudComponent = new TaskFormCloudComponent();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const processDefinitionService = new ProcessDefinitionsService(apiService);
     const processInstancesService = new ProcessInstancesService(apiService);
     const identityService = new IdentityService(apiService);

e2e/process-services-cloud/task-list/tasks-custom-filters.e2e.ts

@@ -23,8 +23,7 @@ import {
     QueryService,
     ProcessDefinitionsService,
     ProcessInstancesService,
-    LoginPage,
+    LoginPage, createApiService,
-    ApiService,
     IdentityService,
     GroupIdentityService,
     AppListCloudPage, TaskListCloudComponentPage
@@ -46,7 +45,7 @@ describe('Task filters cloud', () => {
         const editTaskFilter = tasksCloudDemoPage.editTaskFilterCloud;
         const taskList = new TaskListCloudComponentPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const identityService = new IdentityService(apiService);
         const groupIdentityService = new GroupIdentityService(apiService);
         const tasksService = new TasksService(apiService);

e2e/process-services/form/apps-section.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ModelsActions, ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing';
+import { ModelsActions, createApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing';
 import { ProcessServicesPage } from './../pages/process-services.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import CONSTANTS = require('../../util/constants');
@@ -32,7 +32,7 @@ describe('Modify applications', () => {
     const navigationBarPage = new NavigationBarPage();
     const processServicesPage = new ProcessServicesPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const modelActions = new ModelsActions(apiService);
     const apps = new ApplicationsUtil(apiService);
     const usersActions = new UsersActions(apiService);

e2e/process-services/form/attach-file-content-service.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     ContentNodeSelectorDialogPage,
     ExternalNodeSelectorDialogPage,
@@ -46,14 +45,14 @@ describe('Attach File - Content service', () => {
     const contentNodeSelector = new ContentNodeSelectorDialogPage();
     const externalNodeSelector = new ExternalNodeSelectorDialogPage();
 
-    const apiServiceExternal = new ApiService({
+    const apiServiceExternal = createApiService({
         provider: 'ECM',
         hostEcm: browser.params.testConfig.adf_external_acs.host,
         authType: 'BASIC'
     });
     const usersActionsExternal = new UsersActions(apiServiceExternal);
 
-    const apiService = new ApiService({ provider: 'ALL' });
+    const apiService = createApiService({ provider: 'ALL' });
     const integrationService = new IntegrationService(apiService);
     const applicationService = new ApplicationsUtil(apiService);
     const searchService = new SearchService(apiService);

e2e/process-services/form/attach-file-widget-start-task-app.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     LoginPage,
     UserModel,
@@ -39,7 +38,7 @@ describe('Start Task - Task App', () => {
     const taskPage = new TasksPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationService = new ApplicationsUtil(apiService);
 

e2e/process-services/form/attach-folder.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     ContentNodeSelectorDialogPage,
     IntegrationService,
@@ -37,7 +36,7 @@ import CONSTANTS = require('../../util/constants');
 describe('Attach Folder', () => {
     const app = browser.params.resources.Files.WIDGET_CHECK_APP;
 
-    const apiService = new ApiService({ provider: 'ALL' });
+    const apiService = createApiService({ provider: 'ALL' });
     const searchService = new SearchService(apiService);
     const integrationService = new IntegrationService(apiService);
     const applicationService = new ApplicationsUtil(apiService);

e2e/process-services/form/attach-form-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     FormFields,
     LoginPage,
@@ -41,7 +40,7 @@ describe('Attach Form Component', () => {
     const formFields = new FormFields();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationService = new ApplicationsUtil(apiService);
     const taskUtil = new TaskUtil(apiService);

e2e/process-services/form/checklist-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, ApplicationsUtil, LoginPage, TaskUtil, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, TaskUtil, UsersActions } from '@alfresco/adf-testing';
 import { TasksPage } from './../pages/tasks.page';
 import { ProcessServicesPage } from './../pages/process-services.page';
 import { ChecklistDialog } from './../pages/dialog/create-checklist-dialog.page';
@@ -33,7 +33,7 @@ describe('Checklist component', () => {
     const checklistDialog = new ChecklistDialog();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationService = new ApplicationsUtil(apiService);
     const taskUtil = new TaskUtil(apiService);

e2e/process-services/form/dynamic-table-date-picker.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     DatePickerCalendarPage,
     DateUtil,
@@ -38,7 +37,7 @@ describe('Dynamic Table', () => {
     const navigationBarPage = new NavigationBarPage();
     const widget = new Widget();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const modelsActions = new ModelsActions(apiService);
 

e2e/process-services/form/form-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing';
+import { createApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Form Component', () => {
@@ -25,7 +25,7 @@ describe('Form Component', () => {
     const formPage = new FormPage();
     const widget = new Widget();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let tenantId, user;

e2e/process-services/form/form-people-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     LoginPage,
     StartProcessPage,
@@ -43,7 +42,7 @@ describe('Form widgets - People ', () => {
     const processServiceTabBarPage = new ProcessServiceTabBarPage();
     const widget = new Widget();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const taskFormsApi = new TaskFormsApi(apiService.getInstance());
 

e2e/process-services/form/form-widgets-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
+import { createApiService,
-    ApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Form widgets', () => {
     const loginPage = new LoginPage();
     const widget = new Widget();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const taskFormsApi = new TaskFormsApi(apiService.getInstance());

e2e/process-services/form/people-component.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, ApplicationsUtil, LoginPage, TaskUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, TaskUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { TasksPage } from './../pages/tasks.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { ProcessServicesPage } from './../pages/process-services.page';
@@ -31,7 +31,7 @@ describe('People component', () => {
     const taskPage = new TasksPage();
     const processServices = new ProcessServicesPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const taskUtil = new TaskUtil(apiService);
     const applicationUtil = new ApplicationsUtil(apiService);