From 742d6d369b761220e565f39f2fa09413141ad93f Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Tue, 3 Mar 2020 16:15:39 +0200 Subject: allow platform multi-selection for network Issue-ID: VID-785 Change-Id: I4e6a4c2f0dc8c0e11f2571eec0789ad5672a9147 Signed-off-by: Einat Vinouze --- .../cypress/integration/iFrames/ala-carte.e2e.ts | 2 +- .../cypress/integration/iFrames/network.popup.e2e.ts | 14 ++++++++------ .../support/jsonBuilders/mocks/jsons/flags.cypress.json | 3 ++- .../cypress/support/steps/fill.network.step.ts | 7 +++++-- 4 files changed, 16 insertions(+), 10 deletions(-) (limited to 'vid-webpack-master/cypress') diff --git a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts index b9072139e..4988ec8e8 100644 --- a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts @@ -195,7 +195,7 @@ describe('A la carte', function () { cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'); cy.getElementByDataTestsId("node-ExtVL 0-add-btn").click({force: true}); - cy.selectDropdownOptionByText("platform", "xxx1"); + cy.selectPlatformValue("xxx1"); cy.selectDropdownOptionByText("lcpRegion", "AAIAIC25"); cy.selectDropdownOptionByText("tenant", "USP-SIP-IC-24335-T-01"); cy.selectDropdownOptionByText("productFamily", "ERICA"); diff --git a/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts index 2baab721c..a17443135 100644 --- a/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts @@ -57,14 +57,14 @@ describe('Network popup', function () { cy.checkIsOptionSelected('lcpRegion', 'hvf6'); cy.checkIsOptionSelected('tenant', '229bcdc6eaeb4ca59d55221141d01f8e'); cy.checkIsOptionSelected('lineOfBusiness', 'zzz1'); - cy.checkIsOptionSelected('platform', 'xxx1'); + cy.checkPlatformValue('xxx1'); //change platform value - cy.selectDropdownOptionByText('platform', 'platform'); + cy.selectPlatformValue('platform'); cy.getElementByDataTestsId('form-set').click({force: true}).then(() => { cy.getElementByDataTestsId('numberButton').contains('1'); cy.getElementByDataTestsId('node-ddc3f20c-08b5-40fd-af72-c6d14636b986-ExtVL 0-menu-btn').click({force: true}) .getElementByDataTestsId('context-menu-edit').click({force: true}).then(() => { - cy.checkIsOptionSelected('platform', 'platform'); + cy.checkPlatformValue( 'platform'); // cancel button should close the dialog cy.getElementByDataTestsId('cancelButton').click({force: true}).then(() => { // duplicate network @@ -130,7 +130,7 @@ describe('Network popup', function () { cy.selectDropdownOptionByText('lcpRegion', 'hvf6'); cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-STTest2'); cy.selectDropdownOptionByText('lineOfBusiness', 'zzz1'); - cy.selectDropdownOptionByText('platform', 'xxx1'); + cy.selectPlatformValue('xxx1'); cy.getElementByDataTestsId('form-set').should('not.have.attr', 'disabled'); // clear required dynamic input. @@ -175,9 +175,10 @@ describe('Network popup', function () { //add one network cy.getElementByDataTestsId('node-ExtVL 0-add-btn').click({force: true}).then(() => { verifyServiceModelNameInModelInfo(); - cy.fillNetworkPopup(); + cy.fillNetworkPopup(true); }); + const networkNodeToDelete = "node-ddc3f20c-08b5-40fd-af72-c6d14636b986-ExtVL 0"; cy.getElementByDataTestsId(`${networkNodeToDelete}-menu-btn`).eq(0).click({force: true}) .getElementByDataTestsId('context-menu-delete').click(); @@ -214,7 +215,8 @@ describe('Network popup', function () { "FLAG_SERVICE_MODEL_CACHE": true, "FLAG_ADVANCED_PORTS_FILTER": true, "FLAG_REGION_ID_FROM_REMOTE": true, - "FLAG_ADD_MSO_TESTAPI_FIELD": true + "FLAG_ADD_MSO_TESTAPI_FIELD": true, + "FLAG_2006_NETWORK_PLATFORM_MULTI_SELECT": true }, "type": "[FLAGS] Update" }, diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json index d9602d139..148f6b4d5 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json @@ -24,5 +24,6 @@ "FLAG_2002_UNLIMITED_MAX" : true, "FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE": true, "FLAG_2006_VFM_SDNC_PRELOAD_FILES" : true, - "FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF": true + "FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF": true, + "FLAG_2006_NETWORK_PLATFORM_MULTI_SELECT" :true } diff --git a/vid-webpack-master/cypress/support/steps/fill.network.step.ts b/vid-webpack-master/cypress/support/steps/fill.network.step.ts index c981ac4b2..4ca1796f1 100644 --- a/vid-webpack-master/cypress/support/steps/fill.network.step.ts +++ b/vid-webpack-master/cypress/support/steps/fill.network.step.ts @@ -5,12 +5,15 @@ declare namespace Cypress { } } -function fillNetworkPopup(): Chainable { +function fillNetworkPopup(shouldSelectAdditionalPlatform: boolean = false): Cypress.Chainable { cy.selectDropdownOptionByText('productFamily', 'Emanuel'); cy.selectDropdownOptionByText('lcpRegion', 'hvf6'); cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-STTest2'); cy.selectDropdownOptionByText('lineOfBusiness', 'zzz1'); - cy.selectDropdownOptionByText('platform', 'xxx1'); + cy.selectPlatformValue('xxx1'); + if(shouldSelectAdditionalPlatform){ + cy.selectPlatformValue('platform'); + } return cy.getElementByDataTestsId('form-set').click({force : true}).then((done)=>{ return done; }); -- cgit 1.2.3-korg