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