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/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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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);

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     StartProcessPage,
@@ -47,7 +46,7 @@ describe('Stencil', () => {
     const processDetailsPage = new ProcessDetailsPage();
     const processFiltersPage = new ProcessFiltersPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let user: UserModel;

e2e/process-services/process/comment-component-processes.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ModelsActions,
@@ -38,7 +37,7 @@ describe('Comment component for Processes', () => {
     const commentsPage = new CommentsPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const modelsActions = new ModelsActions(apiService);

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

@@ -17,8 +17,7 @@
 
 import { browser } from 'protractor';
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ModelsActions,
@@ -39,7 +38,7 @@ describe('Sorting for process filters', () => {
     const processFiltersPage = new ProcessFiltersPage();
     const filtersPage = new FiltersPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const modelsActions = new ModelsActions(apiService);
     const userFiltersApi = new UserFiltersApi(apiService.getInstance());

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
 import { ProcessFiltersPage } from './../pages/process-filters.page';
 import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
 import { AppSettingsTogglesPage } from './../pages/dialog/app-settings-toggles.page';
@@ -30,7 +30,7 @@ describe('New Process Filters', () => {
     const appSettingsToggles = new AppSettingsTogglesPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const userFiltersApi = new UserFiltersApi(apiService.getInstance());
 

e2e/process-services/process/empty-process-list-component.e2e.ts

@@ -16,7 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import { ApiService, ApplicationsUtil, LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { ProcessServicesPage } from './../pages/process-services.page';
 import { ProcessFiltersPage } from './../pages/process-filters.page';
@@ -35,7 +35,7 @@ describe('Empty Process List Test', () => {
     const processDetailsPage = new ProcessDetailsPage();
     const processListPage = new ProcessListPage();
     const startProcessPage = new StartProcessPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
 
     let user;
 

e2e/process-services/process/pagination-processlist-adding-processes.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     PaginationPage,
@@ -37,7 +36,7 @@ describe('Process List - Pagination when adding processes', () => {
     const processFiltersPage = new ProcessFiltersPage();
     const processDetailsPage = new ProcessDetailsPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const processUtil = new ProcessUtil(apiService);
     const applicationsService = new ApplicationsUtil(apiService);

e2e/process-services/process/process-attachment-list-action-menu.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     FileBrowserUtil,
     LoginPage,
@@ -43,7 +42,7 @@ describe('Attachment list action menu for processes', () => {
     const navigationBarPage = new NavigationBarPage();
     const viewerPage = new ViewerPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const modelsActions = new ModelsActions(apiService);

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     BrowserActions,
     LoginPage,
@@ -48,7 +47,7 @@ describe('Process Filters Test', () => {
     const processServiceTabBarPage = new ProcessServiceTabBarPage();
     const processDetailsPage = new ProcessDetailsPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const userFiltersApi = new UserFiltersApi(apiService.getInstance());

e2e/process-services/process/process-instance-details.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ModelsActions,
@@ -43,7 +42,7 @@ describe('Process Instance Details', () => {
     const processListPage = new ProcessListPage();
     const processDetailsPage = new ProcessDetailsPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const modelsActions = new ModelsActions(apiService);

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     BrowserActions,
     LoginPage, ModelsActions,
@@ -35,7 +34,7 @@ describe('Process List Test', () => {
     const loginPage = new LoginPage();
     const processListDemoPage = new ProcessListDemoPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const applicationsUtil = new ApplicationsUtil(apiService);
     const usersActions = new UsersActions(apiService);
     const modelsActions = new ModelsActions(apiService);

e2e/process-services/process/processlist-pagination.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     PaginationPage,
@@ -38,7 +37,7 @@ describe('Process List - Pagination', () => {
     const processFiltersPage = new ProcessFiltersPage();
     const processDetailsPage = new ProcessDetailsPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
 

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

@@ -16,8 +16,7 @@
  */
 
 import CONSTANTS = require('../../util/constants');
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil, BrowserActions,
     FileBrowserUtil,
     LocalStorageUtil,
@@ -62,8 +61,8 @@ describe('Start Process Component', () => {
     const selectAppsDialog = new SelectAppsDialog();
     const widget = new Widget();
 
-    const apiService = new ApiService();
-    const apiServiceUserTwo = new ApiService();
+    const apiService = createApiService();
+    const apiServiceUserTwo = createApiService();
     const modelsActions = new ModelsActions(apiService);
     const usersActions = new UsersActions(apiService);
     const processApi = new ProcessInstancesApi(apiService.getInstance());
@@ -482,7 +481,7 @@ describe('Start Process Component', () => {
         });
 
         beforeAll(async () => {
-            const apiServiceAll = new ApiService({
+            const apiServiceAll = createApiService({
                 provider: 'ALL',
                 hostEcm: browser.params.testConfig.appConfig.ecmHost,
                 hostBpm: browser.params.testConfig.appConfig.bpmHost
@@ -494,7 +493,7 @@ describe('Start Process Component', () => {
 
             processUserModel = await usersActionsAll.createUser();
 
-            const alfrescoJsBPMAdminUser = new ApiService({ hostBpm: browser.params.testConfig.appConfig.bpmHost });
+            const alfrescoJsBPMAdminUser = createApiService({ hostBpm: browser.params.testConfig.appConfig.bpmHost });
 
             await alfrescoJsBPMAdminUser.login(processUserModel.username, processUserModel.password);
 

e2e/process-services/tasks/comment-component-tasks.e2e.ts

@@ -17,8 +17,7 @@
 
 import { browser } from 'protractor';
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ModelsActions,
@@ -41,7 +40,7 @@ describe('Comment component for Processes', () => {
     const taskPage = new TasksPage();
     const commentsPage = new CommentsPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const taskUtil = new TaskUtil(apiService);
     const modelsActions = new ModelsActions(apiService);

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     ArrayUtil,
     DateUtil,
@@ -41,7 +40,7 @@ describe('Start Task - Custom App', () => {
     const taskListSinglePage = new TaskListDemoPage();
     const paginationPage = new PaginationPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const appsRuntime = new ApplicationsUtil(apiService);
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);

e2e/process-services/tasks/info-drawer.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     BrowserActions,
     BrowserVisibility,
@@ -45,7 +44,7 @@ describe('Info Drawer', () => {
     const processServiceTabBarPage = new ProcessServiceTabBarPage();
     const processFiltersPage = new ProcessFiltersPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const applicationsService = new ApplicationsUtil(apiService);
     const modelsActions = new ModelsActions(apiService);
     const usersActions = new UsersActions(apiService);

e2e/process-services/tasks/pagination-tasklist-adding-tasks.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     PaginationPage,
@@ -36,7 +35,7 @@ describe('Items per page set to 15 and adding of tasks', () => {
     const taskPage = new TasksPage();
     const paginationPage = new PaginationPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
 

e2e/process-services/tasks/sort-tasklist-pagination.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     PaginationPage,
@@ -36,7 +35,7 @@ describe('Task List Pagination - Sorting', () => {
     const taskPage = new TasksPage();
     const paginationPage = new PaginationPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const taskUtil = new TaskUtil(apiService);

e2e/process-services/tasks/standalone-task.e2e.ts

@@ -17,7 +17,7 @@
 
 import { browser } from 'protractor';
 
-import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing';
 import { TasksPage } from './../pages/tasks.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import CONSTANTS = require('../../util/constants');
@@ -35,7 +35,7 @@ describe('Start Task - Task App', () => {
     let processUserModel;
     const noFormMessage = 'No forms attached';
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationUtil = new ApplicationsUtil(apiService);
     const tasksApi = new TasksApi(apiService.getInstance());

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { browser, by } from 'protractor';
 
 import { FileModel } from '../../models/ACS/file.model';
@@ -34,7 +34,7 @@ describe('Start Task - Custom App', () => {
     const attachmentListPage = new AttachmentListPage();
     const processServiceTabBarPage = new ProcessServiceTabBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
 

e2e/process-services/tasks/start-task-task-app.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     StringUtil,
@@ -42,7 +41,7 @@ describe('Start Task - Task App', () => {
     const processServiceTabBarPage = new ProcessServiceTabBarPage();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const taskUtil = new TaskUtil(apiService);
     const applicationsUtil = new ApplicationsUtil(apiService);

e2e/process-services/tasks/task-assignee.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -49,7 +48,7 @@ describe('Task Assignee', () => {
     const processDetailsPage = new ProcessDetailsPage();
     const taskPage = new TasksPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const adminGroupsApi = new AdminGroupsApi(apiService.getInstance());

e2e/process-services/tasks/task-attachment-list-action-menu.e2e.ts

@@ -16,8 +16,7 @@
  */
 
 import { browser } from 'protractor';
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     FileBrowserUtil,
     LoginPage, ModelsActions, TaskUtil,
@@ -44,7 +43,7 @@ describe('Attachment list action menu for tasks', () => {
     const attachmentListPage = new AttachmentListPage();
     const viewerPage = new ViewerPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const modelsActions = new ModelsActions(apiService);
     const taskUtil = new TaskUtil(apiService);

e2e/process-services/tasks/task-audit.e2e.ts

@@ -19,8 +19,7 @@ import {
     LoginPage,
     BrowserActions,
     FileBrowserUtil,
-    ApplicationsUtil,
-    ApiService,
+    ApplicationsUtil, createApiService,
     UsersActions,
     TaskUtil
 } from '@alfresco/adf-testing';
@@ -37,7 +36,7 @@ describe('Task Audit', () => {
     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);
 

e2e/process-services/tasks/task-details-form.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage, ModelsActions,
     ProcessUtil,
@@ -47,7 +46,7 @@ describe('Task Details - Form', () => {
     const filtersPage = new FiltersPage();
     const widget = new Widget();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const formActions = new FormUtil(apiService);
     const processUtil = new ProcessUtil(apiService);
     const usersActions = new UsersActions(apiService);

e2e/process-services/tasks/task-details-no-form.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { TasksPage } from './../pages/tasks.page';
 import { browser } from 'protractor';
@@ -29,7 +29,7 @@ describe('Task Details - No form', () => {
     const navigationBarPage = new NavigationBarPage();
     const taskPage = new TasksPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let processUserModel;

e2e/process-services/tasks/task-details.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     BrowserActions,
     LoginPage, ModelsActions,
@@ -42,7 +41,7 @@ describe('Task Details component', () => {
     const loginPage = new LoginPage();
     const taskPage = new TasksPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const taskUtil = new TaskUtil(apiService);
     const modelsActions = new ModelsActions(apiService);
     const usersActions = new UsersActions(apiService);

e2e/process-services/tasks/task-filters-component.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage, ModelsActions,
     UserFiltersUtil,
@@ -48,7 +47,7 @@ describe('Task', () => {
         const taskDetailsPage = new TaskDetailsPage();
         const taskFiltersDemoPage = new TaskFiltersDemoPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const usersActions = new UsersActions(apiService);
         const modelsActions = new ModelsActions(apiService);
 
@@ -186,7 +185,7 @@ describe('Task', () => {
         const appSettingsToggles = new AppSettingsTogglesPage();
         const taskFiltersDemoPage = new TaskFiltersDemoPage();
 
-        const apiService = new ApiService();
+        const apiService = createApiService();
         const userFiltersApi = new UserFiltersUtil(apiService);
         const usersActions = new UsersActions(apiService);
 

e2e/process-services/tasks/task-filters-sorting.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, ApplicationsUtil, LoginPage, UserFiltersUtil, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, UserFiltersUtil, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { ProcessServicesPage } from './../pages/process-services.page';
 import { TasksPage } from './../pages/tasks.page';
@@ -37,7 +37,7 @@ describe('Task Filters Sorting', () => {
     const taskDetailsPage = new TaskDetailsPage();
     const taskFiltersDemoPage = new TaskFiltersDemoPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const userFiltersUtil = new UserFiltersUtil(apiService);
 

e2e/process-services/tasks/task-list-pagination.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     PaginationPage,
@@ -36,7 +35,7 @@ describe('Task List Pagination', () => {
     const taskPage = new TasksPage();
     const paginationPage = new PaginationPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     let processUserModel: UserModel;

e2e/process-services/widgets/amount-widget.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { LoginPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, ApiService, UsersActions } from '@alfresco/adf-testing';
+import { LoginPage, BrowserActions, Widget, ApplicationsUtil, ProcessUtil, createApiService, UsersActions } from '@alfresco/adf-testing';
 import { TasksPage } from '../pages/tasks.page';
 import CONSTANTS = require('../../util/constants');
 import { browser } from 'protractor';
@@ -32,7 +32,7 @@ describe('Amount Widget', () => {
     let deployedAppId, process;
     let processUserModel;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const applicationsService = new ApplicationsUtil(apiService);
     const usersActions = new UsersActions(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/attach-file-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     FileBrowserUtil,
     LoginPage,
@@ -46,7 +45,7 @@ describe('Attach widget - File', () => {
     const tasksListPage = new TasksListPage();
     const filtersPage = new FiltersPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
 

e2e/process-services/widgets/attach-folder-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -42,7 +41,7 @@ describe('Attach Folder widget', () => {
     let deployedAppId, process;
     let processUserModel;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const processUtil = new ProcessUtil(apiService);
     const applicationsService = new ApplicationsUtil(apiService);

e2e/process-services/widgets/checkbox-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -40,7 +39,7 @@ describe('Checkbox Widget', () => {
     let appModel;
     let deployedAppId, process;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/date-time-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Date and time widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/date-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     BrowserActions,
     FormPage,
@@ -47,7 +46,7 @@ describe('Date widget', () => {
     let processUserModel;
     let deployedAppId, process;
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/document-template-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Document Template widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/dropdown-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -37,7 +36,7 @@ describe('Dropdown widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/dynamic-table-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -36,7 +35,7 @@ describe('Dynamic Table widget ', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/header-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Header widget', async () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/hyperlink-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Hyperlink widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/multi-line-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -37,7 +36,7 @@ describe('Multi-line Widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/number-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Number widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/people-group-widget.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing';
+import { createApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions, Widget } from '@alfresco/adf-testing';
 import { TasksPage } from '../pages/tasks.page';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
@@ -31,7 +31,7 @@ describe('People and Group widget', () => {
     const navigationBarPage = new NavigationBarPage();
     const widget = new Widget();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const adminGroupsApi = new AdminGroupsApi(apiService.getInstance());

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('People widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/radio-buttons-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Radio Buttons Widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/text-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -38,7 +37,7 @@ describe('Text widget', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);

e2e/process-services/widgets/widget-visibility-condition.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ApplicationsUtil,
     LoginPage,
     ProcessUtil,
@@ -60,7 +59,7 @@ describe('Process-Services - Visibility conditions', () => {
     const widget = new Widget();
     const navigationBarPage = new NavigationBarPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const applicationsService = new ApplicationsUtil(apiService);
     const processUtil = new ProcessUtil(apiService);