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

[ADF-5123] C315268 not working correctly (#5643)

Browse Source 
* [ADF-5123] C315268 not working correctly

* * improved code

* * fixed process list error

* * fixed process list error

Co-authored-by: Eugenio Romano <eromano@users.noreply.github.com>
This commit is contained in:
dhrn 2020-05-01 15:08:45 +05:30 committed by GitHub
parent 608abde10e
commit 7cc1ba6042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/process-services/attach-file-content-service.e2e.ts
View File

@ -112,9 +112,8 @@ describe('Attach File - Content service', () => {
await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, pdfFileOne.name); await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, pdfFileOne.name);
await widget.attachFileWidget().clickUploadButton(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id); await widget.attachFileWidget().clickUploadButton(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id);
await widget.attachFileWidget().selectUploadSource(csIntegrations[0]); await widget.attachFileWidget().selectUploadSource(csIntegrations[0]);
await contentNodeSelector.checkDialogIsDisplayed();
await contentNodeSelector.searchAndSelectResult(pdfFileTwo.name, pdfFileTwo.name); await contentNodeSelector.searchAndSelectResult(pdfFileTwo.name, pdfFileTwo.name);
await contentNodeSelector.clickMoveCopyButton(); await contentNodeSelector.clickMoveCopyButton();
await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, pdfFileTwo.name); await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, pdfFileTwo.name);
@ -146,7 +145,6 @@ describe('Attach File - Content service', () => {
await expect(await externalNodeSelector.getTitle()).toEqual(`Sign into '${browser.params.testConfig.adf_external_acs.host}'`); await expect(await externalNodeSelector.getTitle()).toEqual(`Sign into '${browser.params.testConfig.adf_external_acs.host}'`);
await externalNodeSelector.login(user.email, user.password); await externalNodeSelector.login(user.email, user.password);
await externalNodeSelector.checkDialogIsDisplayed();
await externalNodeSelector.searchAndSelectResult(externalFile, externalFile); await externalNodeSelector.searchAndSelectResult(externalFile, externalFile);
await externalNodeSelector.clickMoveCopyButton(); await externalNodeSelector.clickMoveCopyButton();
await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, externalFile); await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, externalFile);
@ -161,7 +159,6 @@ describe('Attach File - Content service', () => {
await widget.attachFileWidget().clickUploadButton(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id); await widget.attachFileWidget().clickUploadButton(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id);
await widget.attachFileWidget().selectUploadSource(csIntegrations[0]); await widget.attachFileWidget().selectUploadSource(csIntegrations[0]);
await contentNodeSelector.checkDialogIsDisplayed();
await contentNodeSelector.searchAndSelectResult(pdfFileTwo.name, pdfFileTwo.name); await contentNodeSelector.searchAndSelectResult(pdfFileTwo.name, pdfFileTwo.name);
await contentNodeSelector.clickMoveCopyButton(); await contentNodeSelector.clickMoveCopyButton();
@ -178,7 +175,6 @@ describe('Attach File - Content service', () => {
await expect(await externalNodeSelector.getTitle()).toEqual(`Sign into '${browser.params.testConfig.adf_external_acs.host}'`); await expect(await externalNodeSelector.getTitle()).toEqual(`Sign into '${browser.params.testConfig.adf_external_acs.host}'`);
await externalNodeSelector.login(user.email, user.password); await externalNodeSelector.login(user.email, user.password);
await externalNodeSelector.checkDialogIsDisplayed();
await externalNodeSelector.searchAndSelectResult(externalFile, externalFile); await externalNodeSelector.searchAndSelectResult(externalFile, externalFile);
await externalNodeSelector.clickMoveCopyButton(); await externalNodeSelector.clickMoveCopyButton();
await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, externalFile); await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, externalFile);

2
e2e/process-services/attach-folder.e2e.ts
View File

@ -77,8 +77,6 @@ describe('Attach Folder', () => {
const contentFileWidget = widget.attachFolderWidget(); const contentFileWidget = widget.attachFolderWidget();
await contentFileWidget.clickWidget(app.UPLOAD_FOLDER_FORM_CS.FIELD.widget_id); await contentFileWidget.clickWidget(app.UPLOAD_FOLDER_FORM_CS.FIELD.widget_id);
await contentNodeSelector.checkDialogIsDisplayed();
await contentNodeSelector.searchAndSelectResult(user.email, user.email); await contentNodeSelector.searchAndSelectResult(user.email, user.email);
await expect(await contentNodeSelector.checkCancelButtonIsEnabled()).toBe(true); await expect(await contentNodeSelector.checkCancelButtonIsEnabled()).toBe(true);
await expect(await contentNodeSelector.checkCopyMoveButtonIsEnabled()).toBe(true); await expect(await contentNodeSelector.checkCopyMoveButtonIsEnabled()).toBe(true);

6
e2e/process-services/process-list-component.e2e.ts
View File

@ -119,6 +119,7 @@ describe('Process List Test', () => {
await processListDemoPage.checkNoProcessFoundIsDisplayed(); await processListDemoPage.checkNoProcessFoundIsDisplayed();
await processListDemoPage.addAppId(appWithDateFieldId); await processListDemoPage.addAppId(appWithDateFieldId);
await processListDemoPage.dataTable.waitTillContentLoaded();
await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate); await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate);
await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate); await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate);
@ -129,6 +130,7 @@ describe('Process List Test', () => {
it('[C282015] Should be able to filter by Process Definition ID', async () => { it('[C282015] Should be able to filter by Process Definition ID', async () => {
await processListDemoPage.addProcessDefinitionId(procWithDate.processDefinitionId); await processListDemoPage.addProcessDefinitionId(procWithDate.processDefinitionId);
await processListDemoPage.dataTable.waitTillContentLoaded();
await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate); await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate);
await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate); await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate);
@ -139,6 +141,7 @@ describe('Process List Test', () => {
it('[C282016] Should be able to filter by Process Instance ID', async () => { it('[C282016] Should be able to filter by Process Instance ID', async () => {
await processListDemoPage.addProcessInstanceId(procWithDate.id); await processListDemoPage.addProcessInstanceId(procWithDate.id);
await processListDemoPage.dataTable.waitTillContentLoaded();
await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate); await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate);
@ -149,6 +152,7 @@ describe('Process List Test', () => {
it('[C282017] Should be able to filter by Status', async () => { it('[C282017] Should be able to filter by Status', async () => {
await processListDemoPage.selectStateFilter('Active'); await processListDemoPage.selectStateFilter('Active');
await processListDemoPage.dataTable.waitTillContentLoaded();
await processListDemoPage.checkProcessIsNotDisplayed(processName.completedProcWithDate); await processListDemoPage.checkProcessIsNotDisplayed(processName.completedProcWithDate);
await processListDemoPage.checkProcessIsNotDisplayed(processName.completedProcWithUserWidget); await processListDemoPage.checkProcessIsNotDisplayed(processName.completedProcWithUserWidget);
@ -165,6 +169,7 @@ describe('Process List Test', () => {
await processListDemoPage.checkProcessIsNotDisplayed(processName.procWithUserWidget); await processListDemoPage.checkProcessIsNotDisplayed(processName.procWithUserWidget);
await processListDemoPage.selectStateFilter('All'); await processListDemoPage.selectStateFilter('All');
await processListDemoPage.dataTable.waitTillContentLoaded();
await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate); await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate);
await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithUserWidget); await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithUserWidget);
@ -174,6 +179,7 @@ describe('Process List Test', () => {
it('[C282010] Should be able to sort by creation date', async () => { it('[C282010] Should be able to sort by creation date', async () => {
await processListDemoPage.selectSorting('asc'); await processListDemoPage.selectSorting('asc');
await processListDemoPage.dataTable.waitTillContentLoaded();
const sortedProcessListNamesAsc = await processListDemoPage.getDisplayedProcessesNames(); const sortedProcessListNamesAsc = await processListDemoPage.getDisplayedProcessesNames();

1
e2e/protractor.excludes.json
View File

@ -1,5 +1,4 @@
{ {
"C260249" : "REPO-4772 ACS 6.2", "C260249" : "REPO-4772 ACS 6.2",
"C315268" : "https://issues.alfresco.com/jira/browse/ADF-5123"
} }

5
lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts
View File

@ -131,6 +131,11 @@ export class ContentNodeSelectorDialogPage {
async searchAndSelectResult(searchText: string, name: string) { async searchAndSelectResult(searchText: string, name: string) {
await this.typeIntoNodeSelectorSearchField(searchText); await this.typeIntoNodeSelectorSearchField(searchText);
try {
await this.contentListPage().dataTablePage().checkRowContentIsDisplayed(name);
} catch (e) {
console.error(`failed to get search result :: ${name}`);
}
await this.clickContentNodeSelectorResult(name); await this.clickContentNodeSelectorResult(name);
} }