From 384b800ced5662f9bb10a921f5d2035099b66bbd Mon Sep 17 00:00:00 2001
From: Catalin Comanici <Catalin.COMANICI@ext.ec.europa.eu>
Date: Fri, 7 Oct 2022 13:59:45 +0200
Subject: [PATCH] minor fixes
---
.../java/pages/components/GenericSelect.java | 48 +++++++++----------
.../main/java/pages/domain/DomainPopup.java | 1 +
.../src/test/java/ui/LoginPgTest.java | 6 ---
3 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/smp-ui-tests/src/main/java/pages/components/GenericSelect.java b/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
index 8382a2b76..2075bc26f 100644
--- a/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
+++ b/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
@@ -14,38 +14,36 @@ import java.util.List;
public class GenericSelect extends PageComponent {
+ @FindBy(className = "mat-select-arrow")
+ WebElement expandoButton;
+ @FindBy(css = "div.mat-select-value span")
+ WebElement currentValueElement;
+ private WebElement container;
+ private By optionSelector = By.tagName("mat-option");
+
public GenericSelect(WebDriver driver, WebElement container) {
super(driver);
log.info("select init");
this.container = container;
-
+
PageFactory.initElements(new DefaultElementLocatorFactory(container), this);
}
- private WebElement container;
-
- @FindBy(className = "mat-select-arrow")
- WebElement expandoButton;
-
- @FindBy(css = "div.mat-select-value span")
- WebElement currentValueElement;
-
- private By optionSelector = By.tagName("mat-option");
-
-
- private void expandSelect(){
+ private void expandSelect() {
log.info("expand select");
- waitForElementToBeClickable(expandoButton).click();
+ waitForElementToBeClickable(expandoButton);
+ waitForXMillis(500);
+ expandoButton.click();
}
- private List<WebElement> getOptions(){
+ private List<WebElement> getOptions() {
expandSelect();
log.info("getting options");
return wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(optionSelector));
}
- public List<String> getOptionTexts(){
+ public List<String> getOptionTexts() {
log.info("get displayed option texts");
List<WebElement> options = getOptions();
List<String> optionTexts = new ArrayList<>();
@@ -56,13 +54,13 @@ public class GenericSelect extends PageComponent {
return optionTexts;
}
- public boolean selectOptionWithText(String text){
+ public boolean selectOptionWithText(String text) {
log.info("selecting option with text" + text);
List<WebElement> options = getOptions();
for (WebElement option : options) {
- if(option.getText().trim().equalsIgnoreCase(text)){
+ if (option.getText().trim().equalsIgnoreCase(text)) {
waitForElementToBeClickable(option).click();
waitForElementToBeGone(option);
log.info("return type is True");
@@ -73,7 +71,7 @@ public class GenericSelect extends PageComponent {
return false;
}
- public boolean selectFirstOption(){
+ public boolean selectFirstOption() {
log.info("selecting first option");
List<WebElement> options = getOptions();
@@ -82,7 +80,8 @@ public class GenericSelect extends PageComponent {
waitForElementToBeGone(option);
return true;
}
- public boolean selectWithIndex(int index){
+
+ public boolean selectWithIndex(int index) {
log.info("selecting the required option");
List<WebElement> options = getOptions();
@@ -93,7 +92,6 @@ public class GenericSelect extends PageComponent {
}
-
public String getSelectedValue() {
log.info("getting current selected value");
return currentValueElement.getText().trim();
@@ -107,20 +105,22 @@ public class GenericSelect extends PageComponent {
List<WebElement> options = wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(optionSelector));
for (WebElement option : options) {
String optionDomain = option.getText().trim();
- if(optionDomain.equalsIgnoreCase(text)){
+ if (optionDomain.equalsIgnoreCase(text)) {
option.click();
waitForElementToBeGone(option);
return true;
}
}
- log.info(text + " option not found, could not select it (2)" );
+ log.info(text + " option not found, could not select it (2)");
return false;
}
public boolean isLoaded() {
log.info("assert loaded state");
waitForElementToBeVisible(expandoButton);
- if(!expandoButton.isDisplayed()){ return false;}
+ if (!expandoButton.isDisplayed()) {
+ return false;
+ }
return currentValueElement.isDisplayed();
}
}
diff --git a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java b/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
index ff5f37892..a5ced38bd 100644
--- a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
+++ b/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
@@ -56,6 +56,7 @@ public class DomainPopup extends PageComponent {
public void clickOK() {
waitForElementToBeClickable(okBtn).click();
+ waitForXMillis(500);
waitForElementToBeGone(okBtn);
}
diff --git a/smp-ui-tests/src/test/java/ui/LoginPgTest.java b/smp-ui-tests/src/test/java/ui/LoginPgTest.java
index 2c477115b..1dc0d7f79 100644
--- a/smp-ui-tests/src/test/java/ui/LoginPgTest.java
+++ b/smp-ui-tests/src/test/java/ui/LoginPgTest.java
@@ -160,12 +160,6 @@ public class LoginPgTest extends BaseTest {
soft.assertAll();
}
- // This will serve as a reminder to check this message manually
- @Test(description = "LGN-50")
- public void SMPNotRunningTest() {
- throw new SkipException("This test will be executed manually !!!");
- }
-
@Test(description = "LGN-60")
public void loginButtonDisableVerification() {
SoftAssert soft = new SoftAssert();
--
GitLab