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