diff --git a/Aquality.Selenium/src/Aquality.Selenium.Images/Aquality.Selenium.Images.csproj b/Aquality.Selenium/src/Aquality.Selenium.Images/Aquality.Selenium.Images.csproj
index d507bb88..0e4f7e93 100644
--- a/Aquality.Selenium/src/Aquality.Selenium.Images/Aquality.Selenium.Images.csproj
+++ b/Aquality.Selenium/src/Aquality.Selenium.Images/Aquality.Selenium.Images.csproj
@@ -40,10 +40,10 @@
-
-
+
+
-
+
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
index 1188b4d9..0e0654cc 100644
--- a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
+++ b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
@@ -91,7 +91,7 @@
-
+
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml
index 71d3c05e..2f12fe41 100644
--- a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml
+++ b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml
@@ -478,7 +478,7 @@
Current instance of .
Version-specific set of parameters.
- For example, take a look at .
+ For example, take a look at .
A task for asynchronous command.
@@ -508,7 +508,7 @@
Current instance of .
Version-specific set of parameters.
- For example, take a look at .
+ For example, take a look at .
A task for asynchronous command.
@@ -544,7 +544,7 @@
Current instance of .
Version-specific set of parameters.
- For example, take a look at .
+ For example, take a look at .
A task for asynchronous command.
@@ -563,7 +563,7 @@
Current instance of .
Version-specific set of parameters.
- For example, take a look at .
+ For example, take a look at .
A task for asynchronous command.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsEmulationExtensions.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsEmulationExtensions.cs
index f8090203..340133ae 100644
--- a/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsEmulationExtensions.cs
+++ b/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsEmulationExtensions.cs
@@ -1,7 +1,7 @@
using Aquality.Selenium.Core.Utilities;
using OpenQA.Selenium.DevTools;
-using OpenQA.Selenium.DevTools.V135.DOM;
-using OpenQA.Selenium.DevTools.V135.Emulation;
+using OpenQA.Selenium.DevTools.V137.DOM;
+using OpenQA.Selenium.DevTools.V137.Emulation;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsPerformanceExtensions.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsPerformanceExtensions.cs
index 4eca62e3..d55d1670 100644
--- a/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsPerformanceExtensions.cs
+++ b/Aquality.Selenium/src/Aquality.Selenium/Browsers/DevToolsPerformanceExtensions.cs
@@ -1,4 +1,4 @@
-using OpenQA.Selenium.DevTools.V135.Performance;
+using OpenQA.Selenium.DevTools.V137.Performance;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj
index 9627bbca..dd206be8 100644
--- a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj
+++ b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj
@@ -34,7 +34,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs
index 12e5a5b4..e6739d46 100644
--- a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs
+++ b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs
@@ -5,7 +5,7 @@
using Aquality.Selenium.Tests.Integration.TestApp.TheInternet.Forms;
using NUnit.Framework;
using OpenQA.Selenium;
-using OpenQA.Selenium.DevTools.V135.Emulation;
+using OpenQA.Selenium.DevTools.V136.Emulation;
using System;
using System.Collections.Generic;
@@ -59,11 +59,11 @@ public void Should_BePossibleTo_SetAndClearDeviceMetricsOverride_WithVersionSpec
{
void setAction(long width, long height, bool isMobile, double scaleFactor)
{
- var parameters = new OpenQA.Selenium.DevTools.V134.Emulation.SetDeviceMetricsOverrideCommandSettings
+ var parameters = new OpenQA.Selenium.DevTools.V136.Emulation.SetDeviceMetricsOverrideCommandSettings
{
- DisplayFeature = new OpenQA.Selenium.DevTools.V134.Emulation.DisplayFeature
+ DisplayFeature = new OpenQA.Selenium.DevTools.V136.Emulation.DisplayFeature
{
- Orientation = OpenQA.Selenium.DevTools.V134.Emulation.DisplayFeatureOrientationValues.Horizontal
+ Orientation = OpenQA.Selenium.DevTools.V136.Emulation.DisplayFeatureOrientationValues.Horizontal
},
Width = width,
Height = height,
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/ImageLocatorTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/ImageLocatorTests.cs
index f5b59eea..6a74862f 100644
--- a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/ImageLocatorTests.cs
+++ b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/ImageLocatorTests.cs
@@ -27,8 +27,14 @@ public void Should_BePossibleTo_FindByImage()
var documentByTag = AqualityServices.Get().GetLabel(By.TagName("body"), "document by tag");
var fullThreshold = 1;
- var documentByImage = AqualityServices.Get().GetLabel(new ByImage(documentByTag.GetElement().GetScreenshot().AsByteArray) { Threshold = fullThreshold },
+ var getDocByImage = () => AqualityServices.Get().GetLabel(new ByImage(documentByTag.GetElement().GetScreenshot().AsByteArray) { Threshold = fullThreshold },
"body screen");
+ ILabel documentByImage = getDocByImage();
+ AqualityServices.ConditionalWait.WaitForTrue(() =>
+ {
+ documentByImage = getDocByImage();
+ return documentByImage.State.IsDisplayed;
+ });
Assert.That(documentByImage.State.IsDisplayed, "Should be possible to find element by document screenshot");
Assert.That((documentByImage.Locator as ByImage)?.Threshold, Is.EqualTo(fullThreshold), "Should be possible to get ByImage threshold");
Assert.That(documentByImage.GetElement().TagName, Is.EqualTo("body"), "Correct element must be found");
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/ManyTools/Forms/ManyToolsForm.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/ManyTools/Forms/ManyToolsForm.cs
index f4deae55..558f11cb 100644
--- a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/ManyTools/Forms/ManyToolsForm.cs
+++ b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/ManyTools/Forms/ManyToolsForm.cs
@@ -10,11 +10,12 @@ namespace Aquality.Selenium.Tests.Integration.TestApp.ManyTools.Forms
{
internal abstract class ManyToolsForm : Form where T : ManyToolsForm
{
- private const string BaseUrl = "https://manytools.org/";
+ private const string BaseUrl = "https://manytools.org/";
protected ManyToolsForm(By locator, string name) : base(locator, name)
{
}
+ private IButton AgreeButton => ElementFactory.GetButton(By.XPath("//button[@mode='primary']"), "Agree");
private ILabel ValueLabel => FormElement.FindChildElement(By.XPath(".//code"), Name);
protected abstract string UrlPart { get; }
@@ -29,6 +30,12 @@ public T Open()
{
AqualityServices.Browser.GoTo(Url);
AqualityServices.Browser.WaitForPageToLoad();
+ State.WaitForDisplayed();
+ if (AgreeButton.State.IsDisplayed)
+ {
+ AgreeButton.Click();
+ AgreeButton.State.WaitForNotDisplayed();
+ }
}, new List { typeof(WebDriverTimeoutException) });
return (T)this;