inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +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
18 changed files with 362 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 () => {