[ACS-7300] beforeEach and afterAll refactored for navigation tests (#3736)

This commit is contained in:
Adam Świderski
2024-03-27 10:39:44 +01:00
committed by GitHub
parent d6e6c41a2e
commit 3bec4abe4f
4 changed files with 22 additions and 52 deletions

View File

@@ -23,7 +23,7 @@
*/ */
import { expect } from '@playwright/test'; 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('as admin', () => {
test.describe.configure({ mode: 'serial' }); test.describe.configure({ mode: 'serial' });
@@ -39,16 +39,9 @@ test.describe('as admin', () => {
userFolderId = node.entry.id; userFolderId = node.entry.id;
}); });
test.beforeEach(async ({ page, personalFiles }) => { test.beforeEach(async ({ loginPage, personalFiles }) => {
const loginPage = new LoginPage(page); await Utils.tryLoginUser(loginPage, users.admin.username, users.admin.password, 'beforeEach failed');
await personalFiles.navigate(); await personalFiles.navigate();
await loginPage.loginUser(
{ username: users.admin.username, password: users.admin.password },
{
withNavigation: true,
waitForLoading: true
}
);
}); });
test.afterAll(async () => { test.afterAll(async () => {

View File

@@ -23,12 +23,13 @@
*/ */
import { expect } from '@playwright/test'; 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'; import { Site } from '@alfresco/js-api';
test.describe('viewer action file', () => { test.describe('viewer action file', () => {
let nodesApi: NodesApi; let nodesApi: NodesApi;
let siteActions: SitesApi; let siteActions: SitesApi;
let trashcanApi: TrashcanApi;
const username = `user-${Utils.random()}`; const username = `user-${Utils.random()}`;
const parent = `parent-${Utils.random()}`; const parent = `parent-${Utils.random()}`;
let parentId: string; let parentId: string;
@@ -61,6 +62,7 @@ test.describe('viewer action file', () => {
await apiClientFactory.createUser({ username }); await apiClientFactory.createUser({ username });
nodesApi = await NodesApi.initialize(username, username); nodesApi = await NodesApi.initialize(username, username);
siteActions = await SitesApi.initialize(username, username); siteActions = await SitesApi.initialize(username, username);
trashcanApi = await TrashcanApi.initialize(username, username);
const parentNode = await nodesApi.createFolder(parent); const parentNode = await nodesApi.createFolder(parent);
parentId = parentNode.entry.id; parentId = parentNode.entry.id;
subFolder1Id = (await nodesApi.createFolder(subFolder1, parentId)).entry.id; subFolder1Id = (await nodesApi.createFolder(subFolder1, parentId)).entry.id;
@@ -78,20 +80,12 @@ test.describe('viewer action file', () => {
await nodesApi.createFile(fileName1FromSite, subFolder2FromSiteId); await nodesApi.createFile(fileName1FromSite, subFolder2FromSiteId);
}); });
test.beforeEach(async ({ page }) => { test.beforeEach(async ({ loginPage }) => {
const loginPage = new LoginPage(page); await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed');
await loginPage.loginUser(
{ username, password: username },
{
withNavigation: true,
waitForLoading: true
}
);
}); });
test.afterAll(async () => { test.afterAll(async () => {
await nodesApi.deleteNodes([parentId, parent2Id], true); await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed', siteActions, [docLibId]);
await siteActions.deleteSites([docLibId]);
}); });
test('[C260964] Personal Files breadcrumb main node', async ({ personalFiles }) => { test('[C260964] Personal Files breadcrumb main node', async ({ personalFiles }) => {

View File

@@ -23,7 +23,7 @@
*/ */
import { expect } from '@playwright/test'; 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', () => { test.describe('Sidebar', () => {
const username = `user-${Utils.random()}`; const username = `user-${Utils.random()}`;
@@ -34,15 +34,8 @@ test.describe('Sidebar', () => {
await apiClientFactory.createUser({ username }); await apiClientFactory.createUser({ username });
}); });
test.beforeEach(async ({ page }) => { test.beforeEach(async ({ loginPage }) => {
const loginPage = new LoginPage(page); await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed');
await loginPage.loginUser(
{ username, password: username },
{
withNavigation: true,
waitForLoading: true
}
);
}); });
test('[C289901] navigate to My Libraries', async ({ personalFiles, myLibrariesPage }) => { test('[C289901] navigate to My Libraries', async ({ personalFiles, myLibrariesPage }) => {

View File

@@ -23,20 +23,17 @@
*/ */
import { expect } from '@playwright/test'; 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', () => { test.describe('Single click on item name', () => {
let nodesApi: NodesApi; let nodesApi: NodesApi;
let trashcanApi: TrashcanApi;
const username = `user-${Utils.random()}`; const username = `user-${Utils.random()}`;
const folder1 = `folder1-${Utils.random()}`; const folder1 = `folder1-${Utils.random()}`;
let folder1Id: string;
const folderSearch = `folder1-${Utils.random()}`; const folderSearch = `folder1-${Utils.random()}`;
let folderSearchId: string;
const deletedFile1 = `file1-${Utils.random()}.txt`; const deletedFile1 = `file1-${Utils.random()}.txt`;
let deletedFile1Id: string;
const deletedFolder1 = `folder1-${Utils.random()}`; const deletedFolder1 = `folder1-${Utils.random()}`;
let deletedFolder1Id: string;
const siteName = `site-${Utils.random()}`; const siteName = `site-${Utils.random()}`;
const fileSite = `fileSite-${Utils.random()}.txt`; const fileSite = `fileSite-${Utils.random()}.txt`;
@@ -46,31 +43,24 @@ test.describe('Single click on item name', () => {
await apiClientFactory.setUpAcaBackend('admin'); await apiClientFactory.setUpAcaBackend('admin');
await apiClientFactory.createUser({ username }); await apiClientFactory.createUser({ username });
nodesApi = await NodesApi.initialize(username, username); nodesApi = await NodesApi.initialize(username, username);
trashcanApi = await TrashcanApi.initialize(username, username);
const siteActions = await SitesApi.initialize(username, username); const siteActions = await SitesApi.initialize(username, username);
const node = await nodesApi.createFolder(folder1); await nodesApi.createFolder(folder1);
folder1Id = node.entry.id; await nodesApi.createFolder(folderSearch);
folderSearchId = (await nodesApi.createFolder(folderSearch)).entry.id; await nodesApi.createFile(deletedFile1);
deletedFile1Id = (await nodesApi.createFile(deletedFile1)).entry.id; await nodesApi.createFolder(deletedFolder1);
deletedFolder1Id = (await nodesApi.createFolder(deletedFolder1)).entry.id;
await siteActions.createSite(siteName); await siteActions.createSite(siteName);
const docLibId = await siteActions.getDocLibId(siteName); const docLibId = await siteActions.getDocLibId(siteName);
await nodesApi.createFile(fileSite, docLibId); await nodesApi.createFile(fileSite, docLibId);
}); });
test.beforeEach(async ({ page }) => { test.beforeEach(async ({ loginPage }) => {
const loginPage = new LoginPage(page); await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed');
await loginPage.loginUser(
{ username, password: username },
{
withNavigation: true,
waitForLoading: true
}
);
}); });
test.afterAll(async () => { 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 }) => { test('[C284899] Hyperlink does not appear for items in the Trash', async ({ trashPage }) => {