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-cloud/form-field/dropdown-widget.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService, AppListCloudPage, GroupIdentityService, IdentityService,
+import { createApiService, 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 {
-    ApiService,
+import { createApiService,
     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,
-    ApiService,
+    GroupIdentityService, createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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,
-    ApiService,
+    TasksService, createApiService,
     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,
-    ApiService,
+    StartTasksCloudPage, createApiService,
     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,
-    ApiService,
+    TasksService, createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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,
-    ApiService,
+    StringUtil, createApiService,
     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,
-    ApiService,
+    TasksService, createApiService,
     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,
-    ApiService,
+    TasksService, createApiService,
     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,
-    ApiService,
+    StringUtil, createApiService,
     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 apiServiceHrUser = new ApiService();
+    const apiService = createApiService();
+    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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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 {
-    ApiService,
+import { createApiService,
     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,
-    ApiService,
+    LoginPage, createApiService,
     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);