[ACA-4288] Fix API errors from logs (#2006)

* Add API login in afterAll - part 1

* viewer,infoDrawer,extensions - afterAll API login

* deleteActions - afterAll API login

* Improve before and after methods

* add Promise type to methods - part1

* remove unneeded done() method and add try-catch

* delete wrong import

* Login through API

* small change over log errors

* small improvement over the logs

e2e/suites/actions-available/files-folders/folders-actions.test.ts

@@ -49,9 +49,7 @@ describe('Folders - available actions : ', () => {
   const searchResultsPage = new SearchResultsPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
 
@@ -71,6 +69,7 @@ describe('Folders - available actions : ', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
   });

e2e/suites/actions-available/files-folders/locked-files-actions.test.ts

@@ -50,9 +50,7 @@ describe('Locked Files - available actions : ', () => {
   const searchResultsPage = new SearchResultsPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
 
@@ -78,6 +76,7 @@ describe('Locked Files - available actions : ', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
   });

e2e/suites/actions-available/files-folders/multiple-files-actions.test.ts

@@ -57,9 +57,7 @@ describe('Multiple Files - available actions : ', () => {
   const searchResultsPage = new SearchResultsPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
 
@@ -84,6 +82,7 @@ describe('Multiple Files - available actions : ', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.unlockNodes([file1LockedFavId, file2LockedFavId, file3LockedId]);
     await userActions.deleteNodes([parentId]);
   });

e2e/suites/actions-available/files-folders/office-files-actions.test.ts

@@ -49,9 +49,7 @@ describe('Office Files - available actions : ', () => {
   const searchResultsPage = new SearchResultsPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
 
@@ -71,6 +69,7 @@ describe('Office Files - available actions : ', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
   });

e2e/suites/actions-available/files-folders/single-file-actions.test.ts

@@ -26,6 +26,7 @@
 import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
 import * as testData from './test-data';
 import * as testUtil from '../test-util';
+import { Logger } from '@alfresco/adf-testing';
 
 describe('Files - available actions : ', () => {
   const random = Utils.random();
@@ -48,10 +49,9 @@ describe('Files - available actions : ', () => {
   const { searchInput } = page.header;
   const searchResultsPage = new SearchResultsPage();
 
-  beforeAll(async () => {
+  beforeAll(async (done) => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
       parentId = (await userApi.nodes.createFolder(parentName)).entry.id;
 
@@ -68,9 +68,14 @@ describe('Files - available actions : ', () => {
       await userApi.shared.waitForFilesToBeShared([fileSharedId, fileSharedFavId]);
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeEach failed : ${error}`);
+    }
+    done();
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
   });

e2e/suites/actions-available/files-folders/trash.test.ts

@@ -46,15 +46,14 @@ describe('Trash - available actions : ', () => {
   const loginPage = new LoginPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     fileInTrashId = (await userApi.nodes.createFile(testData.fileInTrash.name)).entry.id;
     file2InTrashId = (await userApi.nodes.createFile(testData.file2InTrash.name)).entry.id;
     folderInTrashId = (await userApi.nodes.createFolder(testData.folderInTrash.name)).entry.id;
     folder2InTrashId = (await userApi.nodes.createFolder(testData.folder2InTrash.name)).entry.id;
 
+    await userActions.login(username, username);
     const initialDeletedTotalItems = await userActions.getTrashcanSize();
     await userActions.deleteNodes([fileInTrashId, file2InTrashId, folderInTrashId, folder2InTrashId], false);
     await userActions.waitForTrashcanSize(initialDeletedTotalItems + 4);
@@ -64,6 +63,7 @@ describe('Trash - available actions : ', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.emptyTrashcan();
   });
 

e2e/suites/actions-available/libraries/library-trash.test.ts

@@ -38,19 +38,19 @@ describe('Library actions : ', () => {
   const page = new BrowsingPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     await userApi.sites.createSite(testData.siteInTrash.name);
     await userApi.sites.createSite(testData.site2InTrash.name);
 
+    await userActions.login(username, username);
     await userActions.deleteSites([testData.siteInTrash.name, testData.site2InTrash.name], false);
 
     await loginPage.loginWith(username);
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.emptyTrashcan();
   });
 

e2e/suites/actions-available/libraries/library.test.ts

@@ -26,6 +26,7 @@
 import { LoginPage, BrowsingPage, SearchResultsPage, RepoClient, Utils, AdminActions, UserActions } from '@alfresco/aca-testing-shared';
 import * as testData from './test-data-libraries';
 import * as testUtil from '../test-util';
+import { Logger } from '@alfresco/adf-testing';
 
 describe('Library actions : ', () => {
   const username = `user-${Utils.random()}`;
@@ -39,10 +40,9 @@ describe('Library actions : ', () => {
   const searchResultsPage = new SearchResultsPage();
   const { searchInput } = searchResultsPage.header;
 
-  beforeAll(async () => {
+  beforeAll(async (done) => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
       await userApi.sites.createSite(testData.publicUserMemberFav.name);
       await userApi.sites.createSitePrivate(testData.privateUserMemberFav.name);
@@ -69,6 +69,10 @@ describe('Library actions : ', () => {
       ]);
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
+    done();
   });
 
   afterAll(async () => {
@@ -226,10 +230,14 @@ describe('Library actions : ', () => {
 
   describe('on Search Results', () => {
     beforeEach(async () => {
+      try {
         await Utils.pressEscape();
         await page.clickPersonalFiles();
         await searchInput.clickSearchButton();
         await searchInput.checkLibraries();
+      } catch (error) {
+        Logger.error(`----- beforeEach failed : ${error}`);
+      }
     });
 
     it('[C290084] Public library, user is a member, favorite', async () => {

e2e/suites/actions/copy-move/copy.test.ts

@@ -126,9 +126,8 @@ describe('Copy content', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
       const initialFavoritesTotalItems = await apis.user.favorites.getFavoritesTotalItems();
 
@@ -140,6 +139,8 @@ describe('Copy content', () => {
       destinationIdSearch = (await apis.user.nodes.createFolder(destinationSearch)).entry.id;
 
       existingFileToCopyId = (await apis.user.nodes.createFile(existingFile, sourceId)).entry.id;
+
+      await userActions.login(username, username);
       await userActions.shareNodes([existingFileToCopyId]);
       await apis.user.favorites.addFavoriteById('file', existingFileToCopyId);
 
@@ -221,6 +222,9 @@ describe('Copy content', () => {
       await apis.user.favorites.waitForApi({ expect: initialFavoritesTotalItems + 13 });
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
     done();
   });
 
@@ -240,10 +244,9 @@ describe('Copy content', () => {
   });
 
   describe('from Recent Files', () => {
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await Utils.pressEscape();
       await page.clickRecentFilesAndWait();
-      done();
     });
 
     it('[C280194] Copy a file', async () => copyFile(file1, source, destinationRF));
@@ -265,11 +268,10 @@ describe('Copy content', () => {
   });
 
   describe('from Personal Files', () => {
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await Utils.pressEscape();
       await page.clickPersonalFilesAndWait();
       await dataTable.doubleClickOnRowByName(source);
-      done();
     });
 
     it('[C217135] Copy a file', async () => copyFile(file1, '', destinationPF));
@@ -337,10 +339,9 @@ describe('Copy content', () => {
   });
 
   describe('from Favorites', () => {
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await Utils.pressEscape();
       await page.clickFavoritesAndWait();
-      done();
     });
 
     it('[C280218] Copy a file', async () => copyFile(file1, source, destinationFav));

e2e/suites/actions/copy-move/destination-picker-dialog.test.ts

@@ -103,6 +103,7 @@ describe('Destination picker dialog : ', () => {
     fileIdContributor = (await contributorApi.nodes.createFile(file)).entry.id;
     fileIdCollaborator = (await collaboratorApi.nodes.createFile(file)).entry.id;
 
+    await adminApiActions.login();
     adminFolderId = (await adminApiActions.nodes.createFolder(adminFolder)).entry.id;
 
     await userApi.search.waitForNodes(searchFolder, { expect: 2 });
@@ -117,7 +118,6 @@ describe('Destination picker dialog : ', () => {
     await contributorApi.nodes.deleteNodeById(fileIdContributor);
     await collaboratorApi.nodes.deleteNodeById(fileIdCollaborator);
 
-    await adminApiActions.login();
     await adminApiActions.nodes.deleteNodeById(adminFolderId);
   });
 

e2e/suites/actions/copy-move/move.test.ts

@@ -68,9 +68,7 @@ describe('Move content', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     await apis.user.sites.createSite(siteName);
     const docLibId = await apis.user.sites.getDocLibId(siteName);
@@ -422,6 +420,7 @@ describe('Move content', () => {
     beforeAll(async (done) => {
       file1Id = (await apis.user.nodes.createFile(file1, sourceIdSF)).entry.id;
 
+      await userActions.login(username, username);
       await userActions.shareNodes([file1Id]);
 
       file2Id = (await apis.user.nodes.createFile(file2, sourceIdSF)).entry.id;

e2e/suites/actions/create/create-file-from-template.test.ts

@@ -34,7 +34,7 @@ import {
   RepoClient,
   NodeContentTree
 } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 describe('Create file from template', () => {
   const random = Utils.random();
@@ -111,7 +111,7 @@ describe('Create file from template', () => {
   };
   let link: string;
 
-  beforeAll(async () => {
+  beforeAll(async (done) => {
     await adminApiActions.createUser({ username });
 
     parentId = (await userApi.nodes.createFolder(parent)).entry.id;
@@ -122,12 +122,14 @@ describe('Create file from template', () => {
     await userApi.nodes.createFile(duplicateFileSite, docLibUserSite);
 
     await loginPage.loginWith(username);
+    done();
   });
 
   afterAll(async () => {
     await userApi.nodes.deleteNodeById(parentId);
     await userApi.sites.deleteSite(siteName);
 
+    await adminApiActions.login();
     await adminApiActions.cleanupNodeTemplatesItems([
       templatesFolder1,
       templatesFolder2,
@@ -143,6 +145,7 @@ describe('Create file from template', () => {
 
   describe('with existing templates', () => {
     beforeAll(async () => {
+      await adminApiActions.login();
       await adminApiActions.createNodeTemplatesHierarchy(templates);
       await adminApiActions.removeUserAccessOnNodeTemplate(restrictedTemplateFolder);
       link = (await adminApiActions.createLinkToFileName(template2InRootFolder, await adminApiActions.getNodeTemplatesFolderId())).entry.name;
@@ -229,11 +232,15 @@ describe('Create file from template', () => {
 
     describe('Create from template dialog', () => {
       beforeEach(async () => {
+        try {
           await sidenav.openCreateFileFromTemplateDialog();
           await selectTemplateDialog.waitForDialogToOpen();
           await selectTemplateDialog.dataTable.selectItem(template1InRootFolder);
           await selectTemplateDialog.clickNext();
           await createFromTemplateDialog.waitForDialogToOpen();
+        } catch (error) {
+          Logger.error(`----- beforeEach failed : ${error}`);
+        }
       });
 
       it('[C325020] Create file from template - dialog UI', async () => {
@@ -296,6 +303,7 @@ describe('Create file from template', () => {
 
     describe('On Personal Files', () => {
       beforeEach(async () => {
+        try {
           await page.clickPersonalFilesAndWait();
           await page.dataTable.doubleClickOnRowByName(parent);
           await sidenav.openCreateFileFromTemplateDialog();
@@ -303,6 +311,9 @@ describe('Create file from template', () => {
           await selectTemplateDialog.dataTable.selectItem(template1InRootFolder);
           await selectTemplateDialog.clickNext();
           await createFromTemplateDialog.waitForDialogToOpen();
+        } catch (error) {
+          Logger.error(`----- beforeEach failed : ${error}`);
+        }
       });
 
       it('[C325030] Create a file from a template - with a new Name', async () => {
@@ -360,6 +371,7 @@ describe('Create file from template', () => {
       const fileLibrariesPage = new BrowsingPage();
 
       beforeEach(async () => {
+        try {
           await fileLibrariesPage.goToMyLibrariesAndWait();
           await page.dataTable.doubleClickOnRowByName(siteName);
           await sidenav.openCreateFileFromTemplateDialog();
@@ -367,6 +379,9 @@ describe('Create file from template', () => {
           await selectTemplateDialog.dataTable.selectItem(template1InRootFolder);
           await selectTemplateDialog.clickNext();
           await createFromTemplateDialog.waitForDialogToOpen();
+        } catch (error) {
+          Logger.error(`----- beforeEach failed : ${error}`);
+        }
       });
 
       it('[C325023] Create a file from a template - with Name, Title and Description', async () => {

e2e/suites/actions/create/create-folder-from-template.test.ts

@@ -123,6 +123,7 @@ describe('Create folder from template', () => {
     docLibUserSite = await userApi.sites.getDocLibId(siteName);
     await userApi.nodes.createFolder(duplicateFolderSite, docLibUserSite);
 
+    await adminApiActions.login();
     await adminApiActions.createSpaceTemplatesHierarchy(templates);
     await adminApiActions.removeUserAccessOnSpaceTemplate(restrictedTemplateFolder);
     folderLink = (await adminApiActions.createLinkToFolderName(folderInRootFolder, await adminApiActions.getSpaceTemplatesFolderId())).entry.name;

e2e/suites/actions/delete/delete-undo-delete.test.ts

@@ -41,13 +41,11 @@ describe('Delete and undo delete', () => {
   const userActions = new UserActions();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-
-    await userActions.login(username, username);
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.emptyTrashcan();
   });
 
@@ -64,6 +62,7 @@ describe('Delete and undo delete', () => {
     const recentFile6 = `recentFile6-${random}.txt`;
 
     beforeAll(async (done) => {
+      try {
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
 
         await apis.user.nodes.createFile(recentFile1, parentId);
@@ -75,6 +74,9 @@ describe('Delete and undo delete', () => {
         await apis.user.search.waitForNodes(random, { expect: 6 });
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
@@ -84,6 +86,7 @@ describe('Delete and undo delete', () => {
 
     afterAll(async () => {
       try {
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId]);
         await userActions.emptyTrashcan();
       } catch (error) {
@@ -217,18 +220,20 @@ describe('Delete and undo delete', () => {
       await page.dataTable.doubleClickOnRowByName(parent);
     });
 
-    afterAll(async () => {
+    afterAll(async (done) => {
       try {
         await apis.user.nodes.unlockFile(fileLocked1Id);
         await apis.user.nodes.unlockFile(fileLocked2Id);
         await apis.user.nodes.unlockFile(fileLocked3Id);
         await apis.user.nodes.unlockFile(fileLocked4Id);
 
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId]);
         await userActions.emptyTrashcan();
       } catch (error) {
         Logger.error(`----- afterAll failed : ${error}`);
       }
+      done();
     });
 
     it('[C217125] delete a file and check notification', async () => {
@@ -351,6 +356,7 @@ describe('Delete and undo delete', () => {
     let parentId: string;
 
     beforeAll(async (done) => {
+      try {
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
 
         sharedFile1Id = (await apis.user.nodes.createFile(sharedFile1, parentId)).entry.id;
@@ -364,6 +370,9 @@ describe('Delete and undo delete', () => {
         await apis.user.shared.waitForFilesToBeShared([sharedFile1Id, sharedFile2Id, sharedFile3Id, sharedFile4Id, sharedFile5Id, sharedFile6Id]);
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
@@ -373,6 +382,7 @@ describe('Delete and undo delete', () => {
 
     afterAll(async () => {
       try {
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId]);
         await userActions.emptyTrashcan();
       } catch (error) {
@@ -466,6 +476,7 @@ describe('Delete and undo delete', () => {
     let fileLocked4Id: string;
 
     beforeAll(async (done) => {
+      try {
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
 
         favFile1Id = (await apis.user.nodes.createFile(favFile1, parentId)).entry.id;
@@ -501,12 +512,14 @@ describe('Delete and undo delete', () => {
         await apis.user.favorites.waitForApi({ expect: initialFavoritesTotalItems + 13 });
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickFavoritesAndWait();
-      done();
     });
 
     afterAll(async () => {
@@ -516,6 +529,7 @@ describe('Delete and undo delete', () => {
         await apis.user.nodes.unlockFile(fileLocked3Id);
         await apis.user.nodes.unlockFile(fileLocked4Id);
 
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId]);
         await userActions.emptyTrashcan();
       } catch (error) {

e2e/suites/actions/delete/permanently-delete.test.ts

@@ -53,14 +53,13 @@ describe('Permanently delete from Trash', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     filesIds = (await apis.user.nodes.createFiles([file1, file2, file3])).list.entries.map((entries: any) => entries.entry.id);
     foldersIds = (await apis.user.nodes.createFolders([folder1, folder2])).list.entries.map((entries: any) => entries.entry.id);
     await apis.user.sites.createSite(site);
 
+    await userActions.login(username, username);
     await userActions.deleteNodes([...filesIds, ...foldersIds], false);
     await userActions.deleteSites([site], false);
 
@@ -68,12 +67,12 @@ describe('Permanently delete from Trash', () => {
     done();
   });
 
-  beforeEach(async (done) => {
+  beforeEach(async () => {
     await page.clickTrashAndWait();
-    done();
   });
 
   afterAll(async (done) => {
+    await userActions.login(username, username);
     await userActions.emptyTrashcan();
     done();
   });

e2e/suites/actions/delete/restore.test.ts

@@ -25,7 +25,7 @@
 
 import { browser } from 'protractor';
 import { AdminActions, UserActions, LoginPage, BrowsingPage, APP_ROUTES, RepoClient, Utils } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 describe('Restore from Trash', () => {
   const username = `user-${Utils.random()}`;
@@ -41,17 +41,14 @@ describe('Restore from Trash', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-
     await loginPage.loginWith(username);
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.emptyTrashcan();
-    done();
   });
 
   describe('successful restore', () => {
@@ -61,27 +58,26 @@ describe('Restore from Trash', () => {
     let folderId: string;
     const site = `site-${Utils.random()}`;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
       fileId = (await apis.user.nodes.createFile(file)).entry.id;
       folderId = (await apis.user.nodes.createFolder(folder)).entry.id;
       await apis.user.sites.createSite(site);
 
+      await userActions.login(username, username);
       await userActions.deleteNodes([fileId, folderId], false);
       await userActions.deleteSites([site], false);
-      done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickTrashAndWait();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      await userActions.login(username, username);
       await userActions.emptyTrashcan();
-      done();
     });
 
-    it('[C217177] restore file', async () => {
+    it('[C217177] restore file', async (done) => {
       await dataTable.selectItem(file);
       await BrowserActions.click(toolbar.restoreButton);
       const text = await page.getSnackBarMessage();
@@ -92,9 +88,10 @@ describe('Restore from Trash', () => {
       expect(await page.dataTable.isItemPresent(file)).toBe(true, 'Item not displayed in list');
 
       await userActions.deleteNodes([fileId], false);
+      done();
     });
 
-    it('[C280438] restore folder', async () => {
+    it('[C280438] restore folder', async (done) => {
       await dataTable.selectItem(folder);
       await BrowserActions.click(toolbar.restoreButton);
       const text = await page.getSnackBarMessage();
@@ -105,6 +102,7 @@ describe('Restore from Trash', () => {
       expect(await page.dataTable.isItemPresent(folder)).toBe(true, 'Item not displayed in list');
 
       await userActions.deleteNodes([folderId], false);
+      done();
     });
 
     it('[C290104] restore library', async () => {
@@ -118,7 +116,7 @@ describe('Restore from Trash', () => {
       expect(await page.dataTable.isItemPresent(site)).toBe(true, `${site} not displayed in list`);
     });
 
-    it('[C217182] restore multiple items', async () => {
+    it('[C217182] restore multiple items', async (done) => {
       await dataTable.selectMultipleItems([file, folder]);
       await BrowserActions.click(toolbar.restoreButton);
       const text = await page.getSnackBarMessage();
@@ -131,9 +129,10 @@ describe('Restore from Trash', () => {
       expect(await page.dataTable.isItemPresent(folder)).toBe(true, 'Item not displayed in list');
 
       await userActions.deleteNodes([fileId, folderId], false);
+      done();
     });
 
-    it('[C217181] View from notification', async () => {
+    it('[C217181] View from notification', async (done) => {
       await dataTable.selectItem(file);
       await BrowserActions.click(toolbar.restoreButton);
       await page.clickSnackBarAction();
@@ -142,6 +141,7 @@ describe('Restore from Trash', () => {
       expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES);
 
       await userActions.deleteNodes([fileId], false);
+      done();
     });
   });
 
@@ -157,9 +157,11 @@ describe('Restore from Trash', () => {
     const folder2 = `folder-${Utils.random()}`;
     let folder2Id: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
       folder1Id = (await apis.user.nodes.createFolder(folder1)).entry.id;
       file1Id1 = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id;
+
+      await userActions.login(username, username);
       await userActions.deleteNodes([file1Id1], false);
       file1Id2 = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id;
 
@@ -167,29 +169,25 @@ describe('Restore from Trash', () => {
       file2Id = (await apis.user.nodes.createFile(file2, folder2Id)).entry.id;
 
       await userActions.deleteNodes([file2Id, folder2Id], false);
-      done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickTrashAndWait();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      await userActions.login(username, username);
       await userActions.deleteNodes([file1Id2]);
       await userActions.emptyTrashcan();
-      done();
     });
 
     it('[C217178] Restore a file when another file with same name exists on the restore location', async () => {
-      await page.clickTrashAndWait();
       await dataTable.selectItem(file1);
       await BrowserActions.click(toolbar.restoreButton);
       expect(await page.getSnackBarMessage()).toEqual(`Can't restore, ${file1} already exists`);
     });
 
     it('[C217179] Restore a file when original location no longer exists', async () => {
-      await page.clickTrashAndWait();
       await dataTable.selectItem(file2);
       await BrowserActions.click(toolbar.restoreButton);
       expect(await page.getSnackBarMessage()).toEqual(`Can't restore ${file2}, the original location no longer exists`);
@@ -218,11 +216,13 @@ describe('Restore from Trash', () => {
     let file5Id: string;
 
     beforeAll(async (done) => {
+      try {
         folder1Id = (await apis.user.nodes.createFolder(folder1)).entry.id;
         file1Id = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id;
         folder2Id = (await apis.user.nodes.createFolder(folder2)).entry.id;
         file2Id = (await apis.user.nodes.createFile(file2, folder2Id)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.deleteNodes([file1Id, folder1Id, file2Id], false);
 
         folder3Id = (await apis.user.nodes.createFolder(folder3)).entry.id;
@@ -233,17 +233,19 @@ describe('Restore from Trash', () => {
 
         await userActions.deleteNodes([file3Id, file4Id, folder3Id, file5Id], false);
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickTrashAndWait();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      await userActions.login(username, username);
       await userActions.emptyTrashcan();
-      done();
     });
 
     it('[C217183] one failure', async () => {

e2e/suites/actions/edit/edit-folder.test.ts

@@ -123,7 +123,6 @@ describe('Edit folder', () => {
   });
 
   afterAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.sites.deleteSite(sitePrivate);
     await apis.user.sites.deleteSite(siteName);
     await apis.user.nodes.deleteNodesById([parentId, folderFavoriteToEditId, folderFavoriteDuplicateId, folderSearchToEditId]);

e2e/suites/actions/favorite/mark-favorite.test.ts

@@ -123,14 +123,12 @@ describe('Mark items as favorites', () => {
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
     await apis.user.nodes.deleteNodeById(parentId);
-    done();
   });
 
-  afterEach(async (done) => {
+  afterEach(async () => {
     await Utils.pressEscape();
-    done();
   });
 
   describe('on Personal Files', () => {

e2e/suites/actions/library/library-actions.test.ts

@@ -78,9 +78,7 @@ describe('Library actions', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     await adminApiActions.sites.createSite(siteSearchPublic1Admin);
     await adminApiActions.sites.createSite(siteSearchPublic2Admin);
@@ -126,6 +124,7 @@ describe('Library actions', () => {
       siteSearchModerated2Admin
     ]);
 
+    await userActions.login(username, username);
     await userActions.deleteSites([sitePublicUser]);
     await userActions.emptyTrashcan();
   });

e2e/suites/actions/share/share-file.test.ts

@@ -35,7 +35,7 @@ import {
   Viewer,
   Utils
 } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 describe('Share a file', () => {
   const username = `user-${Utils.random()}`;
@@ -65,10 +65,8 @@ describe('Share a file', () => {
   const userActions = new UserActions();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
 
-    await userActions.login(username, username);
     parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
   });
 
@@ -137,6 +135,7 @@ describe('Share a file', () => {
         file8Id = (await apis.user.nodes.createFile(file8, parentId)).entry.id;
         file9Id = (await apis.user.nodes.createFile(file9, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file6Id, file7Id], expiryDate);
         await apis.user.shared.waitForFilesToBeShared([file6Id, file7Id]);
       });
@@ -337,16 +336,21 @@ describe('Share a file', () => {
         file8Id = (await apis.user.nodes.createFile(file8, parentInSiteId)).entry.id;
         file9Id = (await apis.user.nodes.createFile(file9, parentInSiteId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file6Id, file7Id], expiryDate);
         await apis.user.shared.waitForFilesToBeShared([file6Id, file7Id]);
       });
 
       beforeEach(async () => {
+        try {
           await page.goToMyLibrariesAndWait();
           await dataTable.doubleClickOnRowByName(siteName);
           await dataTable.waitForHeader();
           await dataTable.doubleClickOnRowByName(parentInSite);
           await dataTable.waitForHeader();
+        } catch (error) {
+          Logger.error(`----- beforeEach failed : ${error}`);
+        }
       });
 
       afterEach(async () => {
@@ -532,6 +536,7 @@ describe('Share a file', () => {
         file8Id = (await apis.user.nodes.createFile(file8, parentId)).entry.id;
         file9Id = (await apis.user.nodes.createFile(file9, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file6Id, file7Id], expiryDate);
         await apis.user.shared.waitForFilesToBeShared([file6Id, file7Id]);
       });
@@ -719,6 +724,7 @@ describe('Share a file', () => {
         file6Id = (await apis.user.nodes.createFile(file6, parentId)).entry.id;
         file7Id = (await apis.user.nodes.createFile(file7, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file1Id, file2Id, file3Id]);
         await userActions.shareNodes([file4Id, file5Id], expiryDate);
         await userActions.shareNodes([file6Id, file7Id]);
@@ -866,6 +872,7 @@ describe('Share a file', () => {
         file9Id = (await apis.user.nodes.createFile(file9, parentId)).entry.id;
 
         await apis.user.favorites.addFavoritesByIds('file', [file1Id, file2Id, file3Id, file4Id, file5Id, file6Id, file7Id, file8Id, file9Id]);
+        await userActions.login(username, username);
         await userActions.shareNodes([file6Id, file7Id], expiryDate);
 
         await apis.user.favorites.waitForApi({ expect: 9 });
@@ -1060,15 +1067,20 @@ describe('Share a file', () => {
         fileSearch9Id = (await apis.user.nodes.createFile(fileSearch9, parentId)).entry.id;
         await apis.user.search.waitForNodes(searchRandom, { expect: 5 });
 
+        await userActions.login(username, username);
         await userActions.shareNodes([fileSearch6Id, fileSearch7Id], expiryDate);
         await apis.user.shared.waitForFilesToBeShared([fileSearch6Id, fileSearch7Id]);
       });
 
       beforeEach(async () => {
+        try {
           await searchInput.clickSearchButton();
           await searchInput.checkFilesAndFolders();
           await searchInput.searchFor(searchRandom);
           await dataTable.waitForBody();
+        } catch (error) {
+          Logger.error(`----- beforeEach failed : ${error}`);
+        }
       });
 
       afterEach(async () => {

e2e/suites/actions/share/unshare-file-search-results.test.ts

@@ -37,7 +37,7 @@ import {
   Viewer,
   Utils
 } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 describe('Unshare a file from Search Results', () => {
   const username = `user-${Utils.random()}`;
@@ -79,9 +79,8 @@ describe('Unshare a file from Search Results', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
       parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
 
@@ -90,7 +89,7 @@ describe('Unshare a file from Search Results', () => {
       file3Id = (await apis.user.nodes.createFile(file3, parentId)).entry.id;
       file4Id = (await apis.user.nodes.createFile(file4, parentId)).entry.id;
 
-    await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id]);
+      await adminApiActions.login();
       await adminApiActions.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE);
       const docLibId = await adminApiActions.sites.getDocLibId(sitePrivate);
 
@@ -100,26 +99,29 @@ describe('Unshare a file from Search Results', () => {
       await adminApiActions.sites.addSiteMember(sitePrivate, username, SITE_ROLES.SITE_CONSUMER.ROLE);
 
       await adminApiActions.shareNodes([fileSite1Id]);
-    await userActions.shareNodes([fileSite2Id]);
-
-    await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id, fileSite2Id]);
       await adminApiActions.shared.waitForFilesToBeShared([fileSite1Id]);
+
+      await userActions.login(username, username);
+      await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id, fileSite2Id]);
+      await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id, fileSite2Id]);
+
       await apis.user.search.waitForNodes(`search-file-${searchRandom}`, { expect: 6 });
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
     await apis.user.nodes.deleteNodeById(parentId);
     await adminApiActions.sites.deleteSite(sitePrivate);
-    done();
   });
 
-  afterEach(async (done) => {
+  afterEach(async () => {
     await page.closeOpenDialogs();
     await page.clickPersonalFilesAndWait();
-    done();
   });
 
   it('[C306995] Unshare dialog UI', async () => {

e2e/suites/actions/share/unshare-file.test.ts

@@ -37,7 +37,7 @@ import {
   Viewer,
   Utils
 } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 describe('Unshare a file', () => {
   const username = `user-${Utils.random()}`;
@@ -61,18 +61,19 @@ describe('Unshare a file', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
       parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
     await apis.user.nodes.deleteNodeById(parentId);
-    done();
   });
 
   describe('from Personal Files', () => {
@@ -85,33 +86,38 @@ describe('Unshare a file', () => {
     const file4 = `file4-${Utils.random()}.txt`;
     let file4Id: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
+      try {
         file1Id = (await apis.user.nodes.createFile(file1, parentId)).entry.id;
         file2Id = (await apis.user.nodes.createFile(file2, parentId)).entry.id;
         file3Id = (await apis.user.nodes.createFile(file3, parentId)).entry.id;
         file4Id = (await apis.user.nodes.createFile(file4, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id]);
         await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id]);
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
+      try {
         await page.closeOpenDialogs();
         await page.clickPersonalFilesAndWait();
         await dataTable.doubleClickOnRowByName(parent);
         await dataTable.waitForHeader();
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeEach failed : ${error}`);
+      }
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await page.closeOpenDialogs();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
       await apis.user.nodes.deleteNodesById([file1Id, file2Id, file3Id, file4Id]);
-      done();
     });
 
     it('[C286339] Unshare dialog UI', async () => {
@@ -204,7 +210,8 @@ describe('Unshare a file', () => {
     const parentInSite = `parent-site-${Utils.random()}`;
     let parentInSiteId: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
+      try {
         await apis.user.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC);
         const docLibId = await apis.user.sites.getDocLibId(siteName);
         parentInSiteId = (await apis.user.nodes.createFolder(parentInSite, docLibId)).entry.id;
@@ -214,29 +221,33 @@ describe('Unshare a file', () => {
         file3Id = (await apis.user.nodes.createFile(file3, parentInSiteId)).entry.id;
         file4Id = (await apis.user.nodes.createFile(file4, parentInSiteId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id]);
         await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id]);
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
+      try {
         await page.closeOpenDialogs();
         await page.goToMyLibrariesAndWait();
         await dataTable.doubleClickOnRowByName(siteName);
         await dataTable.waitForHeader();
         await dataTable.doubleClickOnRowByName(parentInSite);
         await dataTable.waitForHeader();
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeEach failed : ${error}`);
+      }
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await page.closeOpenDialogs();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
       await adminApiActions.sites.deleteSite(siteName);
-      done();
     });
 
     it('[C286679] Unshare dialog UI', async () => {
@@ -325,31 +336,32 @@ describe('Unshare a file', () => {
     const file4 = `file4-${Utils.random()}.txt`;
     let file4Id: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
+      try {
         file1Id = (await apis.user.nodes.createFile(file1, parentId)).entry.id;
         file2Id = (await apis.user.nodes.createFile(file2, parentId)).entry.id;
         file3Id = (await apis.user.nodes.createFile(file3, parentId)).entry.id;
         file4Id = (await apis.user.nodes.createFile(file4, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id]);
         await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id]);
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.closeOpenDialogs();
       await page.clickRecentFilesAndWait();
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await page.closeOpenDialogs();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
       await apis.user.nodes.deleteNodesById([file1Id, file2Id, file3Id, file4Id]);
-      done();
     });
 
     it('[C286689] Unshare dialog UI', async () => {
@@ -438,31 +450,32 @@ describe('Unshare a file', () => {
     const file4 = `file4-${Utils.random()}.txt`;
     let file4Id: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
+      try {
         file1Id = (await apis.user.nodes.createFile(file1, parentId)).entry.id;
         file2Id = (await apis.user.nodes.createFile(file2, parentId)).entry.id;
         file3Id = (await apis.user.nodes.createFile(file3, parentId)).entry.id;
         file4Id = (await apis.user.nodes.createFile(file4, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id]);
         await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id]);
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.closeOpenDialogs();
       await page.clickSharedFilesAndWait();
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await page.closeOpenDialogs();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
       await apis.user.nodes.deleteNodesById([file1Id, file2Id, file3Id, file4Id]);
-      done();
     });
 
     it('[C286684] Unshare dialog UI', async () => {
@@ -553,12 +566,14 @@ describe('Unshare a file', () => {
     const file4 = `file4-${Utils.random()}.txt`;
     let file4Id: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
+      try {
         file1Id = (await apis.user.nodes.createFile(file1, parentId)).entry.id;
         file2Id = (await apis.user.nodes.createFile(file2, parentId)).entry.id;
         file3Id = (await apis.user.nodes.createFile(file3, parentId)).entry.id;
         file4Id = (await apis.user.nodes.createFile(file4, parentId)).entry.id;
 
+        await userActions.login(username, username);
         await userActions.shareNodes([file1Id, file2Id, file3Id, file4Id]);
 
         await apis.user.favorites.addFavoriteById('file', file1Id);
@@ -568,23 +583,22 @@ describe('Unshare a file', () => {
 
         await apis.user.favorites.waitForApi({ expect: 4 });
         await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id]);
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.closeOpenDialogs();
       await page.clickFavoritesAndWait();
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await page.closeOpenDialogs();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
       await apis.user.nodes.deleteNodesById([file1Id, file2Id, file3Id, file4Id]);
-      done();
     });
 
     it('[C286694] Unshare dialog UI', async () => {
@@ -679,7 +693,9 @@ describe('Unshare a file', () => {
     const file2Fav = `file2-Fav-${Utils.random()}.txt`;
     let file2FavId: string;
 
-    beforeAll(async (done) => {
+    beforeAll(async () => {
+      try {
+        await adminApiActions.login();
         await adminApiActions.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE);
         const docLibId = await adminApiActions.sites.getDocLibId(sitePrivate);
 
@@ -692,7 +708,6 @@ describe('Unshare a file', () => {
 
         await adminApiActions.sites.addSiteMember(sitePrivate, username, SITE_ROLES.SITE_CONSUMER.ROLE);
 
-      await adminApiActions.login();
         await adminApiActions.shareNodes([file1FileLibId, file1SharedId, file1FavId]);
 
         await userActions.login(username, username);
@@ -704,19 +719,18 @@ describe('Unshare a file', () => {
         await apis.user.favorites.waitForApi({ expect: 2 });
         await adminApiActions.shared.waitForFilesToBeShared([file1FileLibId, file1SharedId, file1FavId]);
         await apis.user.shared.waitForFilesToBeShared([file2FileLibId, file2SharedId, file2FavId]);
-
+      } catch (error) {
-      done();
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
       await adminApiActions.sites.deleteSite(sitePrivate);
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await page.closeOpenDialogs();
       await page.clickPersonalFilesAndWait();
-      done();
     });
 
     it('[C286682] on File Libraries - file shared by other user', async () => {

e2e/suites/actions/upload-download/download.test.ts

@@ -81,9 +81,7 @@ describe('Download', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     initialRecentTotalItems = await apis.user.search.getTotalItems(username);
 
@@ -108,6 +106,7 @@ describe('Download', () => {
 
     await apis.user.search.waitForApi(username, { expect: initialRecentTotalItems + 10 });
 
+    await userActions.login(username, username);
     await userActions.shareNodes([fileShared1Id, fileShared2Id]);
     await apis.user.shared.waitForFilesToBeShared([fileShared1Id, fileShared2Id]);
 
@@ -121,6 +120,7 @@ describe('Download', () => {
   });
 
   afterAll(async (done) => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
     done();

e2e/suites/application/general.test.ts

@@ -24,7 +24,7 @@
  */
 
 import { browser } from 'protractor';
-import { BrowserActions, Logger } from '@alfresco/adf-testing';
+import { BrowserActions } from '@alfresco/adf-testing';
 import { BrowsingPage, LoginPage, CreateOrEditFolderDialog, RepoClient, Utils } from '@alfresco/aca-testing-shared';
 
 describe('General', () => {
@@ -61,11 +61,7 @@ describe('General', () => {
 
       expect(await browser.getTitle()).toContain('Sign in');
 
-      try {
       await createDialog.waitForDialogToClose();
-      } catch (error) {
-        Logger.error('err: ', error);
-      }
       expect(await createDialog.isDialogOpen()).not.toBe(true, 'dialog is present');
     });
   });

e2e/suites/info-drawer/comments.test.ts

@@ -69,9 +69,7 @@ describe('Comments', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
 
@@ -84,6 +82,7 @@ describe('Comments', () => {
     fileWith1CommentId = (await apis.user.nodes.createFile(fileWith1Comment, parentId)).entry.id;
     fileWith2CommentsId = (await apis.user.nodes.createFile(fileWith2Comments, parentId)).entry.id;
 
+    await userActions.login(username, username);
     comment1File2Entry = await userActions.createComment(fileWith2CommentsId, 'first comment');
     comment2File2Entry = await userActions.createComment(fileWith2CommentsId, 'second comment');
 
@@ -101,6 +100,7 @@ describe('Comments', () => {
   });
 
   afterAll(async (done) => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     done();
   });
@@ -355,6 +355,7 @@ describe('Comments', () => {
 
   describe('Comment info display', () => {
     beforeAll(async (done) => {
+      await userActions.login(username, username);
       commentFile1Entry = await userActions.createComment(fileWith1CommentId, 'this is my comment');
 
       await apis.user.favorites.waitForApi({ expect: 4 });

e2e/suites/list-views/favorites.test.ts

@@ -51,9 +51,7 @@ describe('Favorites', () => {
   let folderId: string;
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     await adminApiActions.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC);
     const docLibId = await adminApiActions.sites.getDocLibId(siteName);
@@ -72,6 +70,7 @@ describe('Favorites', () => {
     await apis.user.favorites.addFavoriteById('file', file3Id);
     await apis.user.favorites.addFavoriteById('file', file4Id);
 
+    await userActions.login(username, username);
     await userActions.deleteNodes([file3Id, file4Id], false);
     await userActions.trashcanApi.restoreDeletedNode(file4Id);
     await loginPage.loginWith(username);
@@ -84,6 +83,7 @@ describe('Favorites', () => {
   });
 
   afterAll(async (done) => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([folderId, parentId]);
     await userActions.emptyTrashcan();
 

e2e/suites/list-views/file-libraries.test.ts

@@ -24,6 +24,7 @@
  */
 
 import { AdminActions, SITE_VISIBILITY, SITE_ROLES, LoginPage, BrowsingPage, Utils, RepoClient } from '@alfresco/aca-testing-shared';
+import { Logger } from '@alfresco/adf-testing';
 
 describe('File Libraries', () => {
   const username = `user-${Utils.random()}`;
@@ -57,6 +58,7 @@ describe('File Libraries', () => {
   const adminApiActions = new AdminActions();
 
   beforeAll(async (done) => {
+    try {
       await adminApiActions.createUser({ username });
 
       await apis.user.sites.createSite(userSitePublic, SITE_VISIBILITY.PUBLIC);
@@ -84,19 +86,20 @@ describe('File Libraries', () => {
       await apis.user.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC, null, siteId2);
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
     await apis.user.sites.deleteSites([userSitePublic, userSiteModerated, userSitePrivate, siteId1, siteId2]);
     await adminApiActions.sites.deleteSites([adminSite1, adminSite2, adminSite3, adminSite4, adminSite5, adminSite6]);
-    done();
   });
 
   describe('My Libraries', () => {
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.goToMyLibrariesAndWait();
-      done();
     });
 
     it('[C217095] has the correct columns', async () => {
@@ -160,9 +163,8 @@ describe('File Libraries', () => {
   });
 
   describe('Favorite Libraries', () => {
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.goToFavoriteLibrariesAndWait();
-      done();
     });
 
     it('[C289893] has the correct columns', async () => {

e2e/suites/list-views/generic-errors.test.ts

@@ -25,6 +25,7 @@
 
 import { browser } from 'protractor';
 import { AdminActions, UserActions, LoginPage, BrowsingPage, Utils, RepoClient } from '@alfresco/aca-testing-shared';
+import { Logger } from '@alfresco/adf-testing';
 
 describe('Generic errors', () => {
   const username = `user-${Utils.random()}`;
@@ -48,23 +49,25 @@ describe('Generic errors', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.createUser({ username });
       await adminApiActions.createUser({ username: username2 });
-    await userActions.login(username, username);
 
       parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
       file1Id = (await apis.user.nodes.createFile(file1, parentId)).entry.id;
       await apis.user.nodes.createFile(file2, parentId);
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
     done();
   });
 
-  afterAll(async (done) => {
+  afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
-    done();
   });
 
   it('[C217313] File / folder not found', async () => {

e2e/suites/list-views/permissions.test.ts

@@ -40,11 +40,8 @@ describe('Special permissions', () => {
   const adminApiActions = new AdminActions();
   const userActions = new UserActions();
 
-  beforeAll(async (done) => {
+  beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-    done();
   });
 
   describe('file not displayed if user no longer has permissions on it', () => {
@@ -53,16 +50,20 @@ describe('Special permissions', () => {
     let fileId: string;
 
     beforeAll(async (done) => {
+      await adminApiActions.login();
       await adminApiActions.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE);
       await adminApiActions.sites.addSiteMember(sitePrivate, username, SITE_ROLES.SITE_COLLABORATOR.ROLE);
       const docLibId = await adminApiActions.sites.getDocLibId(sitePrivate);
       fileId = (await adminApiActions.nodes.createFile(fileName, docLibId)).entry.id;
       await apis.user.favorites.addFavoriteById('file', fileId);
 
+      await adminApiActions.login();
       await adminApiActions.shareNodes([fileId]);
       await apis.user.nodes.updateNodeContent(fileId, 'edited by user');
 
       await apis.user.search.waitForApi(username, { expect: 1 });
+
+      await adminApiActions.login();
       await adminApiActions.shared.waitForFilesToBeShared([fileId]);
 
       await loginPage.loginWith(username);
@@ -132,6 +133,7 @@ describe('Special permissions', () => {
       fileId = (await apis.user.nodes.createFile(fileName, docLibId)).entry.id;
       await apis.user.favorites.addFavoriteById('file', fileId);
 
+      await userActions.login(username, username);
       await userActions.shareNodes([fileId]);
       await apis.user.shared.waitForFilesToBeShared([fileId]);
 

e2e/suites/list-views/recent-files.test.ts

@@ -52,14 +52,14 @@ describe('Recent Files', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     folderId = (await apis.user.nodes.createFolders([folderName])).entry.id;
     await apis.user.nodes.createFiles([fileName1], folderName);
     file2Id = (await apis.user.nodes.createFiles([fileName2])).entry.id;
     const id = (await apis.user.nodes.createFiles([fileName3])).entry.id;
+
+    await userActions.login(username, username);
     await userActions.deleteNodes([id], false);
 
     await apis.user.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC);
@@ -79,6 +79,7 @@ describe('Recent Files', () => {
   });
 
   afterAll(async (done) => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([folderId, file2Id]);
     await userActions.deleteSites([siteName]);
     await userActions.emptyTrashcan();

e2e/suites/list-views/shared-files.test.ts

@@ -59,6 +59,9 @@ describe('Shared Files', () => {
     const docLibId = await adminApiActions.sites.getDocLibId(siteName);
     const nodeId = (await adminApiActions.nodes.createFile(fileAdmin, docLibId)).entry.id;
 
+    await adminApiActions.shareNodes([nodeId]);
+    await adminApiActions.shared.waitForFilesToBeShared([nodeId]);
+
     folderId = (await apis.user.nodes.createFolder(folderUser)).entry.id;
     file1Id = (await apis.user.nodes.createFile(file1User, folderId)).entry.id;
     file2Id = (await apis.user.nodes.createFile(file2User)).entry.id;
@@ -66,12 +69,7 @@ describe('Shared Files', () => {
     file4Id = (await apis.user.nodes.createFile(file4User)).entry.id;
 
     await apis.user.shared.shareFilesByIds([file1Id, file2Id, file3Id, file4Id]);
-
-    await adminApiActions.login();
-    await adminApiActions.shareNodes([nodeId]);
-
     await apis.user.shared.waitForFilesToBeShared([file1Id, file2Id, file3Id, file4Id]);
-    await adminApiActions.shared.waitForFilesToBeShared([nodeId]);
 
     await apis.user.nodes.deleteNodeById(file2Id);
     await apis.user.shared.unshareFileById(file3Id);

e2e/suites/list-views/tooltips.test.ts

@@ -63,9 +63,7 @@ describe('File / folder tooltips', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
 
@@ -88,6 +86,7 @@ describe('File / folder tooltips', () => {
   });
 
   afterAll(async (done) => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([parentId]);
     await userActions.emptyTrashcan();
     done();
@@ -246,6 +245,7 @@ describe('File / folder tooltips', () => {
     });
 
     afterAll(async (done) => {
+      await userActions.login(username, username);
       await userActions.deleteNodes([parentForTrashId]);
       await userActions.emptyTrashcan();
       done();

e2e/suites/list-views/trash.test.ts

@@ -66,7 +66,6 @@ describe('Trash', () => {
 
   beforeAll(async () => {
     try {
-      await adminApiActions.login();
       await adminApiActions.createUser({ username });
 
       fileAdminId = (await adminApiActions.nodes.createFiles([fileAdmin])).entry.id;
@@ -93,10 +92,13 @@ describe('Trash', () => {
 
   afterAll(async () => {
     try {
+      await adminApiActions.login();
       await adminApiActions.sites.deleteSite(siteName);
       await adminApiActions.trashcanApi.deleteDeletedNode(fileAdminId);
       await adminApiActions.trashcanApi.deleteDeletedNode(folderAdminId);
+
       await apis.user.nodes.deleteNodeById(folderNotDeletedId);
+
       await userActions.login(username, username);
       await userActions.emptyTrashcan();
     } catch (error) {

e2e/suites/navigation/single-click.test.ts

@@ -55,9 +55,7 @@ describe('Single click on item name', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     const initialRecentTotalItems = await apis.user.search.getTotalItems(username);
 
@@ -73,6 +71,7 @@ describe('Single click on item name', () => {
     deletedFile1Id = (await apis.user.nodes.createFile(deletedFile1)).entry.id;
     deletedFolder1Id = (await apis.user.nodes.createFolder(deletedFolder1)).entry.id;
 
+    await userActions.login(username, username);
     await userActions.deleteNodes([deletedFile1Id, deletedFolder1Id], false);
 
     await loginPage.loginWith(username);
@@ -80,6 +79,7 @@ describe('Single click on item name', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteSites([siteName]);
     await userActions.deleteNodes([folder1Id, file1Id]);
     await userActions.emptyTrashcan();
@@ -135,6 +135,7 @@ describe('Single click on item name', () => {
 
   describe('on Shared Files', () => {
     beforeAll(async () => {
+      await userActions.login(username, username);
       await userActions.shareNodes([file1Id]);
       await apis.user.shared.waitForFilesToBeShared([file1Id]);
     });

e2e/suites/pagination/multiple-pages-libraries.test.ts

@@ -56,11 +56,7 @@ describe('Pagination on multiple pages', () => {
   }, 400000);
 
   afterAll(async () => {
-    try {
     await userApi.sites.deleteSites(sites);
-    } catch (error) {
-      Logger.error(`----- afterAll failed : ${error}`);
-    }
   });
 
   describe('on My Libraries', () => {

e2e/suites/pagination/multiple-pages-trash.test.ts

@@ -43,12 +43,11 @@ describe('Pagination on multiple pages on Trash', () => {
   const { dataTable, pagination } = page;
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     filesDeletedIds = (await userApi.nodes.createFiles(filesForDelete)).list.entries.map((entries: any) => entries.entry.id);
 
+    await userActions.login(username, username);
     await userActions.deleteNodes(filesDeletedIds, false);
     await userActions.waitForTrashcanSize(51);
 
@@ -61,6 +60,7 @@ describe('Pagination on multiple pages on Trash', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.emptyTrashcan();
   });
 

e2e/suites/pagination/single-page.test.ts

@@ -49,12 +49,12 @@ describe('Pagination on single page', () => {
   const searchResultsPage = new SearchResultsPage();
 
   beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     const initialFavoriteTotalItems = await userApi.favorites.getFavoritesTotalItems();
     const initialRecentFilesTotalItems = await userApi.search.getTotalItems(username);
+
+    await userActions.login(username, username);
     const initialTrashTotalItems = await userActions.getTrashcanSize();
 
     fileId = (await userApi.nodes.createFile(file)).entry.id;
@@ -74,6 +74,7 @@ describe('Pagination on single page', () => {
   });
 
   afterAll(async () => {
+    await userActions.login(username, username);
     await userActions.deleteNodes([fileId]);
     await userActions.deleteSites([siteId]);
     await userActions.emptyTrashcan();

e2e/suites/search/search-results-libraries.test.ts

@@ -24,6 +24,7 @@
  */
 
 import { AdminActions, LoginPage, SearchResultsPage, RepoClient, Utils, SITE_VISIBILITY, SITE_ROLES } from '@alfresco/aca-testing-shared';
+import { Logger } from '@alfresco/adf-testing';
 
 describe('Search results - libraries', () => {
   const random = Utils.random();
@@ -74,6 +75,7 @@ describe('Search results - libraries', () => {
   const adminApiActions = new AdminActions();
 
   beforeAll(async (done) => {
+    try {
       await adminApiActions.createUser({ username });
 
       await apis.user.sites.createSite(site1.name, SITE_VISIBILITY.PUBLIC, '', site1.id);
@@ -115,13 +117,19 @@ describe('Search results - libraries', () => {
       await apis.user.queries.waitForSites(random, { expect: 12 });
 
       await loginPage.loginWith(username);
+    } catch (error) {
+      Logger.error(`----- beforeAll failed : ${error}`);
+    }
     done();
   });
 
   afterAll(async () => {
-    await adminApiActions.login();
+    try {
       await adminApiActions.sites.deleteSites([adminSite1, adminSite2, adminSite3, adminSite4, adminPrivate]);
       await apis.user.sites.deleteSites([site1.id, site2.id, site3.id, site4.id, userSitePublic, userSiteModerated, userSitePrivate, siteRussian.id]);
+    } catch (error) {
+      Logger.error(`----- afterAll failed : ${error}`);
+    }
   });
 
   beforeEach(async () => {

e2e/suites/viewer/viewer-actions.test.ts

@@ -37,7 +37,7 @@ import {
   ManageVersionsDialog,
   UploadNewVersionDialog
 } from '@alfresco/aca-testing-shared';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 describe('Viewer actions', () => {
   const username = `user-${Utils.random()}`;
@@ -63,11 +63,8 @@ describe('Viewer actions', () => {
   const adminApiActions = new AdminActions();
   const userActions = new UserActions();
 
-  beforeAll(async (done) => {
+  beforeAll(async () => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
-    done();
   });
 
   describe('from Personal Files', () => {
@@ -94,6 +91,7 @@ describe('Viewer actions', () => {
     let fileForUploadNewVersionId2: string;
 
     beforeAll(async (done) => {
+      try {
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
         destinationId = (await apis.user.nodes.createFolder(destination)).entry.id;
 
@@ -113,26 +111,35 @@ describe('Viewer actions', () => {
         await apis.user.nodes.lockFile(fileForUploadNewVersionId2);
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
+      try {
         await page.clickPersonalFilesAndWait();
         await dataTable.doubleClickOnRowByName(parent);
         await dataTable.waitForHeader();
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeEach failed : ${error}`);
+      }
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await Utils.pressEscape();
       await page.closeUploadDialog();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      try {
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId, destinationId]);
         await userActions.emptyTrashcan();
-      done();
+      } catch (error) {
+        Logger.error(`----- afterAll failed : ${error}`);
+      }
     });
 
     it('[C268129] Download action', async () => {
@@ -323,6 +330,7 @@ describe('Viewer actions', () => {
     let fileForUploadNewVersionId: string;
 
     beforeAll(async (done) => {
+      try {
         await apis.user.sites.createSite(siteName);
         const docLibId = await apis.user.sites.getDocLibId(siteName);
         destinationId = (await apis.user.nodes.createFolder(destination)).entry.id;
@@ -341,27 +349,36 @@ describe('Viewer actions', () => {
         await apis.user.nodes.lockFile(fileForUploadNewVersionId);
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
+      try {
         await page.goToMyLibrariesAndWait();
         await dataTable.doubleClickOnRowByName(siteName);
         await dataTable.waitForHeader();
-      done();
+      } catch (error) {
+        Logger.error(`----- beforeEach failed : ${error}`);
+      }
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await Utils.pressEscape();
       await page.closeUploadDialog();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      try {
+        await userActions.login(username, username);
         await userActions.deleteSites([siteName]);
         await userActions.deleteNodes([destinationId]);
         await userActions.emptyTrashcan();
-      done();
+      } catch (error) {
+        Logger.error(`----- afterAll failed : ${error}`);
+      }
     });
 
     it('[C286369] Download action', async () => {
@@ -510,6 +527,7 @@ describe('Viewer actions', () => {
     let fileForUploadNewVersionId: string;
 
     beforeAll(async (done) => {
+      try {
         await apis.user.search.waitForApi(username, { expect: 0 });
 
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
@@ -531,24 +549,29 @@ describe('Viewer actions', () => {
         await apis.user.search.waitForApi(username, { expect: 7 });
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickRecentFilesAndWait();
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await Utils.pressEscape();
       await page.closeUploadDialog();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      try {
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId, destinationId]);
         await userActions.emptyTrashcan();
-      done();
+      } catch (error) {
+        Logger.error(`----- afterAll failed : ${error}`);
+      }
     });
 
     it('[C286383] Download action', async () => {
@@ -700,6 +723,7 @@ describe('Viewer actions', () => {
     let fileForUploadNewVersionId;
 
     beforeAll(async (done) => {
+      try {
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
         destinationId = (await apis.user.nodes.createFolder(destination)).entry.id;
         docxFileId = (await apis.user.upload.uploadFileWithRename(docxFile, parentId, docxSharedFiles)).entry.id;
@@ -735,25 +759,34 @@ describe('Viewer actions', () => {
         ]);
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickSharedFilesAndWait();
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
+      try {
         await page.closeOpenDialogs();
         await Utils.pressEscape();
         await page.closeUploadDialog();
-      done();
+      } catch (error) {
+        Logger.error(`----- afterEach failed : ${error}`);
+      }
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      try {
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId, destinationId]);
         await userActions.emptyTrashcan();
-      done();
+      } catch (error) {
+        Logger.error(`----- afterAll failed : ${error}`);
+      }
     });
 
     it('[C286376] Download action', async () => {
@@ -904,6 +937,7 @@ describe('Viewer actions', () => {
     let fileForUploadNewVersionId: string;
 
     beforeAll(async (done) => {
+      try {
         parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
         destinationId = (await apis.user.nodes.createFolder(destination)).entry.id;
         docxFileId = (await apis.user.upload.uploadFileWithRename(docxFile, parentId, docxFavorites)).entry.id;
@@ -931,24 +965,29 @@ describe('Viewer actions', () => {
         await apis.user.favorites.waitForApi({ expect: 7 });
 
         await loginPage.loginWith(username);
+      } catch (error) {
+        Logger.error(`----- beforeAll failed : ${error}`);
+      }
       done();
     });
 
-    beforeEach(async (done) => {
+    beforeEach(async () => {
       await page.clickFavoritesAndWait();
-      done();
     });
 
-    afterEach(async (done) => {
+    afterEach(async () => {
       await Utils.pressEscape();
       await page.closeUploadDialog();
-      done();
     });
 
-    afterAll(async (done) => {
+    afterAll(async () => {
+      try {
+        await userActions.login(username, username);
         await userActions.deleteNodes([parentId, destinationId]);
         await userActions.emptyTrashcan();
-      done();
+      } catch (error) {
+        Logger.error(`----- afterAll failed : ${error}`);
+      }
     });
 
     it('[C286390] Download action', async () => {

e2e/suites/viewer/viewer-general.test.ts

@@ -58,9 +58,7 @@ describe('Viewer general', () => {
   const userActions = new UserActions();
 
   beforeAll(async (done) => {
-    await adminApiActions.login();
     await adminApiActions.createUser({ username });
-    await userActions.login(username, username);
 
     parentId = (await apis.user.nodes.createFolder(parent)).entry.id;
     xlsxFileId = (await apis.user.upload.uploadFile(xlsxFile, parentId)).entry.id;
@@ -73,6 +71,7 @@ describe('Viewer general', () => {
     docLibSiteUserId = await apis.user.sites.getDocLibId(siteUser);
     await apis.user.upload.uploadFile(fileInSite, docLibSiteUserId);
 
+    await userActions.login(username, username);
     await userActions.shareNodes([xlsxFileId]);
     await apis.user.favorites.addFavoriteById('file', xlsxFileId);
 

projects/aca-testing-shared/src/components/data-table/data-table.ts

@@ -228,7 +228,7 @@ export class DataTable extends Component {
       await browser.actions().mouseMove(item).perform();
       await browser.actions().doubleClick().perform();
     } catch (error) {
-      Logger.error('--- catch: doubleClickOnRowByName : ', error);
+      Logger.error(`--- doubleClickOnRowByName catch : failed to double click on ${name} from location : ${location} : `, error);
     }
   }
 
@@ -252,7 +252,7 @@ export class DataTable extends Component {
         const item = this.getRowFirstCell(name, location);
         await item.click();
       } catch (e) {
-        Logger.error('--- unselect item catch : ', e);
+        Logger.error(`--- unselect item catch : failed to unselect ${name} from location : ${location} : `, e);
       }
     }
   }

projects/aca-testing-shared/src/components/dialog/generic-dialog.ts

@@ -25,7 +25,7 @@
 
 import { ElementFinder, by, browser, Locator } from 'protractor';
 import { isPresentAndDisplayed, waitForPresence, waitForStaleness } from '../../utilities/utils';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserVisibility, Logger } from '@alfresco/adf-testing';
 
 export abstract class GenericDialog {
   protected constructor(private rootCssSelector?: string) {}
@@ -53,7 +53,11 @@ export abstract class GenericDialog {
   }
 
   async waitForDialogToClose(): Promise<void> {
+    try {
       await waitForStaleness(this.content);
+    } catch (error) {
+      Logger.error(`GenericDialog waitForDialogToClose :  catch : ${error}`);
+    }
   }
 
   async isDialogOpen(): Promise<boolean> {

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

@@ -128,7 +128,7 @@ export class Menu extends Component {
       const elem = this.getItemByLabel(menuItem);
       await BrowserActions.click(elem);
     } catch (e) {
-      Logger.error('___click menu item catch___', e);
+      Logger.error(`___click menu item catch : failed to click on ${menuItem}___`, e);
     }
   }
 
@@ -139,7 +139,7 @@ export class Menu extends Component {
       await browser.actions().mouseMove(elem).perform();
       await browser.sleep(500);
     } catch (error) {
-      Logger.error('----- mouse over error: ', error);
+      Logger.error(`----- mouse over error : failed to mouse over ${menuItem} : `, error);
     }
   }
 

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

@@ -58,7 +58,7 @@ export class Sidenav extends Component {
         await element(by.css('.mat-expansion-panel-body')).isPresent();
       }
     } catch (e) {
-      Logger.error('---- sidebar navigation catch expandMenu: ', e);
+      Logger.error(`---- sidebar navigation catch expandMenu: failed to expand ${name} menu : `, e);
     }
   }
 
@@ -144,7 +144,7 @@ export class Sidenav extends Component {
       const link = this.getLinkLabel(name);
       await BrowserActions.click(link);
     } catch (error) {
-      Logger.error('---- sidebar navigation clickLink catch error: ', error);
+      Logger.error(`---- clickLink catch : sidebar navigation failed to click on - ${name} : `, error);
     }
   }
 

projects/aca-testing-shared/src/pages/login-page.ts

@@ -27,7 +27,7 @@ import { LoginComponent } from '../components/components';
 import { Page } from './page';
 import { APP_ROUTES } from '../configs';
 import { waitForPresence } from '../utilities/utils';
-import { BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, Logger } from '@alfresco/adf-testing';
 
 export class LoginPage extends Page {
   login = new LoginComponent(this.appRoot);
@@ -47,6 +47,7 @@ export class LoginPage extends Page {
   }
 
   async loginWith(username: string, password?: string) {
+    try {
       const pass = password || username;
 
       await this.load();
@@ -54,6 +55,9 @@ export class LoginPage extends Page {
       await this.login.enterCredentials(username, pass);
       await BrowserActions.click(this.login.submitButton);
       await this.waitForApp();
+    } catch (error) {
+      Logger.error(`----- loginWith catch : failed to login with user: ${username} : ${error}`);
+    }
   }
 
   async loginWithAdmin() {

projects/aca-testing-shared/src/pages/page.ts

@@ -57,7 +57,7 @@ export abstract class Page {
     return browser.get(path);
   }
 
-  async waitForApp() {
+  async waitForApp(): Promise<void> {
     await waitForPresence(this.layout);
   }
 
@@ -67,15 +67,15 @@ export abstract class Page {
     await BrowserVisibility.waitUntilElementIsPresent(browser.element(by.css('[class*="login-content"] input#username')));
   }
 
-  async waitForDialog() {
+  async waitForDialog(): Promise<void> {
     await BrowserVisibility.waitUntilElementIsVisible(this.dialogContainer);
   }
 
-  async isDialogOpen() {
+  async isDialogOpen(): Promise<boolean> {
-    return browser.isElementPresent(this.dialogContainer);
+    return isPresentAndDisplayed(this.dialogContainer);
   }
 
-  async closeOpenDialogs() {
+  async closeOpenDialogs(): Promise<void> {
     while (await this.isDialogOpen()) {
       await Utils.pressEscape();
     }

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

@@ -26,7 +26,7 @@
 import { RepoApi } from '../repo-api';
 import { Logger } from '@alfresco/adf-testing';
 import { Utils } from '../../../../utilities/utils';
-import { SharedlinksApi as AdfSharedlinksApi, SharedLinkEntry } from '@alfresco/js-api';
+import { SharedlinksApi as AdfSharedlinksApi, SharedLinkEntry, SharedLinkPaging } from '@alfresco/js-api';
 
 export class SharedLinksApi extends RepoApi {
   sharedlinksApi = new AdfSharedlinksApi(this.alfrescoJsApi);
@@ -75,7 +75,7 @@ export class SharedLinksApi extends RepoApi {
     }
   }
 
-  async unshareFileById(fileId: string) {
+  async unshareFileById(fileId: string): Promise<any> {
     try {
       const sharedId = await this.getSharedIdOfNode(fileId);
       return await this.sharedlinksApi.deleteSharedLink(sharedId);
@@ -84,7 +84,7 @@ export class SharedLinksApi extends RepoApi {
     }
   }
 
-  async getSharedLinks(maxItems: number = 250) {
+  async getSharedLinks(maxItems: number = 250): Promise<SharedLinkPaging | null> {
     try {
       await this.apiAuth();
       const opts = {
@@ -111,7 +111,7 @@ export class SharedLinksApi extends RepoApi {
     }
   }
 
-  async waitForApi(data: { expect: number }) {
+  async waitForApi(data: { expect: number }): Promise<any> {
     try {
       const sharedFiles = async () => {
         const totalItems = await this.getSharedLinksTotalItems();
@@ -129,7 +129,7 @@ export class SharedLinksApi extends RepoApi {
     }
   }
 
-  async waitForFilesToBeShared(filesIds: string[]) {
+  async waitForFilesToBeShared(filesIds: string[]): Promise<any> {
     try {
       const sharedFile = async () => {
         const sharedFiles = (await this.getSharedLinks()).list.entries.map((link) => link.entry.nodeId);
@@ -143,12 +143,12 @@ export class SharedLinksApi extends RepoApi {
 
       return await Utils.retryCall(sharedFile);
     } catch (error) {
-      Logger.error(`SharedLinksApi waitForFilesToBeShared :  catch : `);
+      Logger.error(`SharedLinksApi waitForFilesToBeShared :  catch : ${error}`);
       Logger.error(`\tWait timeout reached waiting for files to be shared`);
     }
   }
 
-  async waitForFilesToNotBeShared(filesIds: string[]) {
+  async waitForFilesToNotBeShared(filesIds: string[]): Promise<any> {
     try {
       const sharedFile = async () => {
         const sharedFiles = (await this.getSharedLinks()).list.entries.map((link) => link.entry.nodeId);
@@ -166,7 +166,7 @@ export class SharedLinksApi extends RepoApi {
 
       return await Utils.retryCall(sharedFile);
     } catch (error) {
-      Logger.error(`SharedLinksApi waitForFilesToNotBeShared :  catch : `);
+      Logger.error(`SharedLinksApi waitForFilesToNotBeShared :  catch : ${error}`);
       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

@@ -168,6 +168,7 @@ export class SitesApi extends RepoApi {
   }
 
   async deleteSites(siteIds: string[], permanent: boolean = true) {
+    try {
       if (siteIds && siteIds.length > 0) {
         await this.apiAuth();
 
@@ -175,6 +176,9 @@ export class SitesApi extends RepoApi {
           await this.sitesApi.deleteSite(siteId, { permanent });
         }
       }
+    } catch (error) {
+      this.handleError(`SitesApi deleteSites : catch : `, error);
+    }
   }
 
   async deleteAllUserSites(permanent: boolean = true) {
@@ -287,7 +291,7 @@ export class SitesApi extends RepoApi {
 
       return await Utils.retryCall(site);
     } catch (error) {
-      Logger.error(`SitesApi waitForSitesToBeCreated :  catch : `);
+      Logger.error(`SitesApi waitForSitesToBeCreated :  catch : ${error}`);
       Logger.error(`\tWait timeout reached waiting for sites to be created`);
     }
   }

projects/aca-testing-shared/src/utilities/utils.ts

@@ -142,7 +142,7 @@ export class Utils {
     if (fileExists) {
       fs.rename(oldFilePath, newFilePath, function (err: any) {
         if (err) {
-          Logger.error('==== rename err: ', err);
+          Logger.error(`==== rename err : failed to rename file from ${oldName} to ${newName} : `, err);
         }
       });
     }
@@ -159,7 +159,7 @@ export class Utils {
     });
 
     await zip.on('error', (err: any) => {
-      Logger.error('=== unzip err: ', err);
+      Logger.error(`=== unzip err : failed to unzip ${filename} - ${unzippedName} :`, err);
     });
 
     await zip.on('ready', async () => {