Merge branch 'master' of https://github.com/aquality-automation/aqual…

…ity-selenium-dotnet into #262-add-drivercontext

Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj

@@ -87,7 +87,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aquality.Selenium.Core" Version="3.0.10" />
+    <PackageReference Include="Aquality.Selenium.Core" Version="3.1.1" />
     <PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
     <PackageReference Include="WebDriverManager" Version="2.17.4" />
 	<PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />

Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs

@@ -10,6 +10,8 @@
 using System.Collections.ObjectModel;
 
 using IDevTools = OpenQA.Selenium.DevTools.IDevTools;
+using OpenQA.Selenium.Interactions;
+using static OpenQA.Selenium.Interactions.WheelInputDevice;
 
 namespace Aquality.Selenium.Browsers
 {
@@ -322,9 +324,32 @@ public ReadOnlyCollection<LogEntry> GetLogs(string logKind)
         /// <param name="y">Vertical coordinate.</param>
         public void ScrollWindowBy(int x, int y)
         {
+            Logger.Info("loc.scrolling.by", x, y);
+            new Actions(Driver).ScrollByAmount(x, y).Perform();
+        }
+
+        /// <summary>
+        /// Scrolls window by coordinates using JavaScript.
+        /// </summary>
+        /// <param name="x">Horizontal coordinate.</param>
+        /// <param name="y">Vertical coordinate.</param>
+        public void ScrollWindowByViaJs(int x, int y)
+        {
+            Logger.Info("loc.scrolling.by.js", x, y);
             ExecuteScript(JavaScript.ScrollWindowBy, x, y);
         }
 
+        /// <summary>
+        /// Scrolls portion of screen from specified origin
+        /// </summary>
+        /// <param name="scrollOrigin">Origination point (either viewport or element, with possible offset).</param>
+        /// <param name="x">Horizontal coordinate.</param>
+        /// <param name="y">Vertical coordinate.</param>
+        public void ScrollFromOrigin(ScrollOrigin scrollOrigin, int x, int y)
+        {
+            new Actions(Driver).ScrollFromOrigin(scrollOrigin, x, y).Perform();
+        }
+
         /// <summary>
         /// Executes JS script from embedded resource file (*.js).
         /// </summary>

Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserNavigation.cs

@@ -1,6 +1,7 @@
 using Aquality.Selenium.Core.Localization;
 using OpenQA.Selenium;
 using System;
+using System.Threading.Tasks;
 
 namespace Aquality.Selenium.Browsers
 {
@@ -28,6 +29,16 @@ public void Back()
             driver.Navigate().Back();
         }
 
+        /// <summary>
+        /// Move back a single entry in the browser's history as an asynchronous task.
+        /// </summary>
+        /// <returns>A task object representing the asynchronous operation.</returns>
+        public Task BackAsync()
+        {
+            Logger.Info("loc.browser.back");
+            return driver.Navigate().BackAsync();
+        }
+
         /// <summary>
         /// Navigates forward.
         /// </summary>
@@ -37,6 +48,16 @@ public void Forward()
             driver.Navigate().Forward();
         }
 
+        /// <summary>
+        /// Move a single "item" forward in the browser's history as an asynchronous task.
+        /// </summary>
+        /// <returns>A task object representing the asynchronous operation.</returns>
+        public Task ForwardAsync()
+        {
+            Logger.Info("loc.browser.forward");
+            return driver.Navigate().ForwardAsync();
+        }
+
         /// <summary>
         /// Navigates to desired url.
         /// </summary>
@@ -77,6 +98,28 @@ public void GoToUrl(Uri url)
             }
         }
 
+        /// <summary>
+        /// Navigate to a url as an asynchronous task.
+        /// </summary>
+        /// <param name="url">String representation of where you want the browser to go.</param>
+        /// <returns>A task object representing the asynchronous operation.</returns>
+        public Task GoToUrlAsync(string url)
+        {
+            InfoLocNavigate(url);
+            return driver.Navigate().GoToUrlAsync(url);
+        }
+
+        /// <summary>
+        /// Navigate to a url as an asynchronous task.
+        /// </summary>
+        /// <param name="url">Uri object of where you want the browser to go.</param>
+        /// <returns>A task object representing the asynchronous operation.</returns>
+        public Task GoToUrlAsync(Uri url)
+        {
+            InfoLocNavigate(url.ToString());
+            return driver.Navigate().GoToUrlAsync(url);
+        }
+
         /// <summary>
         /// Refreshes current page.
         /// </summary>
@@ -86,6 +129,16 @@ public void Refresh()
             driver.Navigate().Refresh();
         }
 
+        /// <summary>
+        /// Reload the current page as an asynchronous task.
+        /// </summary>
+        /// <returns>A task object representing the asynchronous operation.</returns>
+        public Task RefreshAsync()
+        {
+            Logger.Info("loc.browser.refresh");
+            return driver.Navigate().RefreshAsync();
+        }
+
         private void InfoLocNavigate(string url)
         {
             Logger.Info("loc.browser.navigate", url);

Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserWindowNavigation.cs

@@ -2,7 +2,6 @@
 using OpenQA.Selenium;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Aquality.Selenium.Browsers
 {