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]
This commit is contained in:
Popovics András
2021-06-19 23:03:17 +02:00
committed by GitHub
parent 2d61a2941c
commit 1ecc14f184
354 changed files with 1699 additions and 1843 deletions
@@ -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();
@@ -16,8 +16,7 @@
*/
import { browser, by, element } from 'protractor';
import {
ApiService,
import { createApiService,
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;
@@ -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);
@@ -17,8 +17,7 @@
import { browser, by, element } from 'protractor';
import {
ApiService,
import { createApiService,
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);
@@ -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({
@@ -15,8 +15,7 @@
* limitations under the License.
*/
import {
ApiService,
import { createApiService,
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();
@@ -16,8 +16,7 @@
*/
import { browser, by, element } from 'protractor';
import {
ApiService,
import { createApiService,
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());
@@ -16,8 +16,7 @@
*/
import { browser, by, element } from 'protractor';
import {
ApiService,
import { createApiService,
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;
@@ -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;