diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java index 4cb557d394..b17b1ad95b 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java @@ -54,18 +54,17 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest { @BeforeMethod public void openBrowser() { log.info("*----------------------* Setup driver *----------------------*"); + WebDriverManager.chromedriver().driverVersion("100.0.04896.20").setup(); 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(options); } driver.manage().window().setSize(dimension); @@ -89,6 +88,10 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest { return driver; } + public boolean getHeadless() { + return HEADLESS; + } + protected boolean urlContains(String urlPath) { WebDriverWait wait = new WebDriverWait(driver, Duration.ofMillis(5000)); try { diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java index 56b15efd67..737022a096 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java @@ -34,11 +34,10 @@ public class TestListener implements ITestListener { public void onTestSuccess(ITestResult tr) { String str = "Test " + tr.getMethod().getMethodName() + " success"; log.info("*----------------------* " + str + " *----------------------*"); - Allure.getLifecycle().updateTestCase((t) -> { - t.setStatusDetails(t.getStatusDetails().setMessage(str)); - }); - driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); - captureScreen(driver, "success"); + if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { + driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); + captureScreen(driver, "success"); + } } public void onTestFailure(ITestResult tr) { @@ -46,12 +45,10 @@ public class TestListener implements ITestListener { String str1 = "Failed because of - " + tr.getThrowable(); log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str1 + " *----------------------*"); - Allure.getLifecycle().updateTestCase((t) -> { - t.setStatusDetails(t.getStatusDetails().setMessage(str)); - t.setStatusDetails(t.getStatusDetails().setMessage(str1)); - }); - driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); - captureScreen(driver, "failure"); + if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { + driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); + captureScreen(driver, "failure"); + } } public void onTestSkipped(ITestResult tr) { @@ -59,12 +56,10 @@ public class TestListener implements ITestListener { String str1 = "Skipped because of - " + tr.getThrowable(); log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str1 + " *----------------------*"); - Allure.getLifecycle().updateTestCase((t) -> { - t.setStatusDetails(t.getStatusDetails().setMessage(str)); - t.setStatusDetails(t.getStatusDetails().setMessage(str1)); - }); - driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); - captureScreen(driver, "skipped"); + if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { + driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); + captureScreen(driver, "skipped"); + } } public void onStart(ITestContext testContext) { diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java index 4de0244044..df97ffb934 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java @@ -58,7 +58,6 @@ public class SortByNameTest extends AbstractDriverBaseTest { @Description public void specialCharacterUp(String ruleChainName) { testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); - ; sideBarMenuView.ruleChainsBtn().click(); ruleChainsPage.sortByNameBtn().click();