From 18ef46562cbbd7d44c3a053275b0bcb0ae403758 Mon Sep 17 00:00:00 2001 From: Alexey Sandler Date: Wed, 15 Jan 2020 09:33:19 +0200 Subject: remove "Previous instantiotion" button from service popup. Issue-ID: VID-739 Signed-off-by: Alexey Sandler Change-Id: I562da185a59b593112dc50b403c20e671c7f7a48 Signed-off-by: Alexey Sandler --- .../main/java/org/onap/vid/properties/Features.java | 2 +- .../java/vid/automation/test/infra/Features.java | 1 - .../test/sections/deploy/DeployModernUIBase.java | 4 ---- .../vid/automation/test/test/BrowseASDCTest.java | 21 --------------------- .../integration/iFrames/service.popup.e2e.ts | 7 ------- .../jsonBuilders/mocks/jsons/flags.cypress.json | 1 - .../generic-form-popup.component.html | 6 ------ .../generic-form-popup.component.ts | 2 -- .../services/featureFlag/feature-flags.service.ts | 1 - 9 files changed, 1 insertion(+), 44 deletions(-) diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java index a42110337..8a944a9ab 100644 --- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java +++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java @@ -81,9 +81,9 @@ public enum Features implements Feature { FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND, FLAG_2004_INSTANTIATION_STATUS_FILTER, FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE, - FLAG_2004_TEMP_BUTTON_TO_INSTANTIATION_STATUS_FILTER, FLAG_2004_INSTANTIATION_TEMPLATES_POPUP, FLAG_2002_UNLIMITED_MAX, + ; diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index 9f132e8ab..6be6870c2 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -55,7 +55,6 @@ public enum Features implements Feature { FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS, FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND, FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE, - FLAG_2004_TEMP_BUTTON_TO_INSTANTIATION_STATUS_FILTER, FLAG_2002_UNLIMITED_MAX, ; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java index acddc1b11..0b8122cb6 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/deploy/DeployModernUIBase.java @@ -53,8 +53,4 @@ public abstract class DeployModernUIBase extends DeployDialogBase { GeneralUIUtils.clickOnElementByTestId(Constants.OwningEntity.PROJECT_SELECT_TEST_ID); } - public void clickPreviousInstantiationButton() { - GeneralUIUtils.clickOnElementByTestIdWithoutWait("ShowPreviousInstancesButton"); - } - } diff --git a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java index f6b883ac1..84dbf11a1 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java @@ -6,7 +6,6 @@ import static org.testng.Assert.assertFalse; import static vid.automation.test.infra.Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.Features.FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.Features.FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND; -import static vid.automation.test.infra.Features.FLAG_2004_TEMP_BUTTON_TO_INSTANTIATION_STATUS_FILTER; import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION; import static vid.automation.test.infra.Features.FLAG_SHOW_ORCHESTRATION_TYPE; @@ -338,26 +337,6 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { return deployMacroDialog; } - @Test - @FeatureTogglingTest(FLAG_2004_TEMP_BUTTON_TO_INSTANTIATION_STATUS_FILTER) - public void testClickPreviousInstantiationsInCreationDialog() { - try { - String serviceId = "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"; - DeployModernUIMacroDialog deployMacroDialog = getDeployModernUIMacroDialog(serviceId); - deployMacroDialog.clickPreviousInstantiationButton(); - - //exit form deploy dialog - goOutFromIframe(); - //go into Instantiation Status page - goToIframe(); - - InstantiationStatusPage.verifyInstantiationStatusFilterValue(serviceId); - } - finally { - goOutFromIframe(); - } - } - private BrowseASDCPage registerSimulatorAndGoToBrowseSDC() { SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET, "ecompportal_getSessionSlotCheckInterval.json", diff --git a/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts index de29313a3..06f5a23b5 100644 --- a/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts @@ -95,13 +95,6 @@ describe('Service popup', function () { }); }); - it('when open service popup should show showPrevious button', () => { - cy.openPopupIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true'); - cy.getElementByDataTestsId('ShowPreviousInstancesButton').contains('Previous Instantiation').click(); - - }) - - }); }); 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 531bad3b4..c7740207c 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 @@ -19,7 +19,6 @@ "FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE": false, "FLAG_2002_VNF_PLATFORM_MULTI_SELECT" : true, "FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS": true, - "FLAG_2004_TEMP_BUTTON_TO_INSTANTIATION_STATUS_FILTER": true, "FLAG_2004_INSTANTIATION_STATUS_FILTER": true, "FLAG_2004_INSTANTIATION_TEMPLATES_POPUP" : false, "FLAG_2002_UNLIMITED_MAX" : true, diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html index 6bb1ff156..031357403 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html @@ -60,12 +60,6 @@ type="button" class="btn btn-success submit" (click)="openTemplateModal()" >Template -