inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-5994] Remove redundant deleteNodes method from e2e (#3587)

Browse Source 
* [ACS-5994] remove redundant deleteNodes method [ci:force]

* [link-adf:dev-mmaliarchuk/ACS-5994-fix-jsApi-deleteNodes][affected:*][ci:force]

* rebase
This commit is contained in:
Mykyta Maliarchuk 2024-02-20 13:01:52 +01:00 committed by GitHub
parent ff57112d99
commit 3f182a5a68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/protractor/suites/actions/delete/delete-undo-delete.test.ts
View File

@ -117,7 +117,7 @@ describe('Delete and undo delete', () => {
try { try {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.unlockNodes([fileLocked1Id, fileLocked2Id, fileLocked3Id, fileLocked4Id]); await userActions.unlockNodes([fileLocked1Id, fileLocked2Id, fileLocked3Id, fileLocked4Id]);
await userActions.deleteNodes([parentId]); await apis.user.nodes.deleteNodeById(parentId);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
} catch {} } catch {}
}); });

2
e2e/protractor/suites/actions/delete/permanently-delete.test.ts
View File

@ -58,7 +58,7 @@ describe('Permanently delete from Trash', () => {
await apis.user.sites.createSite(site); await apis.user.sites.createSite(site);
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([...filesIds, ...foldersIds], false); await apis.user.nodes.deleteNodesById([...filesIds, ...foldersIds], false);
await userActions.deleteSites([site], false); await userActions.deleteSites([site], false);
await loginPage.loginWith(username); await loginPage.loginWith(username);

20
e2e/protractor/suites/actions/delete/restore.test.ts
View File

@ -61,7 +61,7 @@ describe('Restore from Trash', () => {
await apis.user.sites.createSite(site); await apis.user.sites.createSite(site);
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([fileId, folderId], false); await apis.user.nodes.deleteNodesById([fileId, folderId], false);
await userActions.deleteSites([site], false); await userActions.deleteSites([site], false);
}); });
@ -85,7 +85,7 @@ describe('Restore from Trash', () => {
await page.clickPersonalFilesAndWait(); await page.clickPersonalFilesAndWait();
expect(await page.dataTable.isItemPresent(file)).toBe(true, 'Item not displayed in list'); expect(await page.dataTable.isItemPresent(file)).toBe(true, 'Item not displayed in list');
await userActions.deleteNodes([fileId], false); await apis.user.nodes.deleteNodeById(fileId, false);
}); });
it('[C280438] restore folder', async () => { it('[C280438] restore folder', async () => {
@ -99,7 +99,7 @@ describe('Restore from Trash', () => {
await page.clickPersonalFilesAndWait(); await page.clickPersonalFilesAndWait();
expect(await page.dataTable.isItemPresent(folder)).toBe(true, 'Item not displayed in list'); expect(await page.dataTable.isItemPresent(folder)).toBe(true, 'Item not displayed in list');
await userActions.deleteNodes([folderId], false); await apis.user.nodes.deleteNodeById(folderId, false);
}); });
it('[C290104] restore library', async () => { it('[C290104] restore library', async () => {
@ -127,7 +127,7 @@ describe('Restore from Trash', () => {
expect(await page.dataTable.isItemPresent(file)).toBe(true, 'Item not displayed in list'); expect(await page.dataTable.isItemPresent(file)).toBe(true, 'Item not displayed in list');
expect(await page.dataTable.isItemPresent(folder)).toBe(true, 'Item not displayed in list'); expect(await page.dataTable.isItemPresent(folder)).toBe(true, 'Item not displayed in list');
await userActions.deleteNodes([fileId, folderId], false); await apis.user.nodes.deleteNodesById([fileId, folderId], false);
}); });
it('[C217181] View from notification', async () => { it('[C217181] View from notification', async () => {
@ -138,7 +138,7 @@ describe('Restore from Trash', () => {
expect(await page.sidenav.isActive('Personal Files')).toBe(true, 'Personal Files sidebar link not active'); expect(await page.sidenav.isActive('Personal Files')).toBe(true, 'Personal Files sidebar link not active');
expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES); expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.PERSONAL_FILES);
await userActions.deleteNodes([fileId], false); await apis.user.nodes.deleteNodeById(fileId, false);
}); });
}); });
@ -159,13 +159,13 @@ describe('Restore from Trash', () => {
file1Id1 = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id; file1Id1 = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id;
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([file1Id1], false); await apis.user.nodes.deleteNodeById(file1Id1, false);
file1Id2 = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id; file1Id2 = (await apis.user.nodes.createFile(file1, folder1Id)).entry.id;
folder2Id = (await apis.user.nodes.createFolder(folder2)).entry.id; folder2Id = (await apis.user.nodes.createFolder(folder2)).entry.id;
file2Id = (await apis.user.nodes.createFile(file2, folder2Id)).entry.id; file2Id = (await apis.user.nodes.createFile(file2, folder2Id)).entry.id;
await userActions.deleteNodes([file2Id, folder2Id], false); await apis.user.nodes.deleteNodesById([file2Id, folder2Id], false);
}); });
beforeEach(async () => { beforeEach(async () => {
@ -174,7 +174,7 @@ describe('Restore from Trash', () => {
afterAll(async () => { afterAll(async () => {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([file1Id2]); await apis.user.nodes.deleteNodeById(file1Id2);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
}); });
@ -220,7 +220,7 @@ describe('Restore from Trash', () => {
file2Id = (await apis.user.nodes.createFile(file2, folder2Id)).entry.id; file2Id = (await apis.user.nodes.createFile(file2, folder2Id)).entry.id;
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([file1Id, folder1Id, file2Id], false); await apis.user.nodes.deleteNodesById([file1Id, folder1Id, file2Id], false);
folder3Id = (await apis.user.nodes.createFolder(folder3)).entry.id; folder3Id = (await apis.user.nodes.createFolder(folder3)).entry.id;
file3Id = (await apis.user.nodes.createFile(file3, folder3Id)).entry.id; file3Id = (await apis.user.nodes.createFile(file3, folder3Id)).entry.id;
@ -228,7 +228,7 @@ describe('Restore from Trash', () => {
folder4Id = (await apis.user.nodes.createFolder(folder4)).entry.id; folder4Id = (await apis.user.nodes.createFolder(folder4)).entry.id;
file5Id = (await apis.user.nodes.createFile(file5, folder4Id)).entry.id; file5Id = (await apis.user.nodes.createFile(file5, folder4Id)).entry.id;
await userActions.deleteNodes([file3Id, file4Id, folder3Id, file5Id], false); await apis.user.nodes.deleteNodesById([file3Id, file4Id, folder3Id, file5Id], false);
await loginPage.loginWith(username); await loginPage.loginWith(username);
} catch {} } catch {}
}); });

2
e2e/protractor/suites/actions/edit/edit-offline.test.ts
View File

@ -77,7 +77,7 @@ describe('Edit offline', () => {
afterAll(async () => { afterAll(async () => {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentPFId]); await apis.user.nodes.deleteNodeById(parentPFId);
}); });
it('[C297538] File is locked and downloaded when clicking Edit Offline', async () => { it('[C297538] File is locked and downloaded when clicking Edit Offline', async () => {

2
e2e/protractor/suites/actions/favorite/mark-favorite.test.ts
View File

@ -102,7 +102,7 @@ describe('Mark items as favorites', () => {
}); });
afterAll(async () => { afterAll(async () => {
await userActions.deleteNodes([parentId]); await apis.user.nodes.deleteNodeById(parentId);
}); });
afterEach(async () => { afterEach(async () => {

2
e2e/protractor/suites/actions/upload-download/download.test.ts
View File

@ -112,7 +112,7 @@ describe('Download', () => {
afterAll(async () => { afterAll(async () => {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentId]); await apis.user.nodes.deleteNodeById(parentId);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
}); });

2
e2e/protractor/suites/actions/upload-download/upload-file.test.ts
View File

@ -60,7 +60,7 @@ describe('Upload files', () => {
}); });
afterAll(async () => { afterAll(async () => {
await userActions.deleteNodes([folder1Id]); await apis.user.nodes.deleteNodeById(folder1Id);
}); });
it('Upload a file', async () => { it('Upload a file', async () => {

2
e2e/protractor/suites/actions/upload-download/upload-new-version.test.ts
View File

@ -112,7 +112,7 @@ describe('Upload new version', () => {
afterAll(async () => { afterAll(async () => {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentPFId, parentSFId, parentRFId, parentFavId, parentSearchId]); await apis.user.nodes.deleteNodesById([parentPFId, parentSFId, parentRFId, parentFavId, parentSearchId]);
}); });
describe('on Search Results', () => { describe('on Search Results', () => {

2
e2e/protractor/suites/actions/upload-download/version-actions.test.ts
View File

@ -90,7 +90,7 @@ describe('Version actions', () => {
}); });
afterAll(async () => { afterAll(async () => {
await userActions.deleteNodes([parentFolderId]); await apis.user.nodes.deleteNodeById(parentFolderId);
}); });
describe('on Personal Files', () => { describe('on Personal Files', () => {

8
e2e/protractor/suites/viewer/viewer-actions.test.ts
View File

@ -126,7 +126,7 @@ describe('Viewer actions', () => {
afterAll(async () => { afterAll(async () => {
try { try {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentId, destinationId]); await apis.user.nodes.deleteNodesById([parentId, destinationId]);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
} catch {} } catch {}
}); });
@ -228,7 +228,7 @@ describe('Viewer actions', () => {
afterAll(async () => { afterAll(async () => {
try { try {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentId, destinationId]); await apis.user.nodes.deleteNodesById([parentId, destinationId]);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
} catch {} } catch {}
}); });
@ -329,7 +329,7 @@ describe('Viewer actions', () => {
afterAll(async () => { afterAll(async () => {
try { try {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentId, destinationId]); await apis.user.nodes.deleteNodesById([parentId, destinationId]);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
} catch {} } catch {}
}); });
@ -402,7 +402,7 @@ describe('Viewer actions', () => {
afterAll(async () => { afterAll(async () => {
try { try {
await userActions.login(username, username); await userActions.login(username, username);
await userActions.deleteNodes([parentId, destinationId]); await apis.user.nodes.deleteNodesById([parentId, destinationId]);
await userActions.emptyTrashcan(); await userActions.emptyTrashcan();
} catch {} } catch {}
}); });

4
projects/aca-playwright-shared/src/api/nodes-api.ts
View File

@ -144,9 +144,7 @@ export class NodesApi {
*/ */
async deleteNodes(nodeIds: string[], permanent: boolean = true): Promise<any> { async deleteNodes(nodeIds: string[], permanent: boolean = true): Promise<any> {
try { try {
for (const nodeId of nodeIds) { await this.apiService.nodes.deleteNodes(nodeIds, { permanent });
await this.apiService.nodes.deleteNode(nodeId, { permanent });
}
} catch (error) { } catch (error) {
console.error(`${this.constructor.name} ${this.deleteNodes.name}`, error); console.error(`${this.constructor.name} ${this.deleteNodes.name}`, error);
} }

4
projects/aca-testing-shared/src/utilities/repo-client/apis/nodes/nodes-api.ts
View File

@ -166,9 +166,7 @@ export class NodesApi extends RepoApi {
async deleteNodesById(ids: string[], permanent: boolean = true): Promise<void> { async deleteNodesById(ids: string[], permanent: boolean = true): Promise<void> {
try { try {
await this.apiAuth(); await this.apiAuth();
for (const id of ids) { await this.nodesApi.deleteNodes(ids, { permanent });
await this.nodesApi.deleteNode(id, { permanent });
}
} catch (error) { } catch (error) {
this.handleError(`${this.constructor.name} ${this.deleteNodesById.name}`, error); this.handleError(`${this.constructor.name} ${this.deleteNodesById.name}`, error);
} }

15
projects/aca-testing-shared/src/utilities/user-actions.ts
View File

@ -69,21 +69,6 @@ export class UserActions {
} }
} }
/**
* Delete multiple nodes.
* @param nodeIds The list of node IDs to delete.
* @param permanent Delete permanently, without moving to the trashcan? (default: true)
*/
async deleteNodes(nodeIds: string[], permanent: boolean = true): Promise<any> {
try {
for (const nodeId of nodeIds) {
await this.nodesApi.deleteNode(nodeId, { permanent });
}
} catch (error) {
this.handleError('User Actions - deleteNodes failed : ', error);
}
}
/** /**
* Empties the trashcan. Uses multiple batches 1000 nodes each. * Empties the trashcan. Uses multiple batches 1000 nodes each.
*/ */