inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reinsert e2e tag test (#3574)

Browse Source 
* solve rendition preview

* reinsert tag e2e

* fix tslint

* fix pack problem

* remove reload

* remove refresh
This commit is contained in:
Eugenio Romano 2018-07-10 17:15:48 +01:00 committed by Eugenio Romano
parent f0ee0bda2f
commit e7b2daa1fe
7 changed files with 3777 additions and 3714 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo-shell/src/app/components/files/files.component.html
View File

@ -78,6 +78,7 @@
[disabled]="!canCreateContent(documentList.folderNode)"
title="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}"
(error)="openSnackMessage($event)"
(success)="documentList.reload()"
[adf-create-folder]="getDocumentListCurrentFolderId()"
matTooltip="{{ 'DOCUMENT_LIST.TOOLBAR.NEW_FOLDER' | translate }}">
<mat-icon>create_new_folder</mat-icon>

1
e2e/pages/adf/tagPage.js
View File

@ -45,6 +45,7 @@ var TagPage = function () {
this.insertNodeId = function (nodeId) {
Util.waitUntilElementIsVisible(insertNodeId);
insertNodeId.clear();
insertNodeId.sendKeys(nodeId);
browser.driver.sleep(200);
insertNodeId.sendKeys(' ')

20
e2e/tag_component.e2e.ts
View File

@ -75,14 +75,11 @@ describe('Tag component', () => {
expect(tagPage.getNewTagInput()).toEqual('a');
});
xit('New tag for specific Node ID', () => {
it('New tag for specific Node ID', () => {
tagPage.goToTagPage();
tagPage.insertNodeId(pdfFileModel.id);
tagPage.addTag(tagList[0]);
Util.refreshBrowser();
tagPage.insertNodeId(pdfFileModel.id);
tagPage.checkTagIsDisplayedInTagList(tagList[0]);
tagPage.checkTagIsDisplayedInTagListByNodeId(tagList[0]);
});
@ -104,33 +101,28 @@ describe('Tag component', () => {
tagPage.checkTagListContentServicesIsOrderedAscending();
});
xit('Tag text field', () => {
it('Tag text field', () => {
tagPage.goToTagPage();
tagPage.insertNodeId(pdfFileModel.id);
tagPage.addTag(uppercaseTag);
Util.refreshBrowser();
tagPage.insertNodeId(pdfFileModel.id);
tagPage.checkTagIsDisplayedInTagList(uppercaseTag.toLowerCase());
tagPage.checkTagIsDisplayedInTagListByNodeId(uppercaseTag.toLowerCase());
tagPage.checkTagIsDisplayedInTagListContentServices(uppercaseTag.toLowerCase());
tagPage.checkTagIsNotDisplayedInTagList(uppercaseTag);
tagPage.addTag(digitsTag);
Util.refreshBrowser();
tagPage.insertNodeId(pdfFileModel.id);
tagPage.addTag(digitsTag);
tagPage.checkTagIsDisplayedInTagList(digitsTag);
tagPage.checkTagIsDisplayedInTagListByNodeId(digitsTag);
tagPage.checkTagIsDisplayedInTagListContentServices(digitsTag);
tagPage.insertNodeId(pdfFileModel.id)
tagPage.addTag(nonLatinTag);
Util.refreshBrowser();
tagPage.insertNodeId(pdfFileModel.id);
tagPage.checkTagIsDisplayedInTagList(nonLatinTag);
tagPage.checkTagIsDisplayedInTagListByNodeId(nonLatinTag);
tagPage.checkTagIsDisplayedInTagListContentServices(nonLatinTag);
});
});

2
e2e/viewer_content_services_component.e2e.ts
View File

@ -218,7 +218,7 @@ describe('Test Content Services Viewer', () => {
viewerPage.clickCloseButton();
});
xit('5. Open viewer for a .ppt file converted to .pdf', () => {
it('5. Open viewer for a .ppt file converted to .pdf', () => {
viewerPage.viewFile(pptFile.name);
viewerPage.checkFileContent('1', pptFile.firstPageText);
viewerPage.checkCloseButtonIsDisplayed();

9
lib/core/viewer/components/viewer.component.html
View File

@ -168,6 +168,15 @@
<adf-txt-viewer [urlFile]="urlFileContent" [blobFile]="blobFile"></adf-txt-viewer>
</ng-container>
<ng-container *ngSwitchCase="'in_creation'">
<div class="adf-viewer__loading-screen" fxFlex="1 1 auto">
<h2>{{ 'ADF_VIEWER.LOADING' | translate }}</h2>
<div>
<mat-spinner></mat-spinner>
</div>
</div>
</ng-container>
<ng-container *ngSwitchCase="'custom'">
<span class="adf-viewer-custom-content" *ngFor="let extensionTemplate of extensionTemplates">
<ng-template *ngIf="extensionTemplate.isVisible" [ngTemplateOutlet]="extensionTemplate.template" [ngTemplateOutletContext]="{ urlFileContent: urlFileContent, extension:extension }">

41
lib/core/viewer/components/viewer.component.ts
View File

@ -648,7 +648,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
}
}
private async resolveRendition(nodeId: string, renditionId: string): Promise<RenditionEntry> {
private async resolveRendition(nodeId: string, renditionId: string) {
renditionId = renditionId.toLowerCase();
const supported = await this.apiService.renditionsApi.getRenditions(nodeId);
@ -664,7 +664,9 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
if (status === 'NOT_CREATED') {
try {
await this.apiService.renditionsApi.createRendition(nodeId, { id: renditionId });
await this.apiService.renditionsApi.createRendition(nodeId, { id: renditionId }).then(() => {
this.viewerType = 'in_creation';
});
rendition = await this.waitRendition(nodeId, renditionId, 0);
} catch (err) {
this.logService.error(err);
@ -676,23 +678,30 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
}
private async waitRendition(nodeId: string, renditionId: string, retries: number): Promise<RenditionEntry> {
const rendition = await this.apiService.renditionsApi.getRendition(nodeId, renditionId);
if (this.maxRetries < retries) {
const status = rendition.entry.status.toString();
return new Promise((resolve, reject) => {
let intervalId = setInterval(() => {
this.apiService.renditionsApi.getRendition(nodeId, renditionId).then((rendition) => {
const status = rendition.entry.status.toString();
if (status === 'CREATED') {
if (status === 'CREATED') {
return rendition;
} else {
retries += 1;
await this.wait(1000);
return await this.waitRendition(nodeId, renditionId, retries);
}
}
}
if (renditionId === 'pdf') {
this.viewerType = 'pdf';
} else if (renditionId === 'imgpreview') {
this.viewerType = 'image';
}
private wait(ms: number): Promise<any> {
return new Promise(resolve => setTimeout(resolve, ms));
this.urlFileContent = this.apiService.contentApi.getRenditionUrl(nodeId, renditionId);
clearInterval(intervalId);
return resolve(rendition);
}
}, () => {
this.viewerType = 'error_in_creation';
return reject();
});
}, 1000);
});
}
getSideBarStyle(): string {

7417
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff