summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-07-11 15:54:36 +0300
committerIttay Stern <ittay.stern@att.com>2019-07-11 16:53:33 +0300
commit7befef8d013fb9e5627a50f7fb1e1937eb27e483 (patch)
tree2e385799c4a26cf924767d31322fe809dd2ddcfe
parent5f458465bf2fb660a474e27f50bb876b3737a143 (diff)
Change tests and log to expect "Browse SDC" (was "ASDC")
Issue-ID: VID-516 Change-Id: I481880df1796721128b07e3dc3ae83085fc097e8 Signed-off-by: Ittay Stern <ittay.stern@att.com>
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/VidController.java2
-rw-r--r--vid-automation/src/main/java/vid/automation/test/Constants.java2
-rw-r--r--vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java2
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts2
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts4
5 files changed, 6 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java
index 9d557a096..15bc5ed7c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java
@@ -66,7 +66,7 @@ public class VidController extends RestrictedBaseController {
*/
@RequestMapping(value = {"/rest/models/services"}, method = RequestMethod.GET)
public SecureServices getServices(HttpServletRequest request) {
- LOG.info("Start API for browse ASDC was called");
+ LOG.info("Start API for browse SDC was called");
SecureServices secureServices = new SecureServices();
List<Role> roles = roleProvider.getUserRoles(request);
secureServices.setServices(aaiService.getServicesByDistributionStatus());
diff --git a/vid-automation/src/main/java/vid/automation/test/Constants.java b/vid-automation/src/main/java/vid/automation/test/Constants.java
index e3eeaca54..6605fe2e6 100644
--- a/vid-automation/src/main/java/vid/automation/test/Constants.java
+++ b/vid-automation/src/main/java/vid/automation/test/Constants.java
@@ -73,7 +73,7 @@ public class Constants {
public static final int numOfButtons = 7;
public static final String buttonClass = "att-accordion__group";
public static final String SEARCH_EXISTING_SERVICE = "Search for Existing Service Instances";
- public static final String BROWSE_ASDC_SERVICE_MODELS = "Browse ASDC Service Models";
+ public static final String BROWSE_SDC_SERVICE_MODELS = "Browse SDC Service Models";
public static final String CREATE_NEW_SERVICE = "Create New Service Instance";
public static final String VNF_CHANGES = "VNF Changes";
public static final String TEST_ENVIRONMENTS = "Test Environments";
diff --git a/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java b/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java
index dc3de78dd..96c823948 100644
--- a/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java
+++ b/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java
@@ -12,7 +12,7 @@ public class SideMenu {
static final Logger logger = LoggerFactory.getLogger(SideMenu.class);
public static void navigateToBrowseASDCPage() {
- navigateToPage(Constants.SideMenu.BROWSE_ASDC_SERVICE_MODELS);
+ navigateToPage(Constants.SideMenu.BROWSE_SDC_SERVICE_MODELS);
}
public static void navigateToSearchExistingPage() {
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 ecd91022b..13c4464cd 100644
--- a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
@@ -251,7 +251,7 @@ describe('A la carte', function () {
}
function checkServiceNameInputIdMandatory() {
- cy.get('span').contains('Browse ASDC Service Models').click({force: true})
+ cy.get('span').contains('Browse SDC Service Models').click({force: true})
.getElementByDataTestsId('deploy-' + SERVICE_ID).click({force: true})
.wait(1000).getElementByDataTestsId(CONFIRM_BUTTON).click({force: true})
.get('.error').contains(INSTANCE_NAME_MANDATORY_MESSAGE)
diff --git a/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts
index 1e80ee77e..e787aa76c 100644
--- a/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts
@@ -53,7 +53,7 @@ describe('Browse SDC', function () {
'MACRO_FOR_NEW_FLOW');
});
- cy.get('span').contains('Browse ASDC Service Models').click({force: true});
+ cy.get('span').contains('Browse SDC Service Models').click({force: true});
cy.wait("@list_services").then(() => {
cy.getElementByDataTestsId('deploy-' + MACRO_WITH_NETWORK_ID).click({force: true})
.getElementByDataTestsId(CANCEL_BUTTON).click({force: true});
@@ -87,7 +87,7 @@ describe('Browse SDC', function () {
'MACRO_WITH_CONFIGURATION');
});
- cy.get('span').contains('Browse ASDC Service Models').click({force: true});
+ cy.get('span').contains('Browse SDC Service Models').click({force: true});
cy.wait("@list_services").then(() => {
cy.getElementByDataTestsId('deploy-' + VERY_OLD_SERVICE_UUID).click({force: true})
.getElementByDataTestsId('create-modal-title').contains("Create Service Instance -- a la carte");