diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index 8de3740a56..b94c3c894b 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -39,7 +39,7 @@ describe('Metadata component', () => { TITLE: 'Details', COMMENTS_TAB: 'COMMENTS', PROPERTY_TAB: 'PROPERTIES', - DEFAULT_ASPECT: 'Properties', + DEFAULT_ASPECT: 'General info', MORE_INFO_BUTTON: 'More information', LESS_INFO_BUTTON: 'Less information', ARROW_DOWN: 'keyboard_arrow_down', @@ -120,26 +120,12 @@ describe('Metadata component', () => { await expect(await metadataViewPage.getSize()).toEqual(pngFileModel.getContent().getSizeInBytes()); await metadataViewPage.editIconIsDisplayed(); - await metadataViewPage.informationButtonIsDisplayed(); - await expect(await metadataViewPage.getInformationButtonText()).toEqual(METADATA.MORE_INFO_BUTTON); - await expect(await metadataViewPage.getInformationIconText()).toEqual(METADATA.ARROW_DOWN); - }); - - it('[C272769] Should be possible to display more details when clicking on More Information button', async () => { - await viewerPage.clickInfoButton(); - await viewerPage.checkInfoSideBarIsDisplayed(); - await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); - await metadataViewPage.clickOnInformationButton(); - await expect(await metadataViewPage.getInformationButtonText()).toEqual(METADATA.LESS_INFO_BUTTON); - await expect(await metadataViewPage.getInformationIconText()).toEqual(METADATA.ARROW_UP); }); it('[C270952] Should be possible to open/close properties using info icon', async () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.informationButtonIsDisplayed(); await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsNotDisplayed(); await viewerPage.clickInfoButton(); @@ -150,7 +136,7 @@ describe('Metadata component', () => { await expect(await metadataViewPage.getEditIconTooltip()).toEqual(METADATA.EDIT_BUTTON_TOOLTIP); }); - it('[C245654] Should be possible edit the basic Metadata Info of a Document', async () => { + fit('[C245654] Should be possible edit the basic Metadata Info of a Document', async () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); @@ -187,7 +173,7 @@ describe('Metadata component', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); + // await metadataViewPage.editIconIsDisplayed(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('exampleText.png'); await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('example title'); @@ -198,7 +184,6 @@ describe('Metadata component', () => { await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name); await metadataViewPage.clickSaveMetadata(); }); - it('[C260181] Should be possible edit all the metadata aspect', async () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); @@ -207,8 +192,6 @@ describe('Metadata component', () => { await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); - await metadataViewPage.clickOnInformationButton(); - await metadataViewPage.clickMetadataGroup('EXIF'); await metadataViewPage.editIconClick(); @@ -247,21 +230,21 @@ describe('Metadata component', () => { await BrowserActions.closeMenuAndDialogs(); }); - it('[C261158] Should be possible edit the metadata When the node is a Folder', async () => { + fit('[C261158] Should be possible edit the metadata When the node is a Folder', async () => { await contentServicesPage.metadataContent(folderName); - await metadataViewPage.editIconClick(); + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterPropertyText('properties.cm:name', 'newnameFolder'); - await metadataViewPage.clickResetButton(); + await metadataViewPage.generaleditIconDisplayed(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(folderName); await metadataViewPage.enterPropertyText('properties.cm:name', 'newnameFolder'); - await metadataViewPage.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('newnameFolder'); await metadataViewPage.enterPropertyText('properties.cm:name', folderName); - await metadataViewPage.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(folderName); }); }); @@ -274,14 +257,14 @@ describe('Metadata component', () => { await viewerPage.clickInfoButton(); await viewerPage.checkInfoSideBarIsDisplayed(); await metadataViewPage.clickOnPropertiesTab(); - await metadataViewPage.editIconIsDisplayed(); + await metadataViewPage.generaleditIconDisplayed(); await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB); - await metadataViewPage.editIconClick(); + await metadataViewPage.editIconGeneralClick(); await metadataViewPage.enterDescriptionText('check author example description'); - await metadataViewPage.clickSaveMetadata(); + await metadataViewPage.clickSaveGeneralMetadata(); await expect(await metadataViewPage.getPropertyText('properties.cm:description')).toEqual('check author example description'); await navigationBarPage.clickLogoutButton(); diff --git a/e2e/core/pages/metadata-view.page.ts b/e2e/core/pages/metadata-view.page.ts index c6b4bc9158..6ea18cd15f 100644 --- a/e2e/core/pages/metadata-view.page.ts +++ b/e2e/core/pages/metadata-view.page.ts @@ -33,6 +33,7 @@ export class MetadataViewPage { author = $(`[data-automation-id='card-textitem-value-properties.cm:author']`); titleProperty = $(`span[data-automation-id='card-textitem-value-properties.cm:title'] span`); editIcon = $(`button[data-automation-id='meta-data-card-toggle-edit']`); + editIconGeneral = $(`button[data-automation-id='meta-data-card-toggle-generalInfo-edit']`); informationButton = $(`button[data-automation-id='meta-data-card-toggle-expand']`); informationSpan = $(`span[data-automation-id='meta-data-card-toggle-expand-label']`); informationIcon = $(`span[data-automation-id='meta-data-card-toggle-expand-label'] ~ mat-icon`); @@ -45,6 +46,8 @@ export class MetadataViewPage { displayAspect = $(`input[data-placeholder='Display Aspect']`); applyAspect = element(by.cssContainingText(`button span.mat-button-wrapper`, 'Apply Aspect')); saveMetadataButton = $(`[data-automation-id='save-metadata']`); + saveGeneralMetadataButton = $(`[data-automation-id='save-generalInfo-metadata']`); + resetGeneralMetadataButton = $(`[data-automation-id='reset-general-metadata']`); resetMetadataButton = $(`[data-automation-id='reset-metadata']`); private getMetadataGroupLocator = async (groupName: string): Promise => @@ -108,10 +111,18 @@ export class MetadataViewPage { await BrowserVisibility.waitUntilElementIsNotVisible(this.editIcon); } + async generaleditIconDisplayed(): Promise { + await BrowserVisibility.waitUntilElementIsNotVisible(this.editIconGeneral); + } + async editIconClick(): Promise { await BrowserActions.clickExecuteScript('button[data-automation-id="meta-data-card-toggle-edit"]'); } + async editIconGeneralClick(): Promise { + await BrowserActions.clickExecuteScript('button[data-automation-id="meta-data-card-toggle-generalInfo-edit"]'); + } + async informationButtonIsDisplayed(): Promise { await BrowserVisibility.waitUntilElementIsClickable(this.informationButton); } @@ -316,4 +327,16 @@ export class MetadataViewPage { async clickResetMetadata(): Promise { await BrowserActions.click(this.resetMetadataButton); } + + async clickSaveGeneralMetadata(): Promise { + await BrowserActions.click(this.saveGeneralMetadataButton); + } + + async clickResetGeneralMetadata(): Promise { + await BrowserActions.click(this.resetGeneralMetadataButton); + } + + async generalSaveIconDisplayed(): Promise { + await BrowserVisibility.waitUntilElementIsNotVisible(this.saveGeneralMetadataButton); + } } diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html index 8cda12a0da..c1b97dfbc5 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html @@ -29,7 +29,7 @@ class="adf-metadata-action-buttons">