Browse Source

add chrome options for run in https

pull/7746/head
Serafym Tuhai 4 years ago
parent
commit
ca4ae89367
  1. 2
      msa/black-box-tests/README.md
  2. 18
      msa/black-box-tests/pom.xml
  3. 5
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDiverBaseTest.java
  4. 3
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/Const.java
  5. 21
      pom.xml

2
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 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 mvn clean install -DblackBoxTests.skip=false -DsuiteFile=src/test/resources/smokeTests.xml

18
msa/black-box-tests/pom.xml

@ -34,6 +34,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir> <main.dir>${basedir}/../..</main.dir>
<suiteFile>src/test/resources/testNG.xml</suiteFile>
</properties> </properties>
<dependencies> <dependencies>
@ -163,28 +164,19 @@
<dependency> <dependency>
<groupId>org.seleniumhq.selenium</groupId> <groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId> <artifactId>selenium-java</artifactId>
<version>4.5.3</version> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.bonigarcia</groupId> <groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId> <artifactId>webdrivermanager</artifactId>
<version>5.3.0</version> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.qameta.allure</groupId> <groupId>io.qameta.allure</groupId>
<artifactId>allure-testng</artifactId> <artifactId>allure-testng</artifactId>
<version>2.19.0</version> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -192,7 +184,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<suiteXmlFiles> <suiteXmlFiles>
<suiteXmlFile>src/test/resources/testNG.xml</suiteXmlFile> <suiteXmlFile>${suiteFile}</suiteXmlFile>
</suiteXmlFiles> </suiteXmlFiles>
<skipTests>${blackBoxTests.skip}</skipTests> <skipTests>${blackBoxTests.skip}</skipTests>
</configuration> </configuration>

5
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 *----------------------*"); log.info("*----------------------* Setup driver *----------------------*");
if (HEADLESS == true) { if (HEADLESS == true) {
ChromeOptions options = new ChromeOptions(); ChromeOptions options = new ChromeOptions();
options.addArguments("--ignore-certificate-errors");
options.addArguments("--no-sandbox"); options.addArguments("--no-sandbox");
options.addArguments("--disable-dev-shm-usage"); options.addArguments("--disable-dev-shm-usage");
options.addArguments("--headless"); options.addArguments("--headless");
WebDriverManager.chromedriver().setup(); WebDriverManager.chromedriver().setup();
driver = new ChromeDriver(options); driver = new ChromeDriver(options);
} else { } else {
ChromeOptions options = new ChromeOptions();
options.addArguments("--ignore-certificate-errors");
WebDriverManager.chromedriver().setup(); WebDriverManager.chromedriver().setup();
driver = new ChromeDriver(); driver = new ChromeDriver(options);
} }
driver.manage().window().setSize(dimension); driver.manage().window().setSize(dimension);
} }

3
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; 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; import static org.thingsboard.server.msa.ui.base.AbstractBasePage.getRandomNumber;
public class Const { 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_EMAIL = "tenant@thingsboard.org";
public static final String TENANT_PASSWORD = "tenant"; public static final String TENANT_PASSWORD = "tenant";
public static final String ENTITY_NAME = "Az!@#$%^&*()_-+=~`" + getRandomNumber(); public static final String ENTITY_NAME = "Az!@#$%^&*()_-+=~`" + getRandomNumber();

21
pom.xml

@ -144,6 +144,9 @@
<jgit.version>6.1.0.202203080745-r</jgit.version> <jgit.version>6.1.0.202203080745-r</jgit.version>
<exp4j.version>0.4.8</exp4j.version> <exp4j.version>0.4.8</exp4j.version>
<aerogear-otp.version>1.0.0</aerogear-otp.version> <aerogear-otp.version>1.0.0</aerogear-otp.version>
<selenium.version>4.1.1</selenium.version>
<webdrivermanager.version>5.3.0</webdrivermanager.version>
<allure-testng.version>2.19.0</allure-testng.version>
</properties> </properties>
<modules> <modules>
@ -1656,6 +1659,24 @@
<version>${rest-assured.version}</version> <version>${rest-assured.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>${selenium.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>${webdrivermanager.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-testng</artifactId>
<version>${allure-testng.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId> <artifactId>hamcrest-all</artifactId>

Loading…
Cancel
Save