code fix and remove protractor test

Alfresco · Nov 9, 2023 · ddf4c69 · ddf4c69
1 parent f887c32
commit ddf4c69
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 241 deletions.
diff --git a/e2e/playwright/actions/tsconfig.e2e.json b/e2e/playwright/actions/tsconfig.e2e.json
@@ -7,6 +7,9 @@
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
     "skipLibCheck": true,
+    "paths": {
+      "alfresco/playwright-shared": [" . ./../../projects/aca-playwright-shared/src/index.ts"]
+    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/e2e/playwright/authentication/tsconfig.e2e.json b/e2e/playwright/authentication/tsconfig.e2e.json
@@ -7,6 +7,9 @@
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
     "skipLibCheck": true,
+    "paths": {
+      "alfresco/playwright-shared": [" . ./../../projects/aca-playwright-shared/src/index.ts"]
+    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/e2e/playwright/folder-rules/tsconfig.e2e.json b/e2e/playwright/folder-rules/tsconfig.e2e.json
@@ -7,6 +7,9 @@
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
     "skipLibCheck": true,
+    "paths": {
+      "alfresco/playwright-shared": [" . ./../../projects/aca-playwright-shared/src/index.ts"]
+    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/e2e/playwright/navigation/tsconfig.e2e.json b/e2e/playwright/navigation/tsconfig.e2e.json
@@ -7,6 +7,9 @@
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
     "skipLibCheck": true,
+    "paths": {
+      "alfresco/playwright-shared": [" . ./../../projects/aca-playwright-shared/src/index.ts"]
+    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/e2e/playwright/special-permissions-actions-available/src/tests/other-permissions.ts b/e2e/playwright/special-permissions-actions-available/src/tests/other-permissions.ts
@@ -26,7 +26,7 @@ import { MyLibrariesPage, test } from '@alfresco/playwright-shared';
 import * as testData from '@alfresco/playwright-shared';
 import { expect } from '@playwright/test';
 
-export async function checkActionsAvailable(
+async function checkActionsAvailable(
   myLibrariesPage: MyLibrariesPage,
   item: string,
   expectedToolbarPrimary: string[],
@@ -38,7 +38,7 @@ export async function checkActionsAvailable(
   await myLibrariesPage.matMenu.verifyActualMoreActions(expectedToolbarMore);
 }
 
-export async function checkActionsViewerAvailable(
+async function checkActionsViewerAvailable(
   myLibrariesPage: MyLibrariesPage,
   item: string,
   expectedToolbarPrimary: string[],

diff --git a/e2e/playwright/special-permissions-actions-available/tsconfig.e2e.json b/e2e/playwright/special-permissions-actions-available/tsconfig.e2e.json
@@ -7,6 +7,9 @@
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
     "skipLibCheck": true,
+    "paths": {
+      "alfresco/playwright-shared": [" . ./../../projects/aca-playwright-shared/src/index.ts"]
+    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/e2e/playwright/viewer/tsconfig.e2e.json b/e2e/playwright/viewer/tsconfig.e2e.json
@@ -7,6 +7,9 @@
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
     "skipLibCheck": true,
+    "paths": {
+      "alfresco/playwright-shared": [" . ./../../projects/aca-playwright-shared/src/index.ts"]
+    }
   },
   "exclude": ["node_modules"]
 }
diff --git a/e2e/protractor/suites/actions-available/special-permissions/other-permissions.ts b/e2e/protractor/suites/actions-available/special-permissions/other-permissions.ts
diff --git a/...otractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts b/...otractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts
@@ -28,7 +28,6 @@ import { librariesTests } from './my-libraries';
 import { favoritesTests } from './favorites';
 import { searchResultsTests } from './search-results';
 import { sharedFilesTests } from './shared-files';
-import { collaboratorTests, filesLockedByCurrentUser, filesLockedByOtherUser } from './other-permissions';
 
 describe('Special permissions : ', () => {
   const random = testData.random;
@@ -37,7 +36,6 @@ describe('Special permissions : ', () => {
 
   const userManager = `manager-${random}`;
   const userConsumer = `consumer-${random}`;
-  const userCollaborator = `collaborator-${random}`;
   const userDemoted = `demoted-${random}`;
 
   let fileDocxFavId: string;
@@ -61,28 +59,24 @@ describe('Special permissions : ', () => {
 
   const userManagerApi = new RepoClient(userManager, userManager);
   const userConsumerApi = new RepoClient(userConsumer, userConsumer);
-  const userCollaboratorApi = new RepoClient(userCollaborator, userCollaborator);
   const userDemotedApi = new RepoClient(userDemoted, userDemoted);
 
   const loginPage = new LoginPage();
 
   beforeAll(async () => {
     await adminApiActions.createUser({ username: userManager });
     await adminApiActions.createUser({ username: userConsumer });
-    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.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);
@@ -130,8 +124,6 @@ describe('Special permissions : ', () => {
       fileGranularPermissionId
     ]);
 
-    await userCollaboratorApi.favorites.addFavoritesByIds('file', [fileDocxSharedFavId, fileSharedFavId]);
-
     await managerActions.lockNodes([fileLockedId, fileFavLockedId, fileSharedLockedId, fileSharedFavLockedId]);
 
     await userManagerApi.nodes.setGranularPermission(fileGranularPermissionId, false, userConsumer, SITE_ROLES.SITE_MANAGER.ROLE);
@@ -150,8 +142,7 @@ describe('Special permissions : ', () => {
         fileGranularPermissionId,
         fileLockedByUserId
       ]),
-      userManagerApi.search.waitForApi(userManager, { expect: managerSearchTotalItems + 14 }),
-      userCollaboratorApi.favorites.waitForApi({ expect: collaboratorFavoritesTotalItems + 2 })
+      userManagerApi.search.waitForApi(userManager, { expect: managerSearchTotalItems + 14 })
     ]);
   });
 
@@ -184,28 +175,4 @@ describe('Special permissions : ', () => {
       sharedFilesTests();
     });
   });
-
-  describe('Collaborator', () => {
-    beforeAll(async () => {
-      await loginPage.loginWith(userCollaborator);
-    });
-
-    collaboratorTests(sitePrivate);
-  });
-
-  describe('File locked - user is lock owner', () => {
-    beforeAll(async () => {
-      await loginPage.loginWith(userDemoted);
-    });
-
-    filesLockedByCurrentUser(sitePrivate);
-  });
-
-  describe('File locked by other user - user is manager', () => {
-    beforeAll(async () => {
-      await loginPage.loginWith(userManager);
-    });
-
-    filesLockedByOtherUser(sitePrivate);
-  });
 });