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

add back try-catch around api calls (#1815)

Browse Source 
* add back try-catch around api calls to avoid UnhandledPromiseRejectionWarning

* minor fixes for pagination to account for parallel runs

* missed one

* a few more fixes

* search only files to get correct and consistent number of results

* try something

* add try catch in upload output

* fix cleanup on Create file / folder from template to account for parallel running

* fix incorrect test case id
fix for undefined properties
unexclude some tests to see if still failing

* revert change in order to fix test

* unused import

* exclude test due to missing EXIF aspect

* trigger one more run
This commit is contained in:
Adina Parpalita 2020-11-25 07:45:50 +02:00 committed by GitHub
parent fe2fe0c669
commit 885a1b1b33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 362 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
e2e/e2e-config/utils/upload-output.js
View File

@ -19,7 +19,11 @@ async function uploadScreenshot(retryCount) {
hostEcm: process.env.SCREENSHOT_URL
});
await alfrescoJsApi.login(process.env.SCREENSHOT_USERNAME, process.env.SCREENSHOT_PASSWORD);
try {
await alfrescoJsApi.login(process.env.SCREENSHOT_USERNAME, process.env.SCREENSHOT_PASSWORD);
} catch (error) {
console.log(` ---- Upload output - login failed : ${error}`);
}
let folderNode;
@ -34,23 +38,30 @@ async function uploadScreenshot(retryCount) {
'overwrite': true
});
} catch (error) {
folderNode = await alfrescoJsApi.nodes.getNode('-my-', {
'relativePath': `${screenshotSavePath}/retry-${retryCount}`,
'nodeType': 'cm:folder'
}, {}, {
'overwrite': true
});
console.log(`--- Upload output - add node failed. Maybe already exists. ${error}`);
try {
console.log('--- trying to get the Builds folder ');
folderNode = await alfrescoJsApi.nodes.getNode('-my-', {
'relativePath': `${screenshotSavePath}/retry-${retryCount}`,
'nodeType': 'cm:folder'
}, {}, {
'overwrite': true
});
} catch (error) {
console.log(`--- Upload out - get node failed. ${error}`);
}
}
const screenShotsPath = path.resolve(__dirname, '../../../e2e-output/screenshots/');
let files = fs.readdirSync(screenShotsPath);
for (const fileName of files) {
let pathFile = path.join(screenShotsPath, fileName);
let file = fs.createReadStream(pathFile);
let safeFileName = fileName.replace(new RegExp('"', 'g'), '');
try {
for (const fileName of files) {
let pathFile = path.join(screenShotsPath, fileName);
let file = fs.createReadStream(pathFile);
let safeFileName = fileName.replace(new RegExp('"', 'g'), '');
try {
await alfrescoJsApi.upload.uploadFile(
file,
'',
@ -62,9 +73,9 @@ async function uploadScreenshot(retryCount) {
autoRename: true,
}
);
} catch (error) {
console.log(error);
}
} catch (error) {
console.log(`Upload failed: ${error}`);
}
fs.renameSync(path.resolve(__dirname, '../../../e2e-output/'), path.resolve(__dirname, `../../e2e-output-${retryCount}/`))
@ -76,17 +87,23 @@ async function uploadScreenshot(retryCount) {
let pathFile = path.join(__dirname, `../../e2e-result-${process.env.TRAVIS_JOB_NUMBER}-${retryCount}.tar`);
let file = fs.createReadStream(pathFile);
await alfrescoJsApi.upload.uploadFile(
file,
'',
folderNode.entry.id,
null,
{
'name': `e2e-result-${process.env.TRAVIS_JOB_NUMBER}-${retryCount}.tar`,
'nodeType': 'cm:content',
'autoRename': true
}
);
try {
await alfrescoJsApi.upload.uploadFile(
file,
'',
folderNode.entry.id,
null,
{
'name': `e2e-result-${process.env.TRAVIS_JOB_NUMBER}-${retryCount}.tar`,
'nodeType': 'cm:content',
'autoRename': true
}
);
} catch (error) {
console.log(`--- Upload output failed. ${error}`);
}
fs.rmdirSync(path.resolve(__dirname, `../../e2e-output-${retryCount}/`), { recursive: true });
}

24
e2e/protractor.excludes.json
View File

@ -15,26 +15,6 @@
"C586780" : "Include once ACA starts using ACS 7+, https://alfresco.atlassian.net/browse/ACA-3601",
"C586781" : "Include once ACA starts using ACS 7+, https://alfresco.atlassian.net/browse/ACA-3601",
"C280132" : "https://alfresco.atlassian.net/browse/ACA-4167",
"C280094" : "https://alfresco.atlassian.net/browse/ACA-4167",
"MNT-21058" : "https://alfresco.atlassian.net/browse/ACA-4145",
"C217171" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C280202" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C217172" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C217174" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C280214" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C280226" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C280227" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C280229" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C306938" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C306939" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C306941" : "https://alfresco.atlassian.net/browse/ACA-4166",
"C280536" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C217132" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C280503" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C280504" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C280324" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C280514" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C286663" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C297570" : "https://alfresco.atlassian.net/browse/ACA-4165",
"C306999" : "https://alfresco.atlassian.net/browse/ACA-4165"
"C280093" : "https://alfresco.atlassian.net/browse/ACA-4167",
"C269007" : "EXIF aspect missing on latest ACS"
}

5
e2e/suites/actions-available/libraries/library.test.ts
View File

@ -72,6 +72,7 @@ describe('Library actions : ', () => {
});
afterAll(async () => {
await userActions.login(username, username);
await userActions.deleteSites([
testData.publicUserMemberFav.name,
testData.privateUserMemberFav.name,
@ -80,6 +81,9 @@ describe('Library actions : ', () => {
testData.privateUserMemberNotFav.name,
testData.moderatedUserMemberNotFav.name
]);
await userActions.emptyTrashcan();
await adminApiActions.login();
await adminApiActions.deleteSites([
testData.publicNotMemberFav.name,
testData.moderatedNotMemberFav.name,
@ -88,7 +92,6 @@ describe('Library actions : ', () => {
testData.moderatedRequestedJoinFav.name,
testData.moderatedRequestedJoinNotFav.name
]);
await userActions.emptyTrashcan();
});
describe('on My Libraries', () => {

57
e2e/suites/actions/create-file-from-template.test.ts
View File

@ -87,6 +87,30 @@ describe('Create file from template', () => {
const createFromTemplateDialog = new CreateFromTemplateDialog();
const { sidenav } = page;
const templates: NodeContentTree = {
folders: [
{
name: templatesFolder1,
files: [template1InFolder1, template2InFolder1]
},
{
name: templatesFolder2,
folders: [
{
name: templatesSubFolder
}
],
files: [template1InFolder2]
},
{
name: restrictedTemplateFolder,
files: [templateInRestrictedFolder]
}
],
files: [template1InRootFolder, template2InRootFolder]
};
let link: string;
beforeAll(async () => {
await adminApiActions.createUser({ username });
@ -103,7 +127,14 @@ describe('Create file from template', () => {
afterAll(async () => {
await userApi.nodes.deleteNodeById(parentId);
await userApi.sites.deleteSite(siteName);
await adminApiActions.cleanupNodeTemplatesFolder();
await adminApiActions.cleanupNodeTemplatesItems([
templatesFolder1,
templatesFolder2,
restrictedTemplateFolder,
template1InRootFolder,
template2InRootFolder
]);
});
beforeEach(async () => {
@ -123,30 +154,6 @@ describe('Create file from template', () => {
});
describe('with existing templates', () => {
const templates: NodeContentTree = {
folders: [
{
name: templatesFolder1,
files: [template1InFolder1, template2InFolder1]
},
{
name: templatesFolder2,
folders: [
{
name: templatesSubFolder
}
],
files: [template1InFolder2]
},
{
name: restrictedTemplateFolder,
files: [templateInRestrictedFolder]
}
],
files: [template1InRootFolder, template2InRootFolder]
};
let link: string;
beforeAll(async () => {
await adminApiActions.createNodeTemplatesHierarchy(templates);
await adminApiActions.removeUserAccessOnNodeTemplate(restrictedTemplateFolder);

10
e2e/suites/actions/create-folder-from-template.test.ts
View File

@ -133,7 +133,15 @@ describe('Create folder from template', () => {
afterAll(async () => {
await userApi.nodes.deleteNodeById(parentId);
await userApi.sites.deleteSite(siteName);
await adminApiActions.cleanupSpaceTemplatesFolder();
await adminApiActions.login();
await adminApiActions.cleanupSpaceTemplatesItems([
folderInRootFolder,
templateFolder1,
templateFolder2,
restrictedTemplateFolder,
fileInRootFolder
]);
});
beforeEach(async () => {

1
e2e/suites/actions/library-actions.test.ts
View File

@ -106,6 +106,7 @@ describe('Library actions', () => {
});
afterAll(async () => {
await adminApiActions.login();
await adminApiActions.deleteSites([
sitePublic1Admin,
siteSearchPublic1Admin,

12
e2e/suites/info-drawer/file-folder-properties.test.ts
View File

@ -217,15 +217,15 @@ describe('File / Folder properties', () => {
'Camera Software'
];
const expectedPropValues = [
properties['exif:pixelXDimension'].toString(),
properties['exif:pixelYDimension'].toString(),
properties['exif:pixelXDimension']?.toString(),
properties['exif:pixelYDimension']?.toString(),
moment(properties['exif:dateTimeOriginal']).format(DATE_TIME_FORMAT),
properties['exif:exposureTime'].toString(),
properties['exif:fNumber'].toString(),
properties['exif:exposureTime']?.toString(),
properties['exif:fNumber']?.toString(),
properties['exif:flash'],
properties['exif:focalLength'].toString(),
properties['exif:focalLength']?.toString(),
properties['exif:isoSpeedRatings'],
properties['exif:orientation'].toString(),
properties['exif:orientation']?.toString(),
properties['exif:manufacturer'],
properties['exif:model'],
properties['exif:software']

2
e2e/suites/list-views/empty-list.test.ts
View File

@ -139,7 +139,7 @@ describe('Empty list views', () => {
expect(await pagination.isNextButtonPresent()).toBe(false, 'Next button is present');
});
it('[C280094] Shared Files - pagination controls not displayed', async () => {
it('[C280093] Shared Files - pagination controls not displayed', async () => {
await page.clickSharedFiles();
expect(await pagination.isRangePresent()).toBe(false, 'Range is present');
expect(await pagination.isMaxItemsPresent()).toBe(false, 'Max items is present');

4
e2e/suites/list-views/favorites.test.ts
View File

@ -84,9 +84,11 @@ describe('Favorites', () => {
});
afterAll(async (done) => {
await adminApiActions.deleteSites([siteName]);
await userActions.deleteNodes([folderId, parentId]);
await userActions.emptyTrashcan();
await adminApiActions.login();
await adminApiActions.deleteSites([siteName]);
done();
});

6
e2e/suites/list-views/permissions.test.ts
View File

@ -99,10 +99,10 @@ describe('Special permissions', () => {
it('[C213116] on Shared Files', async () => {
await page.clickSharedFilesAndWait();
expect(await dataTable.getRowsCount()).toBe(initialSharedTotalItems + 1, 'Incorrect number of items');
expect(await dataTable.isItemPresent(fileName)).toBe(true, `${fileName} not displayed`);
await adminApiActions.sites.deleteSiteMember(sitePrivate, username);
await page.refresh();
expect(await dataTable.getRowsCount()).toBe(initialSharedTotalItems, 'Incorrect number of items');
expect(await dataTable.isItemPresent(fileName)).toBe(false, `${fileName} is displayed`);
});
it('[C290122] on Search Results', async () => {
@ -165,7 +165,7 @@ describe('Special permissions', () => {
it(`[C213668] on Shared Files`, async () => {
await page.clickSharedFilesAndWait();
expect(await dataTable.getRowsCount()).toBe(initialSharedTotalItems + 1, 'Incorrect number of items');
expect(await dataTable.isItemPresent(fileName)).toBe(true, `${fileName} not displayed`);
expect(await dataTable.getItemLocation(fileName)).toEqual('Unknown');
});

2
e2e/suites/pagination/multiple-pages-files.test.ts
View File

@ -82,7 +82,7 @@ describe('Pagination on multiple pages : ', () => {
beforeAll(async () => {
await userApi.search.waitForApi(username, { expect: initialSearchTotalItems + 51 });
});
searchResultsTests(username);
searchResultsTests(username, random);
});
describe('on Shared Files', () => {

6
e2e/suites/pagination/recent-files.ts
View File

@ -86,7 +86,7 @@ export function recentFilesTests(username: string) {
await pagination.openCurrentPageMenu();
await pagination.menu.clickNthItem(3);
await dataTable.waitForHeader();
expect(await pagination.getRange()).toContain('51-51 of 51');
expect(await pagination.getRange()).toContain('51-');
expect(await pagination.getCurrentPage()).toContain('Page 3');
expect(await pagination.isPreviousEnabled()).toBe(true, 'Previous button is not enabled');
expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled');
@ -98,7 +98,7 @@ export function recentFilesTests(username: string) {
it('[C280110] navigate to next and previous pages', async () => {
await pagination.clickNext();
await dataTable.waitForHeader();
expect(await pagination.getRange()).toContain('26-50 of 51');
expect(await pagination.getRange()).toContain('26-50 of');
expect(await dataTable.isItemPresent('my-file-21')).toBe(true, 'File not found on page');
await pagination.resetToDefaultPageNumber();
@ -107,7 +107,7 @@ export function recentFilesTests(username: string) {
await dataTable.waitForHeader();
await pagination.clickPrevious();
await dataTable.waitForHeader();
expect(await pagination.getRange()).toContain('1-25 of 51');
expect(await pagination.getRange()).toContain('1-25 of');
expect(await dataTable.isItemPresent('my-file-50')).toBe(true, 'File not found on page');
await pagination.resetToDefaultPageNumber();

13
e2e/suites/pagination/search-results.ts
View File

@ -25,7 +25,7 @@
import { BrowsingPage, LoginPage, Utils } from '@alfresco/aca-testing-shared';
export function searchResultsTests(username: string) {
export function searchResultsTests(username: string, random: string) {
const page = new BrowsingPage();
const loginPage = new LoginPage();
const { dataTable, pagination } = page;
@ -35,7 +35,8 @@ export function searchResultsTests(username: string) {
beforeAll(async () => {
await loginPage.loginWith(username);
await searchInput.clickSearchButton();
await searchInput.searchFor('my-file-');
await searchInput.checkOnlyFiles();
await searchInput.searchFor(random);
await dataTable.waitForBody();
});
@ -44,7 +45,7 @@ export function searchResultsTests(username: string) {
});
it('[C290125] Pagination control default values', async () => {
expect(await pagination.getRange()).toContain('1-25 of 51');
expect(await pagination.getRange()).toContain('1-25 of');
expect(await pagination.getMaxItems()).toContain('25');
expect(await pagination.getCurrentPage()).toContain('Page 1');
expect(await pagination.getTotalPages()).toContain('of 3');
@ -89,7 +90,7 @@ export function searchResultsTests(username: string) {
await pagination.openCurrentPageMenu();
await pagination.menu.clickNthItem(3);
await dataTable.waitForBody();
expect(await pagination.getRange()).toContain('51-51 of 51');
expect(await pagination.getRange()).toContain('51-');
expect(await pagination.getCurrentPage()).toContain('Page 3');
expect(await pagination.isPreviousEnabled()).toBe(true, 'Previous button is not enabled');
expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled');
@ -100,7 +101,7 @@ export function searchResultsTests(username: string) {
it('[C290131] navigate to next and previous pages', async () => {
await pagination.clickNext();
await dataTable.waitForBody();
expect(await pagination.getRange()).toContain('26-50 of 51');
expect(await pagination.getRange()).toContain('26-50 of');
await pagination.resetToDefaultPageNumber();
await pagination.openCurrentPageMenu();
@ -108,7 +109,7 @@ export function searchResultsTests(username: string) {
await dataTable.waitForBody();
await pagination.clickPrevious();
await dataTable.waitForBody();
expect(await pagination.getRange()).toContain('1-25 of 51');
expect(await pagination.getRange()).toContain('1-25 of');
await pagination.resetToDefaultPageNumber();
});

8
e2e/suites/pagination/shared-files.ts
View File

@ -23,21 +23,17 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { BrowsingPage, LoginPage, Utils, RepoClient } from '@alfresco/aca-testing-shared';
import { BrowsingPage, LoginPage, Utils } from '@alfresco/aca-testing-shared';
export function sharedFilesTests(username: string) {
const page = new BrowsingPage();
const loginPage = new LoginPage();
const { dataTable, pagination } = page;
const userApi = new RepoClient(username, username);
let sharedTotalItems: number;
describe('Pagination controls : ', () => {
beforeAll(async () => {
await loginPage.loginWith(username);
await page.clickSharedFilesAndWait();
sharedTotalItems = await userApi.shared.getSharedLinksTotalItems();
});
afterEach(async () => {
@ -90,7 +86,7 @@ export function sharedFilesTests(username: string) {
await pagination.openCurrentPageMenu();
await pagination.menu.clickNthItem(3);
await dataTable.waitForHeader();
expect(await pagination.getRange()).toContain(`51-${sharedTotalItems}`);
expect(await pagination.getRange()).toContain(`51-`);
expect(await pagination.getCurrentPage()).toContain('Page 3');
expect(await pagination.isPreviousEnabled()).toBe(true, 'Previous button is not enabled');
expect(await pagination.isNextEnabled()).toBe(false, 'Next button is enabled');

25
e2e/suites/viewer/viewer-actions.test.ts
View File

@ -37,7 +37,6 @@ import {
ManageVersionsDialog,
UploadNewVersionDialog
} from '@alfresco/aca-testing-shared';
import { BrowserVisibility } from '@alfresco/adf-testing';
describe('Viewer actions', () => {
const username = `user-${Utils.random()}`;
@ -245,16 +244,8 @@ describe('Viewer actions', () => {
await viewer.waitForViewerToOpen();
await toolbar.openMoreMenu();
await BrowserVisibility.waitUntilElementIsVisible(
toolbar.menu.cancelEditingAction,
BrowserVisibility.DEFAULT_TIMEOUT,
`'Cancel Editing' button should be shown`
);
await BrowserVisibility.waitUntilElementIsVisible(
toolbar.menu.editOfflineAction,
BrowserVisibility.DEFAULT_TIMEOUT,
`'Edit Offline' shouldn't be shown`
);
expect(await toolbar.menu.cancelEditingAction.isPresent()).toBe(true, `'Cancel Editing' button should be shown`);
expect(await toolbar.menu.editOfflineAction.isPresent()).toBe(false, `'Edit Offline' shouldn't be shown`);
await toolbar.menu.clickMenuItem('Upload New Version');
await Utils.uploadFileNewVersion(docxFile);
@ -263,16 +254,8 @@ describe('Viewer actions', () => {
await uploadNewVersionDialog.uploadButton.click();
await toolbar.openMoreMenu();
await BrowserVisibility.waitUntilElementIsVisible(
toolbar.menu.cancelEditingAction,
BrowserVisibility.DEFAULT_TIMEOUT,
`'Cancel Editing' button shouldn't be shown`
);
await BrowserVisibility.waitUntilElementIsVisible(
toolbar.menu.editOfflineAction,
BrowserVisibility.DEFAULT_TIMEOUT,
`'Edit Offline' should be shown`
);
expect(await toolbar.menu.cancelEditingAction.isPresent()).toBe(false, `'Cancel Editing' button shouldn't be shown`);
expect(await toolbar.menu.editOfflineAction.isPresent()).toBe(true, `'Edit Offline' should be shown`);
});
it('[C279282] Full screen action', async () => {

2
projects/aca-testing-shared/src/components/dialog/share-dialog.ts
View File

@ -70,7 +70,7 @@ export class ShareDialog extends GenericDialog {
}
async clickClose(): Promise<void> {
await BrowserActions.click(this.closeButton);
await this.closeButton.click();
await this.waitForDialogToClose();
}

174
projects/aca-testing-shared/src/utilities/admin-actions.ts
View File

@ -45,15 +45,30 @@ export class AdminActions extends UserActions {
}
async getDataDictionaryId(): Promise<string> {
return this.nodes.getNodeIdFromParent('Data Dictionary', '-root-');
try {
return this.nodes.getNodeIdFromParent('Data Dictionary', '-root-');
} catch (error) {
super.handleError('Admin Actions - getDataDictionaryId failed : ', error);
return '';
}
}
async getNodeTemplatesFolderId(): Promise<string> {
return this.nodes.getNodeIdFromParent('Node Templates', await this.getDataDictionaryId());
try {
return this.nodes.getNodeIdFromParent('Node Templates', await this.getDataDictionaryId());
} catch (error) {
super.handleError('Admin Actions - getNodeTemplatesFolderId failed : ', error);
return '';
}
}
async getSpaceTemplatesFolderId(): Promise<string> {
return this.nodes.getNodeIdFromParent('Space Templates', await this.getDataDictionaryId());
try {
return this.nodes.getNodeIdFromParent('Space Templates', await this.getDataDictionaryId());
} catch (error) {
super.handleError('Admin Actions - getSpaceTemplatesFolderId failed : ', error);
return '';
}
}
async createUser(user: PersonModel): Promise<PersonEntry> {
@ -61,74 +76,154 @@ export class AdminActions extends UserActions {
const peopleApi = new PeopleApi(this.alfrescoApi);
await this.login();
return peopleApi.createPerson(person);
try {
return peopleApi.createPerson(person);
} catch (error) {
super.handleError('Admin Actions - createUser failed : ', error);
return null;
}
}
async disableUser(username: string): Promise<PersonEntry> {
const peopleApi = new PeopleApi(this.alfrescoApi);
await this.login();
return peopleApi.updatePerson(username, { enabled: false });
try {
return peopleApi.updatePerson(username, { enabled: false });
} catch (error) {
super.handleError('Admin Actions - createUser failed : ', error);
return null;
}
}
async changePassword(username: string, newPassword: string): Promise<PersonEntry> {
const peopleApi = new PeopleApi(this.alfrescoApi);
await this.login();
return peopleApi.updatePerson(username, { password: newPassword });
try {
return peopleApi.updatePerson(username, { password: newPassword });
} catch (error) {
super.handleError('Admin Actions - changePassword failed : ', error);
return null;
}
}
async createNodeTemplate(name: string, title: string = '', description: string = '', author: string = ''): Promise<NodeEntry> {
const templatesRootFolderId: string = await this.getNodeTemplatesFolderId();
try {
const templatesRootFolderId: string = await this.getNodeTemplatesFolderId();
return this.nodes.createFile(name, templatesRootFolderId, title, description, author);
return this.nodes.createFile(name, templatesRootFolderId, title, description, author);
} catch (error) {
super.handleError('Admin Actions - createNodeTemplate failed : ', error);
return null;
}
}
async createNodeTemplatesHierarchy(hierarchy: NodeContentTree): Promise<any> {
return this.nodes.createContent(hierarchy, `Data Dictionary/Node Templates`);
try {
return this.nodes.createContent(hierarchy, `Data Dictionary/Node Templates`);
} catch (error) {
super.handleError('Admin Actions - createNodeTemplatesHierarchy failed : ', error);
}
}
async createSpaceTemplate(name: string, title: string = '', description: string = ''): Promise<NodeEntry> {
const templatesRootFolderId: string = await this.getSpaceTemplatesFolderId();
try {
const templatesRootFolderId: string = await this.getSpaceTemplatesFolderId();
return this.nodes.createFolder(name, templatesRootFolderId, title, description);
return this.nodes.createFolder(name, templatesRootFolderId, title, description);
} catch (error) {
super.handleError('Admin Actions - createSpaceTemplate failed : ', error);
return null;
}
}
async createSpaceTemplatesHierarchy(hierarchy: NodeContentTree): Promise<any> {
return this.nodes.createContent(hierarchy, `Data Dictionary/Space Templates`);
try {
return this.nodes.createContent(hierarchy, `Data Dictionary/Space Templates`);
} catch (error) {
super.handleError('Admin Actions - createSpaceTemplatesHierarchy failed : ', error);
}
}
async removeUserAccessOnNodeTemplate(nodeName: string): Promise<NodeEntry> {
const templatesRootFolderId = await this.getNodeTemplatesFolderId();
const nodeId: string = await this.nodes.getNodeIdFromParent(nodeName, templatesRootFolderId);
try {
const templatesRootFolderId = await this.getNodeTemplatesFolderId();
const nodeId: string = await this.nodes.getNodeIdFromParent(nodeName, templatesRootFolderId);
return this.nodes.setInheritPermissions(nodeId, false);
return this.nodes.setInheritPermissions(nodeId, false);
} catch (error) {
super.handleError('Admin Actions - removeUserAccessOnNodeTemplate failed : ', error);
return null;
}
}
async removeUserAccessOnSpaceTemplate(nodeName: string): Promise<NodeEntry> {
const templatesRootFolderId = await this.getSpaceTemplatesFolderId();
const nodeId: string = await this.nodes.getNodeIdFromParent(nodeName, templatesRootFolderId);
try {
const templatesRootFolderId = await this.getSpaceTemplatesFolderId();
const nodeId: string = await this.nodes.getNodeIdFromParent(nodeName, templatesRootFolderId);
return this.nodes.setInheritPermissions(nodeId, false);
return this.nodes.setInheritPermissions(nodeId, false);
} catch (error) {
super.handleError('Admin Actions - removeUserAccessOnSpaceTemplate failed : ', error);
return null;
}
}
async cleanupNodeTemplatesFolder(): Promise<void> {
return this.nodes.deleteNodeChildren(await this.getNodeTemplatesFolderId());
try {
return this.nodes.deleteNodeChildren(await this.getNodeTemplatesFolderId());
} catch (error) {
super.handleError('Admin Actions - cleanupNodeTemplatesFolder failed : ', error);
}
}
async cleanupNodeTemplatesItems(nodeNames: string[]): Promise<void> {
try {
const templatesFolderId = await this.getNodeTemplatesFolderId();
for (const nodeName of nodeNames) {
const nodeId = await this.nodes.getNodeIdFromParent(nodeName, templatesFolderId);
await this.nodes.deleteNodeById(nodeId);
}
} catch (error) {
super.handleError('Admin Actions - cleanupNodeTemplatesItems failed : ', error);
}
}
async cleanupSpaceTemplatesFolder(): Promise<void> {
const spaceTemplatesNodeId = await this.getSpaceTemplatesFolderId();
try {
const spaceTemplatesNodeId = await this.getSpaceTemplatesFolderId();
// folder links are deleted automatically when original folder is deleted
// Software Engineering Project is the default folder template coming from ACS, should not be deleted
const nodesToDelete = (await this.nodes.getNodeChildren(spaceTemplatesNodeId)).list.entries
.filter((node) => node.entry.nodeType !== 'app:folderlink' && node.entry.name !== 'Software Engineering Project')
.map((node) => node.entry.id);
return this.nodes.deleteNodesById(nodesToDelete);
// folder links are deleted automatically when original folder is deleted
// Software Engineering Project is the default folder template coming from ACS, should not be deleted
const nodesToDelete = (await this.nodes.getNodeChildren(spaceTemplatesNodeId)).list.entries
.filter((node) => node.entry.nodeType !== 'app:folderlink' && node.entry.name !== 'Software Engineering Project')
.map((node) => node.entry.id);
return this.nodes.deleteNodesById(nodesToDelete);
} catch (error) {
super.handleError('Admin Actions - cleanupSpaceTemplatesFolder failed : ', error);
}
}
async cleanupSpaceTemplatesItems(nodeNames: string[]): Promise<void> {
try {
const spaceTemplatesNodeId = await this.getSpaceTemplatesFolderId();
for (const nodeName of nodeNames) {
const nodeId = await this.nodes.getNodeIdFromParent(nodeName, spaceTemplatesNodeId);
await this.nodes.deleteNodeById(nodeId);
}
} catch (error) {
super.handleError('Admin Actions - cleanupSpaceTemplatesFolder failed : ', error);
}
}
async createLinkToFileId(originalFileId: string, destinationParentId: string): Promise<NodeEntry> {
return this.nodes.createFileLink(originalFileId, destinationParentId);
try {
return this.nodes.createFileLink(originalFileId, destinationParentId);
} catch (error) {
super.handleError('Admin Actions - createLinkToFileId failed : ', error);
return null;
}
}
async createLinkToFileName(originalFileName: string, originalFileParentId: string, destinationParentId?: string): Promise<NodeEntry> {
@ -136,13 +231,23 @@ export class AdminActions extends UserActions {
destinationParentId = originalFileParentId;
}
const nodeId = await this.nodes.getNodeIdFromParent(originalFileName, originalFileParentId);
try {
const nodeId = await this.nodes.getNodeIdFromParent(originalFileName, originalFileParentId);
return this.createLinkToFileId(nodeId, destinationParentId);
return this.createLinkToFileId(nodeId, destinationParentId);
} catch (error) {
super.handleError('Admin Actions - createLinkToFileName failed : ', error);
return null;
}
}
async createLinkToFolderId(originalFolderId: string, destinationParentId: string): Promise<NodeEntry> {
return this.nodes.createFolderLink(originalFolderId, destinationParentId);
try {
return this.nodes.createFolderLink(originalFolderId, destinationParentId);
} catch (error) {
super.handleError('Admin Actions - createLinkToFolderId failed : ', error);
return null;
}
}
async createLinkToFolderName(originalFolderName: string, originalFolderParentId: string, destinationParentId?: string): Promise<NodeEntry> {
@ -150,8 +255,13 @@ export class AdminActions extends UserActions {
destinationParentId = originalFolderParentId;
}
const nodeId = await this.nodes.getNodeIdFromParent(originalFolderName, originalFolderParentId);
try {
const nodeId = await this.nodes.getNodeIdFromParent(originalFolderName, originalFolderParentId);
return this.createLinkToFolderId(nodeId, destinationParentId);
return this.createLinkToFolderId(nodeId, destinationParentId);
} catch (error) {
super.handleError('Admin Actions - createLinkToFolderName failed : ', error);
return null;
}
}
}

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

@ -23,6 +23,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { Logger } from '@alfresco/adf-testing';
import { AlfrescoApi, Comment, CommentsApi, NodesApi, TrashcanApi, SitesApi, SharedlinksApi } from '@alfresco/js-api';
import { browser } from 'protractor';
import { Utils } from './utils';
@ -54,17 +55,30 @@ export class UserActions {
this.username = username || this.username;
this.password = password || this.password;
return this.alfrescoApi.login(this.username, this.password);
try {
return this.alfrescoApi.login(this.username, this.password);
} catch (error) {
this.handleError('User Actions - login failed : ', error);
}
}
async logout(): Promise<any> {
await this.alfrescoApi.login(this.username, this.password);
return this.alfrescoApi.logout();
try {
await this.alfrescoApi.login(this.username, this.password);
return this.alfrescoApi.logout();
} catch (error) {
this.handleError('User Actions - logout failed : ', error);
}
}
async createComment(nodeId: string, content: string): Promise<Comment> {
const comment = await this.commentsApi.createComment(nodeId, { content });
return comment?.entry;
async createComment(nodeId: string, content: string): Promise<Comment | null> {
try {
const comment = await this.commentsApi.createComment(nodeId, { content });
return comment?.entry;
} catch (error) {
this.handleError('User Actions - createComment failed : ', error);
return null;
}
}
/**
@ -73,8 +87,12 @@ export class UserActions {
* @param permanent Delete permanently, without moving to the trashcan? (default: true)
*/
async deleteNodes(nodeIds: string[], permanent: boolean = true): Promise<any> {
for (const nodeId of nodeIds) {
await this.nodesApi.deleteNode(nodeId, { permanent });
try {
for (const nodeId of nodeIds) {
await this.nodesApi.deleteNode(nodeId, { permanent });
}
} catch (error) {
this.handleError('User Actions - deleteNodes failed : ', error);
}
}
@ -82,18 +100,22 @@ export class UserActions {
* Empties the trashcan. Uses multiple batches 1000 nodes each.
*/
async emptyTrashcan(): Promise<any> {
const nodes = await this.trashcanApi.listDeletedNodes({
maxItems: 1000
});
try {
const nodes = await this.trashcanApi.listDeletedNodes({
maxItems: 1000
});
if (nodes?.list?.entries && nodes?.list?.entries?.length > 0) {
const ids = nodes.list.entries.map((entries) => entries.entry.id);
if (nodes?.list?.entries && nodes?.list?.entries?.length > 0) {
const ids = nodes.list.entries.map((entries) => entries.entry.id);
for (const nodeId of ids) {
await this.trashcanApi.deleteDeletedNode(nodeId);
for (const nodeId of ids) {
await this.trashcanApi.deleteDeletedNode(nodeId);
}
await this.emptyTrashcan();
}
await this.emptyTrashcan();
} catch (error) {
this.handleError('User Actions - emptyTrashcan failed : ', error);
}
}
@ -102,11 +124,16 @@ export class UserActions {
* TODO: limited to 1000 items only, needs improvements.
*/
async getTrashcanSize(): Promise<number> {
const response = await this.trashcanApi.listDeletedNodes({
maxItems: 1000
});
try {
const response = await this.trashcanApi.listDeletedNodes({
maxItems: 1000
});
return response?.list?.pagination?.totalItems || 0;
return response?.list?.pagination?.totalItems || 0;
} catch (error) {
this.handleError('User Actions - getTrashcanSize failed : ', error);
return -1;
}
}
/**
@ -115,15 +142,20 @@ export class UserActions {
* @param expectedSize Size of the trashcan to wait for.
*/
async waitForTrashcanSize(expectedSize: number): Promise<number> {
return Utils.retryCall(async () => {
const totalItems = await this.getTrashcanSize();
try {
return Utils.retryCall(async () => {
const totalItems = await this.getTrashcanSize();
if (totalItems !== expectedSize) {
return Promise.reject(totalItems);
} else {
return Promise.resolve(totalItems);
}
});
if (totalItems !== expectedSize) {
return Promise.reject(totalItems);
} else {
return Promise.resolve(totalItems);
}
});
} catch (error) {
this.handleError('User Actions - waitForTrashcanSize failed : ', error);
return -1;
}
}
/**
@ -131,8 +163,12 @@ export class UserActions {
* @param nodeIds The list of node IDs to unlock.
*/
async unlockNodes(nodeIds: string[]): Promise<any> {
for (const nodeId of nodeIds) {
await this.nodesApi.unlockNode(nodeId);
try {
for (const nodeId of nodeIds) {
await this.nodesApi.unlockNode(nodeId);
}
} catch (error) {
this.handleError('User Actions - unlockNodes failed : ', error);
}
}
@ -142,10 +178,14 @@ export class UserActions {
* @param permanent Delete permanently, without moving to the trashcan? (default: true)
*/
async deleteSites(siteIds: string[], permanent: boolean = true) {
if (siteIds && siteIds.length > 0) {
for (const siteId of siteIds) {
await this.sitesApi.deleteSite(siteId, { permanent });
try {
if (siteIds && siteIds.length > 0) {
for (const siteId of siteIds) {
await this.sitesApi.deleteSite(siteId, { permanent });
}
}
} catch (error) {
this.handleError('User Actions - deleteSites failed : ', error);
}
}
@ -155,11 +195,31 @@ export class UserActions {
* @param expiresAt (optional) Expiration date.
*/
async shareNodes(nodeIds: string[], expiresAt?: Date): Promise<any> {
for (const nodeId of nodeIds) {
await this.sharedLinksApi.createSharedLink({
nodeId,
expiresAt
});
try {
for (const nodeId of nodeIds) {
await this.sharedLinksApi.createSharedLink({
nodeId,
expiresAt
});
}
} catch (error) {
this.handleError('User Actions - shareNodes failed : ', error);
}
}
protected handleError(message: string, response: any) {
Logger.error(`\n--- ${message} error :`);
Logger.error('\t>>> username: ', this.username);
Logger.error('\t>>> JSON: ', JSON.stringify(browser.params.config));
if (response.status && response.response) {
try {
Logger.error('\t>>> Status: ', response.status);
Logger.error('\t>>> Text: ', response.response.text);
Logger.error('\t>>> Method: ', response.response.error.method);
Logger.error('\t>>> Path: ', response.response.error.path);
} catch {
Logger.error('\t>>> ', response);
}
} else Logger.error('\t>>> ', response);
}
}