Rebalance suites conf to be less error prone (#1819)

* rebalance suites conf to be less error prone

* shared api - wait for specific files instead of totalItems

* remove unused

* - make search api wait calls more stable on parallel runs
- remove not needed workaround from closeMoreMenu

* reorganize test suites
a few more test stabilisations

* improve copy tests for parallel running

* more changes to consider parallel running

Co-authored-by: Adina Parpalita <Adina.Parpalita@ness.com>

projects/aca-testing-shared/src/components/dialog/manage-versions-dialog.ts

@@ -26,10 +26,13 @@
 import { by } from 'protractor';
 import { GenericDialog } from '../dialog/generic-dialog';
 import { BrowserActions } from '@alfresco/adf-testing';
+import { Menu } from '../menu/menu';
 
 export class ManageVersionsDialog extends GenericDialog {
   closeButton = this.childElement(by.cssContainingText('.mat-button', 'Close'));
 
+  menu = new Menu();
+
   constructor() {
     super('.aca-node-versions-dialog');
   }
@@ -38,4 +41,14 @@ export class ManageVersionsDialog extends GenericDialog {
     await BrowserActions.click(this.closeButton);
     await this.waitForDialogToClose();
   }
+
+  async clickActionButton(version: string): Promise<void> {
+    await BrowserActions.click(this.childElement(by.id(`adf-version-list-action-menu-button-${version}`)));
+    await this.menu.waitForMenuToOpen();
+  }
+
+  async viewFileVersion(version: string): Promise<void> {
+    await this.clickActionButton(version);
+    await this.menu.clickMenuItem('View');
+  }
 }

projects/aca-testing-shared/src/components/toolbar/toolbar.ts

@@ -84,16 +84,7 @@ export class Toolbar extends Component {
     await this.menu.waitForMenuToOpen();
   }
 
-  async closeMoreMenu(): Promise<void> {
-    await this.isButtonPresent('More Actions');
-
-    const moreMenu = this.getButtonByTitleAttribute('More Actions');
-    await BrowserActions.click(moreMenu);
-
-    await this.menu.waitForMenuToClose();
-  }
-
-  async closeMoreMenuEscape() {
+  async closeMoreMenu() {
     await Utils.pressEscape();
   }
 

projects/aca-testing-shared/src/components/version-manage/version-manager.ts

@@ -1,40 +0,0 @@
-/*!
- * @license
- * Alfresco Example Content Application
- *
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BrowserActions, BrowserVisibility } from '@alfresco/adf-testing';
-import { by, element, ElementFinder } from 'protractor';
-
-export class VersionManagePage {
-  async clickActionButton(version: string): Promise<void> {
-    await BrowserActions.click(element(by.id(`adf-version-list-action-menu-button-${version}`)));
-    await BrowserVisibility.waitUntilElementIsVisible(element(by.css('.cdk-overlay-container .mat-menu-content')));
-  }
-
-  async viewFileVersion(version: string): Promise<void> {
-    await this.clickActionButton(version);
-    const viewButton: ElementFinder = element(by.id(`adf-version-list-action-view-${version}`));
-    await BrowserActions.click(viewButton);
-  }
-}

projects/aca-testing-shared/src/utilities/repo-client/apis/nodes/nodes-api.ts

@@ -406,12 +406,23 @@ export class NodesApi extends RepoApi {
     }
   }
 
-  async editNodeContent(nodeId: string, content: string): Promise<NodeEntry | null> {
+  async updateNodeContent(
+    nodeId: string,
+    content: string,
+    majorVersion: boolean = true,
+    comment?: string,
+    newName?: string
+  ): Promise<NodeEntry | null> {
     try {
+      const opts = {
+        majorVersion,
+        comment,
+        name: newName
+      };
       await this.apiAuth();
-      return await this.nodesApi.updateNodeContent(nodeId, content);
+      return await this.nodesApi.updateNodeContent(nodeId, content, opts);
     } catch (error) {
-      this.handleError(`${this.constructor.name} ${this.editNodeContent.name}`, error);
+      this.handleError(`${this.constructor.name} ${this.updateNodeContent.name}`, error);
       return null;
     }
   }

projects/aca-testing-shared/src/utilities/repo-client/apis/shared-links/shared-links-api.ts

@@ -64,10 +64,10 @@ export class SharedLinksApi extends RepoApi {
     return sharedLinks;
   }
 
-  async getSharedIdOfNode(name: string): Promise<string> {
+  async getSharedIdOfNode(fileId: string): Promise<string> {
     try {
       const sharedLinksEntries = (await this.getSharedLinks())?.list.entries;
-      const found = sharedLinksEntries.find((sharedLink) => sharedLink.entry.name === name);
+      const found = sharedLinksEntries.find((sharedLink) => sharedLink.entry.nodeId === fileId);
       return (found || { entry: { id: null } }).entry.id;
     } catch (error) {
       this.handleError(`SharedLinksApi getSharedIdOfNode : catch : `, error);
@@ -75,20 +75,20 @@ export class SharedLinksApi extends RepoApi {
     }
   }
 
-  async unshareFile(name: string) {
+  async unshareFileById(fileId: string) {
     try {
-      const id = await this.getSharedIdOfNode(name);
-      return await this.sharedlinksApi.deleteSharedLink(id);
+      const sharedId = await this.getSharedIdOfNode(fileId);
+      return await this.sharedlinksApi.deleteSharedLink(sharedId);
     } catch (error) {
-      this.handleError(`SharedLinksApi unshareFile : catch : `, error);
+      this.handleError(`SharedLinksApi unshareFileById : catch : `, error);
     }
   }
 
-  async getSharedLinks() {
+  async getSharedLinks(maxItems: number = 250) {
     try {
       await this.apiAuth();
       const opts = {
-        maxItems: 250
+        maxItems
       };
       return await this.sharedlinksApi.listSharedLinks(opts);
     } catch (error) {
@@ -128,4 +128,46 @@ export class SharedLinksApi extends RepoApi {
       Logger.error(`\tExpected: ${data.expect} items, but found ${error}`);
     }
   }
+
+  async waitForFilesToBeShared(filesIds: string[]) {
+    try {
+      const sharedFile = async () => {
+        const sharedFiles = (await this.getSharedLinks()).list.entries.map((link) => link.entry.nodeId);
+        const foundItems = filesIds.every((id) => sharedFiles.includes(id));
+        if (foundItems) {
+          return Promise.resolve(foundItems);
+        } else {
+          return Promise.reject(foundItems);
+        }
+      };
+
+      return await Utils.retryCall(sharedFile);
+    } catch (error) {
+      Logger.error(`SharedLinksApi waitForFilesToBeShared :  catch : `);
+      Logger.error(`\tWait timeout reached waiting for files to be shared`);
+    }
+  }
+
+  async waitForFilesToNotBeShared(filesIds: string[]) {
+    try {
+      const sharedFile = async () => {
+        const sharedFiles = (await this.getSharedLinks()).list.entries.map((link) => link.entry.nodeId);
+
+        const foundItems = filesIds.some((id) => {
+          return sharedFiles.includes(id);
+        });
+
+        if (foundItems) {
+          return Promise.reject(foundItems);
+        } else {
+          return Promise.resolve(foundItems);
+        }
+      };
+
+      return await Utils.retryCall(sharedFile);
+    } catch (error) {
+      Logger.error(`SharedLinksApi waitForFilesToNotBeShared :  catch : `);
+      Logger.error(`\tWait timeout reached waiting for files to no longer be shared`);
+    }
+  }
 }

projects/aca-testing-shared/src/utilities/repo-client/apis/sites/sites-api.ts

@@ -273,6 +273,25 @@ export class SitesApi extends RepoApi {
     }
   }
 
+  async waitForSitesToBeCreated(sitesIds: string[]) {
+    try {
+      const site = async () => {
+        const sitesList = (await this.getSites()).list.entries.map((link) => link.entry.id);
+        const foundItems = sitesIds.every((id) => sitesList.includes(id));
+        if (foundItems) {
+          return Promise.resolve(foundItems);
+        } else {
+          return Promise.reject(foundItems);
+        }
+      };
+
+      return await Utils.retryCall(site);
+    } catch (error) {
+      Logger.error(`SitesApi waitForSitesToBeCreated :  catch : `);
+      Logger.error(`\tWait timeout reached waiting for sites to be created`);
+    }
+  }
+
   async waitForApi(data: { expect: number }) {
     try {
       const sites = async () => {