From b44beeb877f689aed81b68b02198b7c510abc084 Mon Sep 17 00:00:00 2001
From: Katarzyna Kita <156378082+katarzynakita@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:51:38 +0100
Subject: [PATCH] Changed beforeEach, small 'random' cleanup (#3728)

---
 .../src/tests/library-actions.spec.ts              | 14 ++------------
 .../src/tests/search-results-general.spec.ts       |  3 +--
 .../src/tests/search-results-libraries.spec.ts     |  4 ++--
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/e2e/playwright/library-actions/src/tests/library-actions.spec.ts b/e2e/playwright/library-actions/src/tests/library-actions.spec.ts
index 4eabb8a81..31522f9bb 100644
--- a/e2e/playwright/library-actions/src/tests/library-actions.spec.ts
+++ b/e2e/playwright/library-actions/src/tests/library-actions.spec.ts
@@ -138,18 +138,8 @@ test.describe('Library actions ', () => {
   });
 
   test.beforeEach(async ({ loginPage, myLibrariesPage }) => {
-    try {
-      await loginPage.loginUser(
-        { username: username2, password: username2 },
-        {
-          withNavigation: true,
-          waitForLoading: true
-        }
-      );
-      await myLibrariesPage.navigate();
-    } catch (error) {
-      console.error(`Main beforeEach failed : ${error}`);
-    }
+    await Utils.tryLoginUser(loginPage, username2, username2, 'beforeEach failed');
+    await myLibrariesPage.navigate();
   });
 
   test.afterAll(async () => {
diff --git a/e2e/playwright/search/src/tests/search-results-general.spec.ts b/e2e/playwright/search/src/tests/search-results-general.spec.ts
index 17a297a40..347d8aca9 100644
--- a/e2e/playwright/search/src/tests/search-results-general.spec.ts
+++ b/e2e/playwright/search/src/tests/search-results-general.spec.ts
@@ -30,9 +30,8 @@ test.describe('Search Results - General', () => {
   let nodesApi: NodesApi;
   let sitesApi: SitesApi;
 
-  const username = `user1-${Utils.random()}`;
   const random = Utils.random();
-
+  const username = `user1-${random}`;
   const file = `test-file-${random}.txt`;
   const folder = `test-folder-${random}`;
   const site = `test-site-${random}`;
diff --git a/e2e/playwright/search/src/tests/search-results-libraries.spec.ts b/e2e/playwright/search/src/tests/search-results-libraries.spec.ts
index b5be8de19..52450ee53 100644
--- a/e2e/playwright/search/src/tests/search-results-libraries.spec.ts
+++ b/e2e/playwright/search/src/tests/search-results-libraries.spec.ts
@@ -42,9 +42,9 @@ test.describe('Search Results - General', () => {
   let sitesAdminApi: SitesApi;
   let fileActionsApi: FileActionsApi;
 
-  const username = `user-${Utils.random()}`;
   const random = Utils.random();
-  const randomDescription = Utils.random() + '-' + Utils.random();
+  const username = `user-${random}`;
+  const randomDescription = random + '-' + random;
 
   const site1 = {
     name: `lib-${random}-1`,