Merge branch 'master' into Feature/Add-Multichoice-Combobox

# Conflicts:
#	src/main/resources/localization/be.json
#	src/main/resources/localization/en.json
#	src/main/resources/localization/ru.json

Author: mialeska

.gitignore

@@ -1,9 +1,13 @@
-# Compiled class file
-*.class
+# Build results
+target
+downloads
 
 # Log file
 *.log
 
+# Visualization files
+visualDumps/
+
 # BlueJ files
 *.ctxt
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 Aquality Automation
+   Copyright 2023 Aquality Automation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -13,13 +13,16 @@ Most of performed methods are logged using LOG4J, so you can easily see a histor
 We use interfaces where is possible, so you can implement your own version of target interface with no need to rewrite other classes.
 
 ### Quick start
+To start the project using aquality.selenium framework, you can [download our template BDD project by this link.](https://github.com/aquality-automation/aquality-selenium-java-template)
 
-1. To start work with this package, simply add the dependency to your pom.xml:
+Alternatively, you can follow the steps below:
+
+1. Add the dependency to your pom.xml:
 ```
 <dependency>
     <groupId>com.github.aquality-automation</groupId>
     <artifactId>aquality-selenium</artifactId>
-    <version>LATEST</version>
+    <version>4.x.x</version>
 </dependency>
 ```
 
@@ -47,14 +50,37 @@ txbSearch.submit();
 browser.waitForPageToLoad();
 ```
 
-6. Quit browser at the end
+6. Use BiDi functionality to handle basic authentication:
+```java
+browser.network().addBasicAuthentication("domain.com", "username", "password");
 ```
+or intercept network requests/responses:
+```java
+browser.network().startNetworkInterceptor((HttpHandler) request -> new HttpResponse()
+        .setStatus(HttpStatus.SC_OK)
+        .addHeader("Content-Type", MediaType.HTML_UTF_8.toString())
+        .setContent(utf8String("Some phrase")));
+```
+7. Emulate GeoLocation, Device, Touch, Media, UserAgent overrides, Disable script execution, log HTTP exchange, track Performance metrics, add initialization scripts, and more using browser.devTools() interfaces:
+```java
+final double latitude = 53.90772672521578;
+final double longitude = 27.458060411865375;
+final double accuracy = 0.97;
+browser.devTools().emulation().setGeolocationOverride(latitude, longitude, accuracy);
+```
+See more DevTools use cases [here](./src/test/java/tests/usecases/devtools)
+
+8. Quit browser at the end
+```java
 browser.quit();
 ```
 
-See full example [here](./src/test/java/tests/usecases/QuickStartExample.java)
+See quick start example [here](./src/test/java/tests/usecases/QuickStartExample.java)
 
 ### Documentation
 To get more details please look at documentation:
 - [In English](https://github.com/aquality-automation/aquality-selenium-java/wiki/Overview-(English))
 - [In Russian](https://github.com/aquality-automation/aquality-selenium-java/wiki/Overview-(Russian))
+
+### License
+Library's source code is made available under the [Apache 2.0 license](LICENSE).

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.aquality-automation</groupId>
     <artifactId>aquality-selenium</artifactId>
-    <version>2.5.2</version>
+    <version>4.0.0</version>
     <packaging>jar</packaging>
     <name>Aquality Selenium</name>
     <description>Library around Selenium WebDriver</description>
@@ -67,55 +67,39 @@
             <id>knysh</id>
             <name>Sergey Knysh</name>
         </developer>
+        <developer>
+            <id>d2kravchenko</id>
+            <name>Dmitry Kravchenko</name>
+        </developer>
+        <developer>
+            <id>aPavar</id>
+            <name>Andrey Pavar</name>
+        </developer>
     </developers>
 
     <dependencies>
         <dependency>
             <groupId>com.github.aquality-automation</groupId>
             <artifactId>aquality-selenium-core</artifactId>
-            <version>1.2.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>3.141.59</version>
+            <version>3.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.bonigarcia</groupId>
             <artifactId>webdrivermanager</artifactId>
-            <version>4.2.0</version>
+            <version>5.3.2</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9</version>
+            <version>2.14.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.14.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.26</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.26</version>
+            <version>7.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -239,4 +223,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

src/main/java/aquality/selenium/browser/Browser.java

@@ -1,26 +1,28 @@
 package aquality.selenium.browser;
 
+import aquality.selenium.browser.devtools.DevToolsHandling;
+import aquality.selenium.browser.devtools.JavaScriptHandling;
+import aquality.selenium.browser.devtools.NetworkHandling;
 import aquality.selenium.configuration.IBrowserProfile;
 import aquality.selenium.configuration.ITimeoutConfiguration;
 import aquality.selenium.core.applications.IApplication;
 import aquality.selenium.core.localization.ILocalizationManager;
 import aquality.selenium.core.localization.ILocalizedLogger;
 import aquality.selenium.core.waitings.IConditionalWait;
 import org.apache.commons.io.IOUtils;
-import org.openqa.selenium.Alert;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.NoAlertPresentException;
-import org.openqa.selenium.OutputType;
+import org.apache.commons.lang3.NotImplementedException;
+import org.openqa.selenium.*;
 import org.openqa.selenium.WebDriver.Navigation;
+import org.openqa.selenium.devtools.HasDevTools;
 import org.openqa.selenium.logging.LogEntries;
+import org.openqa.selenium.remote.Augmenter;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 public class Browser implements IApplication {
@@ -32,6 +34,7 @@ public class Browser implements IApplication {
     private final ILocalizationManager localizationManager;
     private final ILocalizedLogger localizedLogger;
 
+    private DevToolsHandling devTools;
     private Duration implicitTimeout;
 
     public Browser(RemoteWebDriver remoteWebDriver) {
@@ -42,7 +45,7 @@ public Browser(RemoteWebDriver remoteWebDriver) {
         this.timeouts = AqualityServices.get(ITimeoutConfiguration.class);
         webDriver = remoteWebDriver;
         this.implicitTimeout = timeouts.getImplicit();
-        getDriver().manage().timeouts().implicitlyWait(implicitTimeout.getSeconds(), TimeUnit.SECONDS);
+        getDriver().manage().timeouts().implicitlyWait(implicitTimeout);
         setPageLoadTimeout(timeouts.getPageLoad());
         setScriptTimeout(timeouts.getScript());
     }
@@ -151,7 +154,7 @@ public IBrowserTabNavigation tabs() {
     public void setPageLoadTimeout(Duration timeout) {
         if (!getBrowserName().equals(BrowserName.SAFARI)) {
             localizedLogger.debug("loc.browser.page.load.timeout", timeout.getSeconds());
-            getDriver().manage().timeouts().pageLoadTimeout(timeout.getSeconds(), TimeUnit.SECONDS);
+            getDriver().manage().timeouts().pageLoadTimeout(timeout);
         }
     }
 
@@ -164,7 +167,7 @@ public void setPageLoadTimeout(Duration timeout) {
     public void setImplicitWaitTimeout(Duration timeout) {
         if (!timeout.equals(getImplicitWaitTimeout())) {
             localizedLogger.debug("loc.browser.implicit.timeout", timeout.getSeconds());
-            getDriver().manage().timeouts().implicitlyWait(timeout.getSeconds(), TimeUnit.SECONDS);
+            getDriver().manage().timeouts().implicitlyWait(timeout);
             implicitTimeout = timeout;
         }
     }
@@ -176,7 +179,7 @@ public void setImplicitWaitTimeout(Duration timeout) {
      */
     public void setScriptTimeout(Duration timeout) {
         localizedLogger.debug("loc.browser.script.timeout", timeout.getSeconds());
-        getDriver().manage().timeouts().setScriptTimeout(timeout.getSeconds(), TimeUnit.SECONDS);
+        getDriver().manage().timeouts().scriptTimeout(timeout);
     }
 
     /**
@@ -262,6 +265,17 @@ public Object executeScript(final String script, Object... arguments) {
         return executeJavaScript(() -> getDriver().executeScript(script, arguments));
     }
 
+    /**
+     * Executes JS (jQuery) script.
+     *
+     * @param script Script pinned with {@link Browser#javaScriptEngine()}.
+     * @param arguments Arguments for the script (web elements, values etc.
+     * @return Result object of script execution
+     */
+    public Object executeScript(final ScriptKey script, Object... arguments) {
+        return executeJavaScript(() -> getDriver().executeScript(script, arguments));
+    }
+
     private Object executeJavaScript(Supplier<Object> executeScriptFunc) {
         Object result = executeScriptFunc.get();
         return result instanceof Boolean ? Boolean.parseBoolean(result.toString()) : result;
@@ -368,4 +382,41 @@ public final BrowserName getBrowserName() {
     private Duration getImplicitWaitTimeout() {
         return implicitTimeout;
     }
+
+    /**
+     * Provides interface to handle DevTools for Chromium-based and Firefox drivers.
+     * @return an instance of {@link DevToolsHandling}
+     */
+    public DevToolsHandling devTools() {
+        if (devTools != null) {
+            return devTools;
+        }
+        WebDriver driver = getDriver();
+        if (!(driver instanceof HasDevTools)) {
+            driver = new Augmenter().augment(driver);
+        }
+        if (driver instanceof HasDevTools) {
+            devTools = new DevToolsHandling((HasDevTools) driver);
+            return devTools;
+        }
+        else {
+            throw new NotImplementedException("DevTools protocol is not supported for current browser.");
+        }
+    }
+
+    /**
+     * Provides Network Handling functionality
+     * @return an instance of {@link NetworkHandling}
+     */
+    public NetworkHandling network() {
+        return devTools().network();
+    }
+
+    /**
+     * Provides JavaScript Monitoring functionality.
+     * @return an instance of {@link JavaScriptHandling}
+     */
+    public JavaScriptHandling javaScriptEngine() {
+        return devTools().javaScript();
+    }
 }

src/main/java/aquality/selenium/browser/BrowserName.java

@@ -5,5 +5,8 @@ public enum BrowserName {
     EDGE,
     FIREFOX,
     IEXPLORER,
-    SAFARI
+    OPERA,
+    OTHER,
+    SAFARI,
+    YANDEX
 }

src/main/java/aquality/selenium/browser/JavaScript.java

@@ -33,14 +33,16 @@ public enum JavaScript {
     SELECT_COMBOBOX_VALUE_BY_TEXT("selectComboboxValueByText.js"),
     SET_FOCUS("setFocus.js"),
     SET_VALUE("setValue.js"),
+    SET_ATTRIBUTE("setAttribute.js"),
     SCROLL_BY("scrollBy.js"),
     IS_PAGE_LOADED("isPageLoaded.js"),
     SCROLL_WINDOW_BY("scrollWindowBy.js"),
     SET_INNER_HTML("setInnerHTML.js"),
     GET_VIEWPORT_COORDINATES("getViewPortCoordinates.js"),
     GET_SCREEN_OFFSET("getScreenOffset.js"),
     OPEN_IN_NEW_TAB("openInNewTab.js"),
-    OPEN_NEW_TAB("openNewTab.js");
+    OPEN_NEW_TAB("openNewTab.js"),
+    EXPAND_SHADOW_ROOT("expandShadowRoot.js");
 
     private final String filename;
 
@@ -55,11 +57,12 @@ public enum JavaScript {
      */
     public String getScript() {
         URL scriptFile = getClass().getResource("/js/" + filename);
-        try {
-            InputStream stream = scriptFile.openStream();
-            return IOUtils.toString(stream, StandardCharsets.UTF_8.name());
-        } catch (IOException e) {
-            Logger.getInstance().fatal(format("Couldn't find the script \"%s\"", filename), e);
+        if (scriptFile != null) {
+            try (InputStream stream = scriptFile.openStream()) {
+                return IOUtils.toString(stream, StandardCharsets.UTF_8.name());
+            } catch (IOException e) {
+                Logger.getInstance().fatal(format("Couldn't find the script \"%s\"", filename), e);
+            }
         }
         return "";
     }