Add method to navigate to URI + downloading test workaround +semver: …

…feature (#226) * Lowercase logging preference key * Add method to navigate to URI + downloading test workaround * Try to stabilize GeoLocation test
aquality-automation · Jan 11, 2023 · 80513d8 · 80513d8
1 parent 66b9074
commit 80513d8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs
@@ -171,6 +171,15 @@ public void GoTo(string url)
             Navigate().GoToUrl(url);
         }
 
+        /// <summary>
+        /// Navigates to desired URL.
+        /// </summary>
+        /// <param name="url">Desired URL.</param>
+        public void GoTo(Uri url)
+        {
+            Navigate().GoToUrl(url);
+        }
+
         /// <summary>
         /// Navigates back.
         /// </summary>

diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/DriverSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/DriverSettings.cs
@@ -182,7 +182,7 @@ protected void SetLoggingPreferences(DriverOptions options)
         {
             foreach (var preference in LoggingPreferences)
             {
-                options.SetLoggingPreference(preference.Key, preference.Value);
+                options.SetLoggingPreference(preference.Key.ToLower(), preference.Value);
             }
         }
 

diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs
@@ -134,6 +134,7 @@ private static void CheckGeolocationOverride(Action<double?, double?, double?> s
             Assert.AreEqual(LongitudeForOverride, locationForm.Longitude, "Longitude should match to override value");
 
             clearAction();
+            AqualityServices.Browser.WaitForPageToLoad();
             AqualityServices.Browser.Refresh();
             locationForm.DetectBrowserGeolocation();
             Assert.AreEqual(defaultLatitude, locationForm.Latitude, "Latitude should match to default");

diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/Usecases/FileDownloadingTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/Usecases/FileDownloadingTests.cs
@@ -24,13 +24,22 @@ public void Should_BePossibleTo_DownloadTextFile()
             var lblFileContent = AqualityServices.Get<IElementFactory>().GetLabel(By.XPath("//pre"), "text file content");
             Assert.False(FileDownloadHelper.IsFileDownloaded(filePath, lblFileContent), $"file {filePath} should not exist before downloading");
 
+            var oldWindowHandle = browser.Tabs().CurrentTabHandle;
             browser.ExecuteScriptFromFile("Resources.OpenUrlInNewWindow.js", downloaderForm.Url);
-            var tabs = new List<string>(AqualityServices.Browser.Driver.WindowHandles);
 
-            browser.Driver.SwitchTo().Window(tabs[1]);
+            browser.Tabs().SwitchToLastTab();
             downloaderForm.Open();
-            downloaderForm.GetDownloadLink(fileName).JsActions.ClickAndWait();
-            browser.Driver.SwitchTo().Window(tabs[0]);
+            var downloadLink = downloaderForm.GetDownloadLink(fileName);
+            if (downloadLink.State.IsDisplayed)
+            {
+                downloadLink.JsActions.ClickAndWait();
+            }
+            else
+            {
+                browser.GoTo(new Uri($"{downloaderForm.Url}/{fileName}"));
+            }
+
+            browser.Tabs().SwitchToTab(oldWindowHandle);
             bool condition() => FileDownloadHelper.IsFileDownloaded(filePath, lblFileContent);
             var message = $"file {filePath} was not downloaded";
             try
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,7 +182,7 @@ protected void SetLoggingPreferences(DriverOptions options) @@
             {
                 foreach (var preference in LoggingPreferences)
                 {
-                    options.SetLoggingPreference(preference.Key, preference.Value);
+                    options.SetLoggingPreference(preference.Key.ToLower(), preference.Value);
                 }
             }
@@ Expand Down @@