Feature/support edge chromium (#190)

knysh · web-flow · commit be8dc19f1565 · 2020-06-22T15:56:41.000+03:00
+semver: feature
* add edge chromium

* hotfix for Should_BePossibleTo_ScrollWindowBy

* remane some methods

* removed webDriverVersion for edge

* updated PackageReference

* update comment

* update chome version on azure
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
@@ -65,6 +65,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Edge.SeleniumTools" Version="3.141.1" />
     <PackageReference Include="Aquality.Selenium.Core" Version="1.1.1" />
     <PackageReference Include="WebDriverManager" Version="2.9.1" />
   </ItemGroup>
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs
@@ -383,6 +383,7 @@ public enum BrowserName
     {
         Chrome,
         Edge,
+        EdgeChromium,
         Firefox,
         IExplorer,
         Safari
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/LocalBrowserFactory.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/LocalBrowserFactory.cs
@@ -14,6 +14,9 @@
 using WebDriverManager.DriverConfigs;
 using WebDriverManager.DriverConfigs.Impl;
 using WebDriverManager.Helpers;
+using EdgeChromiumOptions = Microsoft.Edge.SeleniumTools.EdgeOptions;
+using EdgeChromiumService = Microsoft.Edge.SeleniumTools.EdgeDriverService;
+using EdgeChromiumDriver = Microsoft.Edge.SeleniumTools.EdgeDriver;
 
 namespace Aquality.Selenium.Browsers
 {
@@ -59,6 +62,11 @@ private Browser CreateBrowser()
                     driver = GetDriver<EdgeDriver>(EdgeDriverService.CreateDefaultService(),
                         (EdgeOptions)driverSettings.DriverOptions, commandTimeout);
                     break;
+                case BrowserName.EdgeChromium:
+                    SetUpDriver(new EdgeConfig(), driverSettings);
+                    driver = GetDriver<EdgeChromiumDriver>(EdgeChromiumService.CreateChromiumService(),
+                        (EdgeChromiumOptions)driverSettings.DriverOptions, commandTimeout);
+                    break;
                 case BrowserName.Safari:
                     driver = GetDriver<SafariDriver>(SafariDriverService.CreateDefaultService(),
                         (SafariOptions)driverSettings.DriverOptions, commandTimeout);
@@ -72,7 +80,7 @@ private Browser CreateBrowser()
 
         private RemoteWebDriver GetDriver<T>(DriverService driverService, DriverOptions driverOptions, TimeSpan commandTimeout) where T : RemoteWebDriver
         {
-            return AqualityServices.Get<IActionRetrier>().DoWithRetry(() => 
+            return AqualityServices.Get<IActionRetrier>().DoWithRetry(() =>
                 (T)Activator.CreateInstance(typeof(T), driverService, driverOptions, commandTimeout));
         }
 
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/BrowserProfile.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/BrowserProfile.cs
@@ -45,6 +45,8 @@ public IDriverSettings DriverSettings
                         return new InternetExplorerSettings(settingsFile);
                     case BrowserName.Safari:
                         return new SafariSettings(settingsFile);
+                    case BrowserName.EdgeChromium:
+                        return new EdgeChromiumSettings(settingsFile);
                     default:
                         throw new InvalidOperationException($"There is no assigned behaviour for retrieving DriverSettings for browser {BrowserName}");
                 }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/EdgeChromiumSettings.cs b/Aquality.Selenium/src/Aquality.Selenium/Configurations/WebDriverSettings/EdgeChromiumSettings.cs
@@ -0,0 +1,56 @@
+﻿using System;
+using Aquality.Selenium.Browsers;
+using Aquality.Selenium.Core.Configurations;
+using Microsoft.Edge.SeleniumTools;
+using OpenQA.Selenium;
+
+namespace Aquality.Selenium.Configurations.WebDriverSettings
+{
+    /// <summary>
+    /// Settings specific for Edge(chromium) web driver.
+    /// </summary>
+    public class EdgeChromiumSettings : DriverSettings
+    {
+        /// <summary>
+        /// Instantiates class using JSON file with general settings
+        /// </summary>
+        /// <param name="settingsFile">JSON settings file.</param>
+        public EdgeChromiumSettings(ISettingsFile settingsFile) : base(settingsFile)
+        {
+        }
+
+        protected override BrowserName BrowserName => BrowserName.EdgeChromium;
+
+        public override string DownloadDirCapabilityKey => "download.default_directory";
+
+        public override DriverOptions DriverOptions
+        {
+            get
+            {
+                var options = new EdgeOptions()
+                {
+                    UseChromium = true
+                };
+                SetEdgeChromiumPrefs(options);
+                SetCapabilities(options, (name, value) => options.AddAdditionalCapability(name, value, isGlobalCapability: true));
+                SetEdgeChromiumArguments(options);
+                SetPageLoadStratergy(options);
+                return options;
+            }
+        }
+
+        private void SetEdgeChromiumPrefs(EdgeOptions options)
+        {
+            foreach (var option in BrowserOptions)
+            {
+                var value = option.Key == DownloadDirCapabilityKey ? DownloadDir : option.Value;
+                options.AddUserProfilePreference(option.Key, value);
+            }
+        }
+
+        private void SetEdgeChromiumArguments(EdgeOptions options)
+        {
+            options.AddArguments(BrowserStartArguments);
+        }
+    }
+}
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json b/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json
@@ -59,14 +59,28 @@
       "startArguments": []
     },
     "edge": {
-      "webDriverVersion": "Latest",
       "systemArchitecture": "X32",
       "capabilities": {
       },
       "options": {
       },
       "startArguments": []
     },
+    "edgechromium": {
+      "webDriverVersion": "82.0.458.0",
+      "capabilities": {
+        "enableVNC": true
+      },
+      "options": {
+        "intl.accept_languages": "en",
+        "safebrowsing.enabled": "true",
+        "profile.default_content_settings.popups": "0",
+        "disable-popup-blocking": "true",
+        "download.prompt_for_download": "false",
+        "download.default_directory": "./downloads"
+      },
+      "startArguments": []
+    },
     "safari": {
       "options": {
         "safari.options.dataDir": "/Users/username/Downloads"
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/Actions/JsActionsTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/Actions/JsActionsTests.cs
@@ -149,7 +149,8 @@ public void Should_BePossibleTo_ScrollBy()
             homeDemoSiteForm.FirstScrollableExample.JsActions.ScrollBy(point.X, point.Y);
             var currentCoordinates = AqualityServices.Browser
                 .ExecuteScriptFromFile<IList<object>>("Resources.GetScrollCoordinates.js",
-                    homeDemoSiteForm.FirstScrollableExample.GetElement()).Select(item => int.Parse(item.ToString()))
+                    homeDemoSiteForm.FirstScrollableExample.GetElement()).
+                    Select(item => (int)Math.Round(double.Parse(item.ToString())))
                 .ToList();
             var actualPoint = new Point(currentCoordinates[0], currentCoordinates[1]);
             Assert.AreEqual(point, actualPoint, $"Current coordinates should be '{point}'");
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/BrowserTests.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/BrowserTests.cs
@@ -195,7 +195,7 @@ public void Should_BePossibleTo_ScrollWindowBy()
             var initialY = sliderForm.FormPointInViewPort.Y;
             var formHeight = sliderForm.Size.Height;
             browser.ScrollWindowBy(0, formHeight);
-            Assert.AreEqual(formHeight, initialY - sliderForm.FormPointInViewPort.Y);
+            Assert.LessOrEqual(Math.Abs(formHeight - (initialY - sliderForm.FormPointInViewPort.Y)), 1, "Window should be scrolled.");
         }
 
         [Test]
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.azure.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.azure.json
@@ -6,7 +6,7 @@
 
   "driverSettings": {
     "chrome": {
-      "webDriverVersion": "80.0.3987.106",
+      "webDriverVersion": "83.0.4103.39",
       "capabilities": {
         "enableVNC": true
       },
@@ -52,6 +52,29 @@
       "options": {},
       "startArguments": []
     },
+    "edge": {
+      "systemArchitecture": "X64",
+      "capabilities": {
+      },
+      "options": {
+      },
+      "startArguments": []
+    },
+    "edgechromium": {
+      "webDriverVersion": "82.0.458.0",
+      "capabilities": {
+        "enableVNC": true
+      },
+      "options": {
+        "intl.accept_languages": "en",
+        "safebrowsing.enabled": "true",
+        "profile.default_content_settings.popups": "0",
+        "disable-popup-blocking": "true",
+        "download.prompt_for_download": "false",
+        "download.default_directory": "./downloads"
+      },
+      "startArguments": []
+    },
     "safari": {
       "options": {
         "safari.options.dataDir": "/Users/username/Downloads"
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json
@@ -52,6 +52,29 @@
         "elementScrollBehavior": 2
       }
     },
+    "edge": {
+      "systemArchitecture": "X64",
+      "capabilities": {
+      },
+      "options": {
+      },
+      "startArguments": []
+    },
+    "edgechromium": {
+      "webDriverVersion": "82.0.458.0",
+      "capabilities": {
+        "enableVNC": true
+      },
+      "options": {
+        "intl.accept_languages": "en",
+        "safebrowsing.enabled": "true",
+        "profile.default_content_settings.popups": "0",
+        "disable-popup-blocking": "true",
+        "download.prompt_for_download": "false",
+        "download.default_directory": "./downloads"
+      },
+      "startArguments": []
+    },
     "safari": {
       "options": {
         "safari.options.dataDir": "/Users/username/Downloads"
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json
@@ -55,6 +55,29 @@
       "options": {},
       "startArguments": []
     },
+    "edge": {
+      "systemArchitecture": "X64",
+      "capabilities": {
+      },
+      "options": {
+      },
+      "startArguments": []
+    },
+    "edgechromium": {
+      "webDriverVersion": "82.0.458.0",
+      "capabilities": {
+        "enableVNC": true
+      },
+      "options": {
+        "intl.accept_languages": "en",
+        "safebrowsing.enabled": "true",
+        "profile.default_content_settings.popups": "0",
+        "disable-popup-blocking": "true",
+        "download.prompt_for_download": "false",
+        "download.default_directory": "./downloads"
+      },
+      "startArguments": []
+    },
     "safari": {
       "options": {
         "safari.options.dataDir": "/Users/username/Downloads"

Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,7 @@ public enum BrowserName`
`383`	`383`	`{`
`384`	`384`	`Chrome,`
`385`	`385`	`Edge,`
	`386`	`+ EdgeChromium,`
`386`	`387`	`Firefox,`
`387`	`388`	`IExplorer,`
`388`	`389`	`Safari`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ public IDriverSettings DriverSettings`
`45`	`45`	`return new InternetExplorerSettings(settingsFile);`
`46`	`46`	`case BrowserName.Safari:`
`47`	`47`	`return new SafariSettings(settingsFile);`
	`48`	`+ case BrowserName.EdgeChromium:`
	`49`	`+ return new EdgeChromiumSettings(settingsFile);`
`48`	`50`	`default:`
`49`	`51`	`throw new InvalidOperationException($"There is no assigned behaviour for retrieving DriverSettings for browser {BrowserName}");`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public void Should_BePossibleTo_ScrollWindowBy()`
`195`	`195`	`var initialY = sliderForm.FormPointInViewPort.Y;`
`196`	`196`	`var formHeight = sliderForm.Size.Height;`
`197`	`197`	`browser.ScrollWindowBy(0, formHeight);`
`198`		`- Assert.AreEqual(formHeight, initialY - sliderForm.FormPointInViewPort.Y);`
	`198`	`+ Assert.LessOrEqual(Math.Abs(formHeight - (initialY - sliderForm.FormPointInViewPort.Y)), 1, "Window should be scrolled.");`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`[Test]`