diff --git a/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts b/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts index 431d57f55..e4852cba3 100755 --- a/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts +++ b/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts @@ -22,16 +22,18 @@ * from Hyland Software. If not, see . */ -import { ApiClientFactory, FavoritesPageApi, NodesApi, test, timeouts, Utils } from '@alfresco/playwright-shared'; +import { ApiClientFactory, FavoritesPageApi, NodesApi, test, timeouts, Utils, TrashcanApi } from '@alfresco/playwright-shared'; import { personalFilesTests } from './personal-files'; import { favoritesTests } from './favorites'; test.describe('Pagination on multiple pages : ', () => { const random = Utils.random(); const username = `user-${random}`; + let nodesApi: NodesApi; + let trashcanApi: TrashcanApi; + let favoritesApi: FavoritesPageApi; const parent = `parent-${random}`; - let parentId: string; let initialFavoritesTotalItems: number; const apiClientFactory = new ApiClientFactory(); @@ -40,14 +42,14 @@ test.describe('Pagination on multiple pages : ', () => { test.setTimeout(timeouts.extendedTest); await apiClientFactory.setUpAcaBackend('admin'); await apiClientFactory.createUser({ username }); - const nodesApi = await NodesApi.initialize(username, username); - const favoritesApi = await FavoritesPageApi.initialize(username, username); + nodesApi = await NodesApi.initialize(username, username); + favoritesApi = await FavoritesPageApi.initialize(username, username); const files = Array(51) .fill('my-file') .map((name, index): string => `${name}-${index + 1}-${random}.txt`); - parentId = (await nodesApi.createFolder(parent)).entry.id; + await nodesApi.createFolder(parent); const filesIds = (await nodesApi.createFiles(files, parent)).list.entries.map((entries) => entries.entry.id); initialFavoritesTotalItems = await favoritesApi.getFavoritesTotalItems(username); @@ -55,7 +57,7 @@ test.describe('Pagination on multiple pages : ', () => { }); test.afterAll(async () => { - await apiClientFactory.nodes.deleteNode(parentId, { permanent: true }); + await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed'); }); test.describe('on Personal Files', () => { @@ -64,7 +66,6 @@ test.describe('Pagination on multiple pages : ', () => { test.describe('on Favorites', () => { test.beforeAll(async () => { - const favoritesApi = await FavoritesPageApi.initialize(username, username); await favoritesApi.waitForApi(username, { expect: initialFavoritesTotalItems + 51 }); }); favoritesTests(username);