From 7172d5b63120fadad8463d1ff823d0d6281126e1 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 8 Aug 2018 14:18:04 +0100 Subject: [PATCH] E2E test default properties (#3671) --- .../app-layout/app-layout.component.scss | 4 --- .../file-view/file-view.component.html | 4 +-- e2e/core/card-view/metadata-properties.e2e.ts | 31 +++++++++++++++++++ e2e/pages/adf/metadataViewPage.js | 31 +++++++++++++++++++ 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.scss b/demo-shell/src/app/components/app-layout/app-layout.component.scss index e8a2929d21..5e1b10b03c 100644 --- a/demo-shell/src/app/components/app-layout/app-layout.component.scss +++ b/demo-shell/src/app/components/app-layout/app-layout.component.scss @@ -23,10 +23,6 @@ overflow: visible !important; } - .adf-menu { - padding-top: 55px; - } - .adf-app-layout { display: flex; flex: 1; diff --git a/demo-shell/src/app/components/file-view/file-view.component.html b/demo-shell/src/app/components/file-view/file-view.component.html index 0353285704..6ccc6ef9e1 100644 --- a/demo-shell/src/app/components/file-view/file-view.component.html +++ b/demo-shell/src/app/components/file-view/file-view.component.html @@ -23,11 +23,11 @@

- Display Properties + Display Default Properties

diff --git a/e2e/core/card-view/metadata-properties.e2e.ts b/e2e/core/card-view/metadata-properties.e2e.ts index 03ef5f9234..5e29d6e544 100644 --- a/e2e/core/card-view/metadata-properties.e2e.ts +++ b/e2e/core/card-view/metadata-properties.e2e.ts @@ -151,4 +151,35 @@ describe('CardView Component - properties', () => { metadataViewPage.chekMetadatGroupIsExpand('properties'); }); + + it('[C280559] Should show/hide the default metadata properties when displayDefaultProperties is true/false', () => { + viewerPage.viewFile(pngFileModel.name); + viewerPage.clickInfoButton(); + viewerPage.checkInfoSideBarIsDisplayed(); + metadataViewPage.clickOnPropertiesTab(); + + metadataViewPage.disabledDefaultProperties(); + + metadataViewPage.checkkMetadatGroupIsNotPresent('properties'); + metadataViewPage.checkkMetadatGroupIsPresent('EXIF'); + metadataViewPage.chekMetadatGroupIsExpand('EXIF'); + + metadataViewPage.enabledDefaultProperties(); + + metadataViewPage.checkkMetadatGroupIsPresent('properties'); + metadataViewPage.chekMetadatGroupIsExpand('properties'); + }); + + it('[C280560] Should show/hide the more properties button when displayDefaultProperties is true/false', () => { + viewerPage.viewFile(pngFileModel.name); + viewerPage.clickInfoButton(); + viewerPage.checkInfoSideBarIsDisplayed(); + metadataViewPage.clickOnPropertiesTab(); + + metadataViewPage.informationButtonIsDisplayed(); + + metadataViewPage.disabledDefaultProperties(); + + metadataViewPage.informationButtonIsNotDisplayed(); + }); }); diff --git a/e2e/pages/adf/metadataViewPage.js b/e2e/pages/adf/metadataViewPage.js index 7a51434698..6c16f1d412 100644 --- a/e2e/pages/adf/metadataViewPage.js +++ b/e2e/pages/adf/metadataViewPage.js @@ -41,6 +41,7 @@ var MetadataViewPage = function () { var readonlySwitch = element(by.id("adf-metadata-readonly")); var multiSwitch = element(by.id("adf-metadata-multi")); var presetSwitch = element(by.id('adf-toggle-custom-preset')); + var defaultPropertiesSwitch = element(by.id('adf-metadata-default-properties')); this.getTitle = function () { Util.waitUntilElementIsVisible(title); @@ -120,6 +121,10 @@ var MetadataViewPage = function () { Util.waitUntilElementIsClickable(informationButton); }; + this.informationButtonIsNotDisplayed = function () { + Util.waitUntilElementIsNotVisible(informationButton); + }; + this.clickOnInformationButton = function () { this.informationButtonIsDisplayed(); informationButton.click(); @@ -379,6 +384,32 @@ var MetadataViewPage = function () { }) }; + /** + * disables preset + */ + this.disabledDefaultProperties = function () { + Util.waitUntilElementIsVisible(defaultPropertiesSwitch); + defaultPropertiesSwitch.getAttribute('class').then(function (check) { + if (check === 'mat-slide-toggle mat-primary mat-checked') { + defaultPropertiesSwitch.click(); + expect(defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary'); + } + }) + }; + + /** + * enables preset + */ + this.enabledDefaultProperties = function () { + Util.waitUntilElementIsVisible(defaultPropertiesSwitch); + defaultPropertiesSwitch.getAttribute('class').then(function (check) { + if (check === 'mat-slide-toggle mat-primary') { + defaultPropertiesSwitch.click(); + expect(defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked'); + } + }) + }; + this.checkPopertyIsVisible = function (propertyName, type) { var property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]')); Util.waitUntilElementIsVisible(property);