[ACS-7304] [E2E] beforeEach and afterAll hooks updated for special permissions tests (#3753)

* [ACS-7304] beforeEach and afterAll hooks updated for special permissions tests

* [ACS-7304] readded hruser and admin to config
This commit is contained in:
Adam Świderski
2024-04-09 14:59:16 +02:00
committed by GitHub
parent 6633346c12
commit 0cac392bdc
4 changed files with 12 additions and 14 deletions

View File

@@ -329,7 +329,7 @@
} }
}, },
{ {
"files": ["*.e2e.ts"], "files": ["*.e2e.ts", "*.ts"],
"extends": ["plugin:playwright/playwright-test"], "extends": ["plugin:playwright/playwright-test"],
"rules": { "rules": {
"no-empty-pattern": "off", "no-empty-pattern": "off",

View File

@@ -29,7 +29,7 @@ test.describe('Folders - available actions : ', () => {
const username = `user-${Utils.random()}`; const username = `user-${Utils.random()}`;
let parentId: string; let parentId: string;
let nodesApi: NodesApi; let nodesApi: NodesApi;
let trashCanActions: TrashcanApi; let trashcanApi: TrashcanApi;
async function checkActionsAvailable( async function checkActionsAvailable(
myPersonalFiles: PersonalFilesPage, myPersonalFiles: PersonalFilesPage,
@@ -61,7 +61,7 @@ test.describe('Folders - available actions : ', () => {
await apiClientFactory.createUser({ username }); await apiClientFactory.createUser({ username });
nodesApi = await NodesApi.initialize(username, username); nodesApi = await NodesApi.initialize(username, username);
const favoritesActions = await FavoritesPageApi.initialize(username, username); const favoritesActions = await FavoritesPageApi.initialize(username, username);
trashCanActions = await TrashcanApi.initialize(username, username); trashcanApi = await TrashcanApi.initialize(username, username);
parentId = (await nodesApi.createFolder(parentName)).entry.id; parentId = (await nodesApi.createFolder(parentName)).entry.id;
await nodesApi.createFile(testData.file.name, parentId); await nodesApi.createFile(testData.file.name, parentId);
await nodesApi.createFolder(testData.folderFile.name, parentId); await nodesApi.createFolder(testData.folderFile.name, parentId);
@@ -72,14 +72,13 @@ test.describe('Folders - available actions : ', () => {
}); });
test.afterAll(async () => { test.afterAll(async () => {
await nodesApi.deleteNodes([parentId]); await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed');
await trashCanActions.emptyTrashcan();
}); });
test.describe('on Personal Files : ', () => { test.describe('on Personal Files : ', () => {
test.beforeEach(async ({ personalFiles, loginPage }) => { test.beforeEach(async ({ personalFiles, loginPage }) => {
await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed');
await personalFiles.navigate({ remoteUrl: `#/personal-files/${parentId}` }); await personalFiles.navigate({ remoteUrl: `#/personal-files/${parentId}` });
await loginPage.loginUser({ username, password: username });
}); });
test('Folder not favorite - [C213123]', async ({ personalFiles }) => { test('Folder not favorite - [C213123]', async ({ personalFiles }) => {

View File

@@ -22,7 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>. * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/ */
import { MyLibrariesPage, test } from '@alfresco/playwright-shared'; import { MyLibrariesPage, test, Utils } from '@alfresco/playwright-shared';
import * as testData from '@alfresco/playwright-shared'; import * as testData from '@alfresco/playwright-shared';
import { expect } from '@playwright/test'; import { expect } from '@playwright/test';
@@ -54,8 +54,7 @@ async function checkActionsViewerAvailable(
export function collaboratorTests(userCollaborator: string, siteName: string) { export function collaboratorTests(userCollaborator: string, siteName: string) {
test.describe('available actions : ', () => { test.describe('available actions : ', () => {
test.beforeEach(async ({ loginPage }) => { test.beforeEach(async ({ loginPage }) => {
await loginPage.navigate(); await Utils.tryLoginUser(loginPage, userCollaborator, userCollaborator, 'beforeEach failed');
await loginPage.loginUser({ username: userCollaborator, password: userCollaborator });
}); });
test('on File Libraries - [C297647]', async ({ myLibrariesPage }) => { test('on File Libraries - [C297647]', async ({ myLibrariesPage }) => {
@@ -242,8 +241,7 @@ export function filesLockedByCurrentUser(userDemoted: string, siteName?: string)
export function filesLockedByOtherUser(userManager: string, siteName?: string) { export function filesLockedByOtherUser(userManager: string, siteName?: string) {
test.describe('available actions : ', () => { test.describe('available actions : ', () => {
test.beforeEach(async ({ loginPage }) => { test.beforeEach(async ({ loginPage }) => {
await loginPage.navigate(); await Utils.tryLoginUser(loginPage, userManager, userManager, 'beforeEach failed');
await loginPage.loginUser({ username: userManager, password: userManager });
}); });
test('on File Libraries - [C297664]', async ({ myLibrariesPage }) => { test('on File Libraries - [C297664]', async ({ myLibrariesPage }) => {

View File

@@ -35,7 +35,8 @@ import {
test, test,
SharedLinksApi, SharedLinksApi,
SearchPageApi, SearchPageApi,
timeouts timeouts,
Utils
} from '@alfresco/playwright-shared'; } from '@alfresco/playwright-shared';
import { Site } from '@alfresco/js-api'; import { Site } from '@alfresco/js-api';
@@ -80,7 +81,7 @@ test.describe('Special permissions : ', () => {
let managerSearchActions: SearchPageApi; let managerSearchActions: SearchPageApi;
test.beforeAll(async () => { test.beforeAll(async () => {
test.setTimeout(timeouts.extendedTest); test.setTimeout(timeouts.extendedLongTest);
await apiClientFactory.setUpAcaBackend('admin'); await apiClientFactory.setUpAcaBackend('admin');
await apiClientFactory.createUser({ username: userManager }); await apiClientFactory.createUser({ username: userManager });
await apiClientFactory.createUser({ username: userConsumer }); await apiClientFactory.createUser({ username: userConsumer });
@@ -180,7 +181,7 @@ test.describe('Special permissions : ', () => {
}); });
test.afterAll(async () => { test.afterAll(async () => {
await managerSiteActions.deleteSites([sitePrivate]); await Utils.deleteNodesSitesEmptyTrashcan(undefined, undefined, 'afterAll failed', managerSiteActions, [sitePrivate]);
}); });
test.describe('Consumer', () => { test.describe('Consumer', () => {