diff --git a/e2e/playwright/navigation/src/tests/breadcrumb-admin.spec.ts b/e2e/playwright/navigation/src/tests/breadcrumb-admin.spec.ts index 4e7566079..0e1626275 100644 --- a/e2e/playwright/navigation/src/tests/breadcrumb-admin.spec.ts +++ b/e2e/playwright/navigation/src/tests/breadcrumb-admin.spec.ts @@ -23,7 +23,7 @@ */ import { expect } from '@playwright/test'; -import { ApiClientFactory, LoginPage, NodesApi, test, users, Utils } from '@alfresco/playwright-shared'; +import { ApiClientFactory, NodesApi, test, users, Utils } from '@alfresco/playwright-shared'; test.describe('as admin', () => { test.describe.configure({ mode: 'serial' }); @@ -39,16 +39,9 @@ test.describe('as admin', () => { userFolderId = node.entry.id; }); - test.beforeEach(async ({ page, personalFiles }) => { - const loginPage = new LoginPage(page); + test.beforeEach(async ({ loginPage, personalFiles }) => { + await Utils.tryLoginUser(loginPage, users.admin.username, users.admin.password, 'beforeEach failed'); await personalFiles.navigate(); - await loginPage.loginUser( - { username: users.admin.username, password: users.admin.password }, - { - withNavigation: true, - waitForLoading: true - } - ); }); test.afterAll(async () => { diff --git a/e2e/playwright/navigation/src/tests/breadcrumb.spec.ts b/e2e/playwright/navigation/src/tests/breadcrumb.spec.ts index 2bbe8c23d..72ff5d06e 100644 --- a/e2e/playwright/navigation/src/tests/breadcrumb.spec.ts +++ b/e2e/playwright/navigation/src/tests/breadcrumb.spec.ts @@ -23,12 +23,13 @@ */ import { expect } from '@playwright/test'; -import { ApiClientFactory, LoginPage, NodesApi, SitesApi, test, timeouts, Utils } from '@alfresco/playwright-shared'; +import { ApiClientFactory, TrashcanApi, NodesApi, SitesApi, test, timeouts, Utils } from '@alfresco/playwright-shared'; import { Site } from '@alfresco/js-api'; test.describe('viewer action file', () => { let nodesApi: NodesApi; let siteActions: SitesApi; + let trashcanApi: TrashcanApi; const username = `user-${Utils.random()}`; const parent = `parent-${Utils.random()}`; let parentId: string; @@ -61,6 +62,7 @@ test.describe('viewer action file', () => { await apiClientFactory.createUser({ username }); nodesApi = await NodesApi.initialize(username, username); siteActions = await SitesApi.initialize(username, username); + trashcanApi = await TrashcanApi.initialize(username, username); const parentNode = await nodesApi.createFolder(parent); parentId = parentNode.entry.id; subFolder1Id = (await nodesApi.createFolder(subFolder1, parentId)).entry.id; @@ -78,20 +80,12 @@ test.describe('viewer action file', () => { await nodesApi.createFile(fileName1FromSite, subFolder2FromSiteId); }); - test.beforeEach(async ({ page }) => { - const loginPage = new LoginPage(page); - await loginPage.loginUser( - { username, password: username }, - { - withNavigation: true, - waitForLoading: true - } - ); + test.beforeEach(async ({ loginPage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); }); test.afterAll(async () => { - await nodesApi.deleteNodes([parentId, parent2Id], true); - await siteActions.deleteSites([docLibId]); + await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed', siteActions, [docLibId]); }); test('[C260964] Personal Files breadcrumb main node', async ({ personalFiles }) => { diff --git a/e2e/playwright/navigation/src/tests/sidebar.spec.ts b/e2e/playwright/navigation/src/tests/sidebar.spec.ts index a8c7f863b..823869f99 100644 --- a/e2e/playwright/navigation/src/tests/sidebar.spec.ts +++ b/e2e/playwright/navigation/src/tests/sidebar.spec.ts @@ -23,7 +23,7 @@ */ import { expect } from '@playwright/test'; -import { ApiClientFactory, APP_ROUTES, LoginPage, SIDEBAR_LABELS, test, Utils } from '@alfresco/playwright-shared'; +import { ApiClientFactory, APP_ROUTES, SIDEBAR_LABELS, test, Utils } from '@alfresco/playwright-shared'; test.describe('Sidebar', () => { const username = `user-${Utils.random()}`; @@ -34,15 +34,8 @@ test.describe('Sidebar', () => { await apiClientFactory.createUser({ username }); }); - test.beforeEach(async ({ page }) => { - const loginPage = new LoginPage(page); - await loginPage.loginUser( - { username, password: username }, - { - withNavigation: true, - waitForLoading: true - } - ); + test.beforeEach(async ({ loginPage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); }); test('[C289901] navigate to My Libraries', async ({ personalFiles, myLibrariesPage }) => { diff --git a/e2e/playwright/navigation/src/tests/single-click.spec.ts b/e2e/playwright/navigation/src/tests/single-click.spec.ts index 89e2e08f4..f59c3e481 100644 --- a/e2e/playwright/navigation/src/tests/single-click.spec.ts +++ b/e2e/playwright/navigation/src/tests/single-click.spec.ts @@ -23,20 +23,17 @@ */ import { expect } from '@playwright/test'; -import { ApiClientFactory, LoginPage, NodesApi, SitesApi, test, Utils } from '@alfresco/playwright-shared'; +import { ApiClientFactory, TrashcanApi, NodesApi, SitesApi, test, Utils } from '@alfresco/playwright-shared'; test.describe('Single click on item name', () => { let nodesApi: NodesApi; + let trashcanApi: TrashcanApi; const username = `user-${Utils.random()}`; const folder1 = `folder1-${Utils.random()}`; - let folder1Id: string; const folderSearch = `folder1-${Utils.random()}`; - let folderSearchId: string; const deletedFile1 = `file1-${Utils.random()}.txt`; - let deletedFile1Id: string; const deletedFolder1 = `folder1-${Utils.random()}`; - let deletedFolder1Id: string; const siteName = `site-${Utils.random()}`; const fileSite = `fileSite-${Utils.random()}.txt`; @@ -46,31 +43,24 @@ test.describe('Single click on item name', () => { await apiClientFactory.setUpAcaBackend('admin'); await apiClientFactory.createUser({ username }); nodesApi = await NodesApi.initialize(username, username); + trashcanApi = await TrashcanApi.initialize(username, username); const siteActions = await SitesApi.initialize(username, username); - const node = await nodesApi.createFolder(folder1); - folder1Id = node.entry.id; - folderSearchId = (await nodesApi.createFolder(folderSearch)).entry.id; - deletedFile1Id = (await nodesApi.createFile(deletedFile1)).entry.id; - deletedFolder1Id = (await nodesApi.createFolder(deletedFolder1)).entry.id; + await nodesApi.createFolder(folder1); + await nodesApi.createFolder(folderSearch); + await nodesApi.createFile(deletedFile1); + await nodesApi.createFolder(deletedFolder1); await siteActions.createSite(siteName); const docLibId = await siteActions.getDocLibId(siteName); await nodesApi.createFile(fileSite, docLibId); }); - test.beforeEach(async ({ page }) => { - const loginPage = new LoginPage(page); - await loginPage.loginUser( - { username, password: username }, - { - withNavigation: true, - waitForLoading: true - } - ); + test.beforeEach(async ({ loginPage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); }); test.afterAll(async () => { - await nodesApi.deleteNodes([deletedFolder1Id, deletedFile1Id, folder1Id, folderSearchId], true); + await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed'); }); test('[C284899] Hyperlink does not appear for items in the Trash', async ({ trashPage }) => {