diff --git a/msa/black-box-tests/README.md b/msa/black-box-tests/README.md index 856bd08f4a..c91e1203fb 100644 --- a/msa/black-box-tests/README.md +++ b/msa/black-box-tests/README.md @@ -34,7 +34,7 @@ As result, in REPOSITORY column, next images should be present: mvn clean install -DblackBoxTests.skip=false -DrunLocal=true -- To run ui tests run tests in the [msa/black-box-tests](../black-box-tests) directory specifying suiteFile property: +- To run ui smoke tests in the [msa/black-box-tests](../black-box-tests) directory specifying suiteFile property: mvn clean install -DblackBoxTests.skip=false -DsuiteFile=src/test/resources/smokeTests.xml diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index c6952f05ba..f99fb21343 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -34,6 +34,7 @@ UTF-8 ${basedir}/../.. + src/test/resources/testNG.xml @@ -163,28 +164,19 @@ org.seleniumhq.selenium selenium-java - 4.5.3 + test io.github.bonigarcia webdrivermanager - 5.3.0 + test io.qameta.allure allure-testng - 2.19.0 + test - - - - com.google.guava - guava - 31.0.1-jre - - - @@ -192,7 +184,7 @@ maven-surefire-plugin - src/test/resources/testNG.xml + ${suiteFile} ${blackBoxTests.skip} diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDiverBaseTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDiverBaseTest.java index 4079ec264c..438443cfde 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDiverBaseTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDiverBaseTest.java @@ -56,14 +56,17 @@ abstract public class AbstractDiverBaseTest extends AbstractContainerTest { log.info("*----------------------* Setup driver *----------------------*"); if (HEADLESS == true) { ChromeOptions options = new ChromeOptions(); + options.addArguments("--ignore-certificate-errors"); options.addArguments("--no-sandbox"); options.addArguments("--disable-dev-shm-usage"); options.addArguments("--headless"); WebDriverManager.chromedriver().setup(); driver = new ChromeDriver(options); } else { + ChromeOptions options = new ChromeOptions(); + options.addArguments("--ignore-certificate-errors"); WebDriverManager.chromedriver().setup(); - driver = new ChromeDriver(); + driver = new ChromeDriver(options); } driver.manage().window().setSize(dimension); } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java index 351423d950..8868d53768 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java @@ -15,11 +15,12 @@ */ package org.thingsboard.server.msa.ui.utils; +import static org.thingsboard.server.msa.TestProperties.getBaseUrl; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber; public class Const { - public static final String URL = "http://localhost:8080/"; + public static final String URL = getBaseUrl(); public static final String TENANT_EMAIL = "tenant@thingsboard.org"; public static final String TENANT_PASSWORD = "tenant"; public static final String ENTITY_NAME = "Az!@#$%^&*()_-+=~`" + getRandomNumber(); diff --git a/pom.xml b/pom.xml index 411e9be7cc..c23e4cf661 100755 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,9 @@ 6.1.0.202203080745-r 0.4.8 1.0.0 + 4.1.1 + 5.3.0 + 2.19.0 @@ -1656,6 +1659,24 @@ ${rest-assured.version} test + + org.seleniumhq.selenium + selenium-java + ${selenium.version} + test + + + io.github.bonigarcia + webdrivermanager + ${webdrivermanager.version} + test + + + io.qameta.allure + allure-testng + ${allure-testng.version} + test + org.hamcrest hamcrest-all