summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'vid-automation/src/main')
-rw-r--r--vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java9
-rw-r--r--vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java9
2 files changed, 7 insertions, 11 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java
index 65d0fb6a0..5b7239a12 100644
--- a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java
+++ b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java
@@ -185,10 +185,15 @@ public class VidBasePage {
return this;
}
-
public VidBasePage selectLcpRegion(String lcpRegion) {
+ return selectLcpRegion(lcpRegion, "AIC");
+ }
+
+ public VidBasePage selectLcpRegion(String lcpRegion, String cloudOwner) {
GeneralUIUtils.ultimateWait();
- SelectOption.byValue(lcpRegion, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
+ String visibleText = (Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive()) ?
+ String.format("%s (%s)", lcpRegion, cloudOwner) : lcpRegion;
+ SelectOption.byTestIdAndVisibleText(visibleText, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
return this;
}
diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
index 4edabf53d..adba6f28f 100644
--- a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
+++ b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
@@ -67,15 +67,6 @@ public class ViewEditPage extends VidBasePage {
return this;
}
- public ViewEditPage selectLcpRegion(String lcpRegion, String cloudOwner){
- selectLcpRegion(lcpRegion);
- if (Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive()) {
- String selectedOption = SelectOption.getSelectedOption(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
- Assert.assertEquals(lcpRegion + " (" + cloudOwner.toUpperCase() + ")", selectedOption);
- }
- return this;
- }
-
public ViewEditPage selectLineOfBusiness(String lineOfBusiness, String cloudOwner){
selectLineOfBusiness(lineOfBusiness);
return this;