From 7f959663e60cce9fcfa3dae0512c763ba091198b Mon Sep 17 00:00:00 2001 From: Uliana Date: Tue, 7 Apr 2020 07:54:41 +0200 Subject: [PATCH 01/19] 1229 Update the Fundamental library version to 0.7.0 for Angular App --- .../luigi-client-ux-alerts-i18n.spec.js | 4 +- .../luigi-client-ux-manager-features.spec.js | 48 ++++++++------ .../e2e/tests/1-angular/navigation.spec.js | 2 +- test/e2e-test-application/package-lock.json | 8 +-- test/e2e-test-application/package.json | 2 +- .../src/app/app.component.scss | 3 + .../app/project/modal/modal.component.html | 64 +++++++++++-------- .../src/app/project/project.component.html | 4 +- 8 files changed, 78 insertions(+), 57 deletions(-) diff --git a/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-alerts-i18n.spec.js b/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-alerts-i18n.spec.js index 00eeaa4019..e83c20d832 100644 --- a/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-alerts-i18n.spec.js +++ b/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-alerts-i18n.spec.js @@ -117,11 +117,11 @@ describe('Luigi Client UX Alerts + Localization', () => { cy.get('*[id$=_link_relativePath]').click(); cy.expectPathToBe('/projects/pr1'); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.get('[data-testid=luigi-modal-dismiss]').click(); cy.expectPathToBe('/projects/pr1'); cy.get('*[id$=_link_relativePath]').click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.get('[data-testid=luigi-modal-confirm]').click(); cy.expectPathToBe('/projects/pr1/hideSideNav'); diff --git a/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-manager-features.spec.js b/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-manager-features.spec.js index 85f8bf210d..861e2ef960 100644 --- a/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-manager-features.spec.js +++ b/test/e2e-test-application/e2e/tests/1-angular/luigi-client-ux-manager-features.spec.js @@ -27,7 +27,7 @@ describe('Luigi Client ux manager features', () => { cy.get('.lui-backdrop').should('exist'); //close modal cy.wrap($iframeBody) - .find('.fd-modal__footer') + .find('.fd-dialog__footer') .contains('Confirm') .click(); @@ -38,47 +38,57 @@ describe('Luigi Client ux manager features', () => { it('Luigi Client generic confirmation modal', () => { cy.goToUxManagerMethods($iframeBody); - cy.get('[data-testid=luigi-confirmation-modal]').should('not.be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should( + 'not.be.visible' + ); cy.wrap($iframeBody) - .find('[data-testid=show-luigi-confirmation-modal]') + .find('[data-testid=show-luigi-confirmation-dialog]') .click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.get('[data-testid=luigi-modal-dismiss]').click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('not.be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should( + 'not.be.visible' + ); cy.wrap($iframeBody) - .find('[data-testid=luigi-confirmation-modal-result]') + .find('[data-testid=luigi-confirmation-dialog-result]') .contains('Luigi confirmation modal has been dismissed'); cy.wrap($iframeBody) - .find('[data-testid=show-luigi-confirmation-modal]') + .find('[data-testid=show-luigi-confirmation-dialog]') .click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.get('[data-testid=luigi-modal-confirm]').click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('not.be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should( + 'not.be.visible' + ); cy.wrap($iframeBody) - .find('[data-testid=luigi-confirmation-modal-result]') + .find('[data-testid=luigi-confirmation-dialog-result]') .contains('Luigi confirmation modal has been confirmed'); }); it('Close Luigi Client generic confirmation modal by esc keypress', () => { cy.goToUxManagerMethods($iframeBody); - cy.get('[data-testid=luigi-confirmation-modal]').should('not.be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should( + 'not.be.visible' + ); cy.wrap($iframeBody) - .find('[data-testid=show-luigi-confirmation-modal]') + .find('[data-testid=show-luigi-confirmation-dialog]') .click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.get('[data-testid=luigi-modal-dismiss]').trigger('keydown', { keyCode: 27, which: 27 }); - cy.get('[data-testid=luigi-confirmation-modal]').should('not.be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should( + 'not.be.visible' + ); cy.wrap($iframeBody) - .find('[data-testid=luigi-confirmation-modal-result]') + .find('[data-testid=luigi-confirmation-dialog-result]') .contains('Luigi confirmation modal has been dismissed'); }); @@ -119,13 +129,13 @@ describe('Luigi Client ux manager features', () => { .contains('Projects') .click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.expectPathToBe('/overview'); //the location is unchanged cy.get('[data-testid=luigi-modal-dismiss]').click(); - cy.get('[data-testid=luigi-confirmation-modal]').should( + cy.get('[data-testid=luigi-confirmation-dialog]').should( 'not.be.visible' ); @@ -141,13 +151,13 @@ describe('Luigi Client ux manager features', () => { .contains('Projects') .click(); - cy.get('[data-testid=luigi-confirmation-modal]').should('be.visible'); + cy.get('[data-testid=luigi-confirmation-dialog]').should('be.visible'); cy.expectPathToBe('/overview'); //the location is unchanged cy.get('[data-testid=luigi-modal-confirm]').click(); - cy.get('[data-testid=luigi-confirmation-modal]').should( + cy.get('[data-testid=luigi-confirmation-dialog]').should( 'not.be.visible' ); diff --git a/test/e2e-test-application/e2e/tests/1-angular/navigation.spec.js b/test/e2e-test-application/e2e/tests/1-angular/navigation.spec.js index 0c3bfb7b12..d1fa69a4c4 100644 --- a/test/e2e-test-application/e2e/tests/1-angular/navigation.spec.js +++ b/test/e2e-test-application/e2e/tests/1-angular/navigation.spec.js @@ -17,7 +17,7 @@ describe('Navigation', () => { title: 'Preserved View', size: 'm' }); - cy.get('.fd-modal__close').click(); + cy.get('.fd-dialog__close').click(); cy.expectPathToBe('/overview'); }); }); diff --git a/test/e2e-test-application/package-lock.json b/test/e2e-test-application/package-lock.json index 6159398d21..4c6477d0c1 100644 --- a/test/e2e-test-application/package-lock.json +++ b/test/e2e-test-application/package-lock.json @@ -6838,11 +6838,11 @@ "dev": true }, "fundamental-styles": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.6.0.tgz", - "integrity": "sha512-jn3earSGApXH87Pu38EBI/5JHyfUsS9pBbinDJQmgTFifGBaHyfkfSwfU9Gx+vWeq+hPZSJ4FIoPqIVDybjnBQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.7.0.tgz", + "integrity": "sha512-wq6bCGjS6uUN1lbiBBC1NA8U+OJ57i6vpkNFt3bPf/jc6Vugvpt4fpGbU9tuEoeB1YqUIGL7A6DSuzOKbJy7NA==", "requires": { - "@sap-theming/theming-base-content": "~11.1.16" + "@sap-theming/theming-base-content": "~11.1.17" } }, "gauge": { diff --git a/test/e2e-test-application/package.json b/test/e2e-test-application/package.json index dcaff7f178..92677518bf 100644 --- a/test/e2e-test-application/package.json +++ b/test/e2e-test-application/package.json @@ -28,7 +28,7 @@ "@luigi-project/core": "1.0.0", "ajv": "^6.1.1", "core-js": "^2.4.1", - "fundamental-styles": "^0.6.0", + "fundamental-styles": "^0.7.0", "rxjs": "6.2.0", "zone.js": "^0.8.14", "lodash": ">=4.17.13" diff --git a/test/e2e-test-application/src/app/app.component.scss b/test/e2e-test-application/src/app/app.component.scss index abb86acec7..81b18e4af6 100644 --- a/test/e2e-test-application/src/app/app.component.scss +++ b/test/e2e-test-application/src/app/app.component.scss @@ -12,3 +12,6 @@ $fd-icons-path: '~fundamental-styles/scss/icons/'; .fd-list-group__item { display: block; } +.fd-dialog { + z-index: 2; +} diff --git a/test/e2e-test-application/src/app/project/modal/modal.component.html b/test/e2e-test-application/src/app/project/modal/modal.component.html index f5e4b4d846..dbc8d7e418 100644 --- a/test/e2e-test-application/src/app/project/modal/modal.component.html +++ b/test/e2e-test-application/src/app/project/modal/modal.component.html @@ -1,38 +1,46 @@