Merge pull request #2206 from zebrunner/develop

1.1.3
zebrunner · Jun 29, 2023 · f6db5c8 · f6db5c8
2 parents 715e18b + 714d091
commit f6db5c8
Show file tree

Hide file tree

Showing 21 changed files with 1,116 additions and 189 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,13 +49,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>11</java.version>
-        <carina-webdriver.version>1.0.4</carina-webdriver.version>
-        <carina-utils.version>1.0.4</carina-utils.version>
+        <carina-webdriver.version>1.1.5</carina-webdriver.version>
         <!-- Logging -->
         <slf4j.version>1.7.30</slf4j.version>
         <log4j.version>2.17.1</log4j.version>
-        <!-- Commons -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <testng-foundation.version>2.0.1</testng-foundation.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -85,26 +82,6 @@
             <artifactId>carina-webdriver</artifactId>
             <version>${carina-webdriver.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.zebrunner</groupId>
-            <artifactId>carina-utils</artifactId>
-            <version>${carina-utils.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.testng</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.rest-assured</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -128,12 +105,6 @@
             <version>${log4j.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.nordstrom.tools</groupId>
             <artifactId>testng-foundation</artifactId>

diff --git a/src/main/java/com/zebrunner/carina/core/IAbstractTest.java b/src/main/java/com/zebrunner/carina/core/IAbstractTest.java
@@ -27,10 +27,10 @@
 import com.zebrunner.carina.core.listeners.CarinaListener;
 import com.zebrunner.carina.core.listeners.FilterTestsListener;
 import com.zebrunner.carina.core.report.testrail.ITestCases;
-import com.zebrunner.carina.utils.Configuration;
-import com.zebrunner.carina.utils.Configuration.Parameter;
 import com.zebrunner.carina.utils.common.CommonUtils;
+import com.zebrunner.carina.utils.config.Configuration;
 import com.zebrunner.carina.utils.factory.ICustomTypePageFactory;
+import com.zebrunner.carina.webdriver.config.WebDriverConfiguration;
 
 /*
  * IAbstractTest - base test for UI and API tests.
@@ -44,7 +44,7 @@
 @LinkedListeners({ CarinaListener.class, TestRunListener.class, FilterTestsListener.class })
 public interface IAbstractTest extends ICustomTypePageFactory, ITestCases {
 
-    long EXPLICIT_TIMEOUT = Configuration.getLong(Parameter.EXPLICIT_TIMEOUT);
+    long EXPLICIT_TIMEOUT = Configuration.getRequired(WebDriverConfiguration.Parameter.EXPLICIT_TIMEOUT, Long.class);
 
     @BeforeSuite(alwaysRun = true)
     private void onCarinaBeforeSuite() {