From 797ec0381119281b048cd861e43523fec8d12072 Mon Sep 17 00:00:00 2001 From: Catalin Comanici <Catalin.COMANICI@ext.ec.europa.eu> Date: Fri, 7 Oct 2022 09:01:30 +0200 Subject: [PATCH] ...increased wait time for element to be gone --- smp-ui-tests/pom.xml | 6 +++--- .../java/pages/components/ConfirmationDialog.java | 3 --- .../components/baseComponents/PageComponent.java | 14 ++------------ .../src/main/java/pages/domain/DomainPopup.java | 6 ------ smp-ui-tests/src/test/java/ui/EditPgTest.java | 1 - 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/smp-ui-tests/pom.xml b/smp-ui-tests/pom.xml index d536dc6aa..cc4fa0b56 100644 --- a/smp-ui-tests/pom.xml +++ b/smp-ui-tests/pom.xml @@ -11,9 +11,9 @@ <properties> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <url>http://localhost:8080/smp</url> - <gecko.driver.path>drivers/geckodriver.exe</gecko.driver.path> - <chrome.driver.path>drivers/chromedriver.exe</chrome.driver.path> + <url>http://localhost:8982/smp</url> + <gecko.driver.path>drivers/geckodriver</gecko.driver.path> + <chrome.driver.path>drivers/chromedriver</chrome.driver.path> </properties> <dependencies> diff --git a/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java b/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java index c3f5c709a..fc2e4f8c0 100644 --- a/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java +++ b/smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java @@ -36,9 +36,6 @@ public class ConfirmationDialog extends PageComponent { public void cancel(){ log.info("dialog .. cancel"); waitForElementToBeClickable(noBtn); -/* Actions actions = new Actions(driver); - actions.moveToElement(noBtn).click().build().perform();*/ - //((JavascriptExecutor) driver).executeScript("arguments[0].click();", noBtn); noBtn.click(); waitForElementToBeGone(noBtn); } diff --git a/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java b/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java index 9beac7659..91bda2be3 100644 --- a/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java +++ b/smp-ui-tests/src/main/java/pages/components/baseComponents/PageComponent.java @@ -1,6 +1,7 @@ package pages.components.baseComponents; +import com.google.common.base.Stopwatch; import org.apache.log4j.Logger; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; @@ -56,18 +57,7 @@ public class PageComponent { } public void waitForElementToBeGone(WebElement element) { -// int maxTimeout = 1000; -// int waitedSoFar = 0; -// -// try { -// while ((null != element.getText()) && (waitedSoFar < maxTimeout)) { -// waitedSoFar += 100; -// waitForXMillis(100); -// } -// } catch (Exception e) { -// return; -// } - waitForXMillis(500); + waitForXMillis(1000); } 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 6b6e4160a..ff5f37892 100644 --- a/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java +++ b/smp-ui-tests/src/main/java/pages/domain/DomainPopup.java @@ -46,12 +46,6 @@ public class DomainPopup extends PageComponent { @FindBy(css = "#smlClientCertHeaderAuth_id-input") WebElement userClientCertHeaderToggleInput; - /*@FindBy(css = "div.mat-form-field-infix > div.ng-star-inserted") - WebElement invalidSmlSmpIdErrorMsg;*/ - -// @FindBy(css = "#smlClientHeader_id") -// WebElement smlClientHeaderInput; - @FindBy(css = "div.mat-form-field-infix > div.ng-star-inserted") WebElement domainCodeValidationError; diff --git a/smp-ui-tests/src/test/java/ui/EditPgTest.java b/smp-ui-tests/src/test/java/ui/EditPgTest.java index 69f93b133..876238d33 100644 --- a/smp-ui-tests/src/test/java/ui/EditPgTest.java +++ b/smp-ui-tests/src/test/java/ui/EditPgTest.java @@ -304,7 +304,6 @@ public class EditPgTest extends BaseTest { SMPRestClient.deleteSG(identifier); identifier = Generator.randomAlphaNumeric(10); -// scheme = Generator.randomAlphaNumeric(10); popup = page.clickNew(); popup.fillParticipantIdentifier(identifier); -- GitLab