e2e cleanup (#2951)

* reduce the code * reduce code * reduce code * reduce code * cleanup tests * more readable code * cleanup code * fix code * even more cleanup * remove some deprecated apis * code fixes * cleanup files * more files switching to user actions
Alfresco · Feb 1, 2023 · 567882e · 567882e
1 parent a325dea
commit 567882e
Show file tree

Hide file tree

Showing 42 changed files with 642 additions and 940 deletions.
diff --git a/e2e/suites/actions-available/files-folders/folders-actions.test.ts b/e2e/suites/actions-available/files-folders/folders-actions.test.ts
@@ -51,14 +51,14 @@ describe('Folders - available actions : ', () => {
   beforeAll(async () => {
     await adminApiActions.createUser({ username });
 
-    parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
+    parentId = await userApi.createFolder(parentName);
 
-    await userApi.nodes.createFile(testData.file.name, parentId);
-    fileFavId = (await userApi.nodes.createFile(testData.fileFav.name, parentId)).entry.id;
+    await userApi.createFile(testData.file.name, parentId);
+    fileFavId = await userApi.createFile(testData.fileFav.name, parentId);
 
-    await userApi.nodes.createFolder(testData.folder.name, parentId);
-    folderFavId = (await userApi.nodes.createFolder(testData.folderFav.name, parentId)).entry.id;
-    folderFav2Id = (await userApi.nodes.createFolder(testData.folderFav2.name, parentId)).entry.id;
+    await userApi.createFolder(testData.folder.name, parentId);
+    folderFavId = await userApi.createFolder(testData.folderFav.name, parentId);
+    folderFav2Id = await userApi.createFolder(testData.folderFav2.name, parentId);
 
     const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
     await userApi.favorites.addFavoritesByIds('folder', [folderFavId, folderFav2Id]);

diff --git a/e2e/suites/actions-available/files-folders/locked-files-actions.test.ts b/e2e/suites/actions-available/files-folders/locked-files-actions.test.ts
@@ -51,24 +51,22 @@ describe('Locked Files - available actions : ', () => {
 
   beforeAll(async () => {
     await adminApiActions.createUser({ username });
+    userActions.login(username, username);
 
-    parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
+    parentId = await userApi.createFolder(parentName);
 
-    fileLockedId = (await userApi.nodes.createFile(testData.fileLocked.name, parentId)).entry.id;
-    fileFavLockedId = (await userApi.nodes.createFile(testData.fileFavLocked.name, parentId)).entry.id;
-    fileSharedLockedId = (await userApi.nodes.createFile(testData.fileSharedLocked.name, parentId)).entry.id;
-    fileSharedFavLockedId = (await userApi.nodes.createFile(testData.fileSharedFavLocked.name, parentId)).entry.id;
+    fileLockedId = await userApi.createFile(testData.fileLocked.name, parentId);
+    fileFavLockedId = await userApi.createFile(testData.fileFavLocked.name, parentId);
+    fileSharedLockedId = await userApi.createFile(testData.fileSharedLocked.name, parentId);
+    fileSharedFavLockedId = await userApi.createFile(testData.fileSharedFavLocked.name, parentId);
 
     const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
     await userApi.favorites.addFavoritesByIds('file', [fileFavLockedId, fileSharedFavLockedId]);
     await userApi.favorites.waitForApi({ expect: initialFavoritesTotalItems + 2 });
 
     await userApi.shared.shareFilesByIds([fileSharedLockedId, fileSharedFavLockedId]);
 
-    await userApi.nodes.lockFile(fileLockedId);
-    await userApi.nodes.lockFile(fileFavLockedId);
-    await userApi.nodes.lockFile(fileSharedLockedId);
-    await userApi.nodes.lockFile(fileSharedFavLockedId);
+    await userActions.lockNodes([fileLockedId, fileFavLockedId, fileSharedLockedId, fileSharedFavLockedId]);
 
     await userApi.shared.waitForFilesToBeShared([fileSharedLockedId, fileSharedFavLockedId]);
     await userApi.search.waitForApi(username, { expect: 4 });

diff --git a/e2e/suites/actions-available/files-folders/multiple-files-actions.test.ts b/e2e/suites/actions-available/files-folders/multiple-files-actions.test.ts
@@ -58,18 +58,17 @@ describe('Multiple Files - available actions : ', () => {
 
   beforeAll(async () => {
     await adminApiActions.createUser({ username });
+    await userActions.login(username, username);
 
-    parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
+    parentId = await userApi.createFolder(parentName);
 
-    file1Id = (await userApi.nodes.createFile(file1, parentId)).entry.id;
-    file2Id = (await userApi.nodes.createFile(file2, parentId)).entry.id;
-    file3LockedId = (await userApi.nodes.createFile(file3Locked, parentId)).entry.id;
-    file1LockedFavId = (await userApi.nodes.createFile(file1LockedFav, parentId)).entry.id;
-    file2LockedFavId = (await userApi.nodes.createFile(file2LockedFav, parentId)).entry.id;
+    file1Id = await userApi.createFile(file1, parentId);
+    file2Id = await userApi.createFile(file2, parentId);
+    file3LockedId = await userApi.createFile(file3Locked, parentId);
+    file1LockedFavId = await userApi.createFile(file1LockedFav, parentId);
+    file2LockedFavId = await userApi.createFile(file2LockedFav, parentId);
 
-    await userApi.nodes.lockFile(file1LockedFavId);
-    await userApi.nodes.lockFile(file2LockedFavId);
-    await userApi.nodes.lockFile(file3LockedId);
+    await userActions.lockNodes([file1LockedFavId, file2LockedFavId, file3LockedId]);
 
     const initialFavoritesTotalItems = (await userApi.favorites.getFavoritesTotalItems()) || 0;
     await userApi.favorites.addFavoritesByIds('file', [file1LockedFavId, file2LockedFavId]);

diff --git a/e2e/suites/actions-available/libraries/library-trash.test.ts b/e2e/suites/actions-available/libraries/library-trash.test.ts
@@ -23,14 +23,13 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LoginPage, BrowsingPage, RepoClient, Utils, AdminActions, UserActions } from '@alfresco/aca-testing-shared';
+import { LoginPage, BrowsingPage, Utils, AdminActions, UserActions } from '@alfresco/aca-testing-shared';
 import * as testData from './test-data-libraries';
 import * as testUtil from '../test-util';
 
 describe('Library actions : ', () => {
   const username = `user-${Utils.random()}`;
 
-  const userApi = new RepoClient(username, username);
   const adminApiActions = new AdminActions();
   const userActions = new UserActions();
 
@@ -39,11 +38,9 @@ describe('Library actions : ', () => {
 
   beforeAll(async () => {
     await adminApiActions.createUser({ username });
-
-    await userApi.sites.createSite(testData.siteInTrash.name);
-    await userApi.sites.createSite(testData.site2InTrash.name);
-
     await userActions.login(username, username);
+
+    await userActions.createSites([testData.siteInTrash.name, testData.site2InTrash.name]);
     await userActions.deleteSites([testData.siteInTrash.name, testData.site2InTrash.name], false);
 
     await loginPage.loginWith(username);

diff --git a/e2e/suites/actions-available/libraries/library.test.ts b/e2e/suites/actions-available/libraries/library.test.ts
@@ -23,7 +23,16 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LoginPage, BrowsingPage, SearchResultsPage, RepoClient, Utils, AdminActions, UserActions } from '@alfresco/aca-testing-shared';
+import {
+  LoginPage,
+  BrowsingPage,
+  SearchResultsPage,
+  RepoClient,
+  Utils,
+  AdminActions,
+  UserActions,
+  SITE_VISIBILITY
+} from '@alfresco/aca-testing-shared';
 import * as testData from './test-data-libraries';
 import * as testUtil from '../test-util';
 import { Logger } from '@alfresco/adf-testing';
@@ -45,18 +54,23 @@ describe('Library actions : ', () => {
       await adminApiActions.createUser({ username });
 
       await userApi.sites.createSite(testData.publicUserMemberFav.name);
-      await userApi.sites.createSitePrivate(testData.privateUserMemberFav.name);
-      await userApi.sites.createSiteModerated(testData.moderatedUserMemberFav.name);
+      await userApi.sites.createSite(testData.privateUserMemberFav.name, SITE_VISIBILITY.PRIVATE);
+      await userApi.sites.createSite(testData.moderatedUserMemberFav.name, SITE_VISIBILITY.MODERATED);
       const publicUserMemberNotFavId = (await userApi.sites.createSite(testData.publicUserMemberNotFav.name)).entry.guid;
-      const privateUserMemberNotFavId = (await userApi.sites.createSitePrivate(testData.privateUserMemberNotFav.name)).entry.guid;
-      const moderatedUserMemberNotFavId = (await userApi.sites.createSiteModerated(testData.moderatedUserMemberNotFav.name)).entry.guid;
-
-      await adminApiActions.sites.createSite(testData.publicNotMemberFav.name);
-      await adminApiActions.sites.createSiteModerated(testData.moderatedNotMemberFav.name);
-      await adminApiActions.sites.createSite(testData.publicNotMemberNotFav.name);
-      await adminApiActions.sites.createSiteModerated(testData.moderatedNotMemberNotFav.name);
-      await adminApiActions.sites.createSiteModerated(testData.moderatedRequestedJoinFav.name);
-      await adminApiActions.sites.createSiteModerated(testData.moderatedRequestedJoinNotFav.name);
+      const privateUserMemberNotFavId = (await userApi.sites.createSite(testData.privateUserMemberNotFav.name, SITE_VISIBILITY.PRIVATE)).entry.guid;
+      const moderatedUserMemberNotFavId = (await userApi.sites.createSite(testData.moderatedUserMemberNotFav.name, SITE_VISIBILITY.MODERATED)).entry
+        .guid;
+
+      await adminApiActions.sites.createSites([testData.publicNotMemberFav.name, testData.publicNotMemberNotFav.name]);
+      await adminApiActions.sites.createSites(
+        [
+          testData.moderatedNotMemberFav.name,
+          testData.moderatedNotMemberNotFav.name,
+          testData.moderatedRequestedJoinFav.name,
+          testData.moderatedRequestedJoinNotFav.name
+        ],
+        SITE_VISIBILITY.MODERATED
+      );
 
       await userApi.sites.requestToJoin(testData.moderatedRequestedJoinFav.name);
       await userApi.sites.requestToJoin(testData.moderatedRequestedJoinNotFav.name);

diff --git a/e2e/suites/actions-available/new-menu/new-menu.test.ts b/e2e/suites/actions-available/new-menu/new-menu.test.ts
@@ -23,38 +23,40 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AdminActions, LoginPage, BrowsingPage, SITE_ROLES, RepoClient, Utils } from '@alfresco/aca-testing-shared';
+import { AdminActions, LoginPage, BrowsingPage, SITE_ROLES, Utils, UserActions } from '@alfresco/aca-testing-shared';
 
 describe('New menu', () => {
   const username = `user-${Utils.random()}`;
 
   const siteUser = `site-user-${Utils.random()}`;
   const siteAdmin = `site-admin-${Utils.random()}`;
 
-  const apis = {
-    user: new RepoClient(username, username)
-  };
-
   const loginPage = new LoginPage();
   const page = new BrowsingPage();
   const { dataTable, sidenav } = page;
   const { menu } = sidenav;
 
   const adminApiActions = new AdminActions();
+  const userActions = new UserActions();
 
   beforeAll(async () => {
     await adminApiActions.createUser({ username });
+    await userActions.login(username, username);
+
     await adminApiActions.sites.createSite(siteAdmin);
     await adminApiActions.sites.addSiteMember(siteAdmin, username, SITE_ROLES.SITE_CONSUMER.ROLE);
 
-    await apis.user.sites.createSite(siteUser);
+    await userActions.createSites([siteUser]);
 
     await loginPage.loginWith(username);
   });
 
   afterAll(async () => {
-    await apis.user.sites.deleteSite(siteUser);
-    await adminApiActions.sites.deleteSite(siteAdmin);
+    await userActions.login(username, username);
+    await userActions.deleteSites([siteUser]);
+
+    await adminApiActions.login();
+    await adminApiActions.deleteSites([siteAdmin]);
   });
 
   afterEach(async () => {

diff --git a/e2e/suites/actions-available/special-permissions/special-permissions-actions.test.ts b/e2e/suites/actions-available/special-permissions/special-permissions-actions.test.ts
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { LoginPage, RepoClient, Utils, AdminActions, FILES, SITE_ROLES } from '@alfresco/aca-testing-shared';
+import { LoginPage, RepoClient, Utils, AdminActions, FILES, SITE_ROLES, SITE_VISIBILITY, UserActions } from '@alfresco/aca-testing-shared';
 import * as testData from './test-data-permissions';
 import { librariesTests } from './my-libraries';
 import { favoritesTests } from './favorites';
@@ -58,6 +58,8 @@ describe('Special permissions : ', () => {
   let folderFav2Id: string;
 
   const adminApiActions = new AdminActions();
+  const managerActions = new UserActions();
+  const demotedUserActions = new UserActions();
 
   const userManagerApi = new RepoClient(userManager, userManager);
   const userConsumerApi = new RepoClient(userConsumer, userConsumer);
@@ -72,39 +74,42 @@ describe('Special permissions : ', () => {
     await adminApiActions.createUser({ username: userCollaborator });
     await adminApiActions.createUser({ username: userDemoted });
 
+    await managerActions.login(userManager, userManager);
+    await demotedUserActions.login(userDemoted, userDemoted);
+
     const consumerFavoritesTotalItems = await userConsumerApi.favorites.getFavoritesTotalItems();
     const managerSearchTotalItems = await userManagerApi.search.getTotalItems(userManager);
     const collaboratorFavoritesTotalItems = await userCollaboratorApi.favorites.getFavoritesTotalItems();
 
-    await userManagerApi.sites.createSitePrivate(sitePrivate);
+    await userManagerApi.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE);
     const docLibId = await userManagerApi.sites.getDocLibId(sitePrivate);
     await userManagerApi.sites.addSiteConsumer(sitePrivate, userConsumer);
     await userManagerApi.sites.addSiteCollaborator(sitePrivate, userCollaborator);
     await userManagerApi.sites.addSiteManager(sitePrivate, userDemoted);
 
     await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocx.name);
     fileDocxFavId = (await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocxFav.name)).entry.id;
-    await userManagerApi.nodes.createFile(testData.file.name, docLibId);
-    fileFavId = (await userManagerApi.nodes.createFile(testData.fileFav.name, docLibId)).entry.id;
+    await userManagerApi.createFile(testData.file.name, docLibId);
+    fileFavId = await userManagerApi.createFile(testData.fileFav.name, docLibId);
     fileDocxSharedId = (await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocxShared.name)).entry.id;
     fileDocxSharedFavId = (await userManagerApi.upload.uploadFileWithRename(FILES.docxFile, docLibId, testData.fileDocxSharedFav.name)).entry.id;
-    fileSharedId = (await userManagerApi.nodes.createFile(testData.fileShared.name, docLibId)).entry.id;
-    fileSharedFavId = (await userManagerApi.nodes.createFile(testData.fileSharedFav.name, docLibId)).entry.id;
-    fileLockedId = (await userManagerApi.nodes.createFile(testData.fileLocked.name, docLibId)).entry.id;
-    fileFavLockedId = (await userManagerApi.nodes.createFile(testData.fileFavLocked.name, docLibId)).entry.id;
-    fileSharedLockedId = (await userManagerApi.nodes.createFile(testData.fileSharedLocked.name, docLibId)).entry.id;
-    fileSharedFavLockedId = (await userManagerApi.nodes.createFile(testData.fileSharedFavLocked.name, docLibId)).entry.id;
-    fileGranularPermissionId = (await userManagerApi.nodes.createFile(testData.fileGranularPermission, docLibId)).entry.id;
-
-    fileLockedByUserId = (await userManagerApi.nodes.createFile(testData.fileLockedByUser, docLibId)).entry.id;
-    await userDemotedApi.nodes.lockFile(fileLockedByUserId);
+    fileSharedId = await userManagerApi.createFile(testData.fileShared.name, docLibId);
+    fileSharedFavId = await userManagerApi.createFile(testData.fileSharedFav.name, docLibId);
+    fileLockedId = await userManagerApi.createFile(testData.fileLocked.name, docLibId);
+    fileFavLockedId = await userManagerApi.createFile(testData.fileFavLocked.name, docLibId);
+    fileSharedLockedId = await userManagerApi.createFile(testData.fileSharedLocked.name, docLibId);
+    fileSharedFavLockedId = await userManagerApi.createFile(testData.fileSharedFavLocked.name, docLibId);
+    fileGranularPermissionId = await userManagerApi.createFile(testData.fileGranularPermission, docLibId);
+
+    fileLockedByUserId = await userManagerApi.createFile(testData.fileLockedByUser, docLibId);
+    await demotedUserActions.lockNodes([fileLockedByUserId]);
     await userDemotedApi.favorites.addFavoriteById('file', fileLockedByUserId);
-    await userDemotedApi.shared.shareFileById(fileLockedByUserId);
+    await userDemotedApi.shared.shareFilesByIds([fileLockedByUserId]);
     await userManagerApi.sites.updateSiteMember(sitePrivate, userDemoted, SITE_ROLES.SITE_CONSUMER.ROLE);
 
     await userManagerApi.nodes.createFolder(testData.folder.name, docLibId);
-    folderFavId = (await userManagerApi.nodes.createFolder(testData.folderFav.name, docLibId)).entry.id;
-    folderFav2Id = (await userManagerApi.nodes.createFolder(testData.folderFav2.name, docLibId)).entry.id;
+    folderFavId = await userManagerApi.createFolder(testData.folderFav.name, docLibId);
+    folderFav2Id = await userManagerApi.createFolder(testData.folderFav2.name, docLibId);
     await userConsumerApi.favorites.addFavoritesByIds('folder', [folderFavId, folderFav2Id]);
 
     await userConsumerApi.favorites.addFavoritesByIds('file', [
@@ -129,10 +134,7 @@ describe('Special permissions : ', () => {
 
     await userCollaboratorApi.favorites.addFavoritesByIds('file', [fileDocxSharedFavId, fileSharedFavId]);
 
-    await userManagerApi.nodes.lockFile(fileLockedId);
-    await userManagerApi.nodes.lockFile(fileFavLockedId);
-    await userManagerApi.nodes.lockFile(fileSharedLockedId);
-    await userManagerApi.nodes.lockFile(fileSharedFavLockedId);
+    await managerActions.lockNodes([fileLockedId, fileFavLockedId, fileSharedLockedId, fileSharedFavLockedId]);
 
     await userManagerApi.nodes.setGranularPermission(fileGranularPermissionId, false, userConsumer, SITE_ROLES.SITE_MANAGER.ROLE);