Merge pull request #55 from csf-dev/issue-54

Resolves #53 and #54 - Fix issues with Quirks

Author: craigfowler

CSF.Extensions.WebDriver.Tests/CSF.Extensions.WebDriver.Tests.csproj

@@ -32,7 +32,7 @@
 
   <ItemGroup>
     <Content Include="appsettings.*.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 

CSF.Extensions.WebDriver.Tests/Factories/WebDriverFactoryIntegrationTests.cs

@@ -41,11 +41,55 @@ public void DriverTypeNorOptionsTypeShouldBeMandatoryIfACustomFactoryTypeIsSpeci
         Assert.That(() => driver.WebDriver.GetBrowserId(), Is.Not.Null);
     }
 
-    IServiceProvider GetServiceProvider(Action<WebDriverCreationOptionsCollection>? configureOptions = null)
+    [Test]
+    public void GetWebDriverShouldReturnADriverWithTheCorrectQuirksForChrome()
+    {
+        var services = GetServiceProvider(extraRegistrations: services => services.AddWebDriverQuirks(GetCommonBrowserQuirks()));
+
+        var driverFactory = services.GetRequiredService<IGetsWebDriver>();
+        using var driver = driverFactory.GetWebDriver("Chrome");
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(driver.WebDriver.HasQuirk("IAmChrome"), Is.True, "Chrome quirk");
+            Assert.That(driver.WebDriver.HasQuirk("IAmFirefox"), Is.False, "Firefox quirk");            
+        });
+    }
+
+    [Test]
+    public void GetWebDriverShouldReturnADriverWithTheCorrectQuirksForFirefox()
+    {
+        var services = GetServiceProvider(extraRegistrations: services => services.AddWebDriverQuirks(GetCommonBrowserQuirks()));
+
+        var driverFactory = services.GetRequiredService<IGetsWebDriver>();
+        using var driver = driverFactory.GetWebDriver("Firefox");
+
+        Assert.Multiple(() =>
+        {
+            Assert.That(driver.WebDriver.HasQuirk("IAmChrome"), Is.False, "Chrome quirk");
+            Assert.That(driver.WebDriver.HasQuirk("IAmFirefox"), Is.True, "Firefox quirk");            
+        });
+    }
+
+    Quirks.QuirksData GetCommonBrowserQuirks()
+    {
+        return new ()
+        {
+            Quirks = new Dictionary<string, Quirks.BrowserInfoCollection>
+            {
+                { "IAmChrome", new () { AffectedBrowsers = new HashSet<Quirks.BrowserInfo>() { new () { Name = "chrome" } } } },
+                { "IAmFirefox", new () { AffectedBrowsers = new HashSet<Quirks.BrowserInfo>() { new () { Name = "firefox" } } } },
+            }
+        };
+    }
+
+    IServiceProvider GetServiceProvider(Action<WebDriverCreationOptionsCollection>? configureOptions = null,
+                                        Action<IServiceCollection>? extraRegistrations = null)
     {
         var services = new ServiceCollection();
         services.AddSingleton(GetConfiguration());
         services.AddWebDriverFactory(configureOptions: configureOptions);
+        extraRegistrations?.Invoke(services);
         services.AddLogging();
         return services.BuildServiceProvider();
     }

CSF.Extensions.WebDriver.Tests/Identification/BrowserInfoMatcherTests.cs

@@ -13,6 +13,14 @@ public void MatchesShouldReturnTrueWhenOnlyTheBrowserNameMatches(BrowserInfoMatc
         Assert.That(() => sut.Matches(browserId, browserInfo), Is.True);
     }
 
+    [Test,AutoMoqData]
+    public void MatchesShouldUseACaseInsensitiveMatchForBrowserName(BrowserInfoMatcher sut)
+    {
+        var browserId = new BrowserId("FOOBROWSER", "BarPlatform", MissingBrowserVersion.Instance);
+        var browserInfo = new BrowserInfo { Name = "foobrowser" };
+        Assert.That(() => sut.Matches(browserId, browserInfo), Is.True);
+    }
+
     [Test,AutoMoqData]
     public void MatchesShouldReturnFalseIfTheBrowserNameDoesNotMatch(BrowserInfoMatcher sut)
     {

CSF.Extensions.WebDriver.Tests/appsettings.WebDriverFactoryIntegrationTests.json

@@ -20,6 +20,14 @@
             },
             "OmittedDriverAndOptionsType": {
                 "DriverFactoryType": "CSF.Extensions.WebDriver.Factories.WebDriverFactoryIntegrationTests+FakeWebDriverFactory, CSF.Extensions.WebDriver.Tests"
+            },
+            "Chrome": {
+                "DriverType": "ChromeDriver",
+                "AddBrowserQuirks": "True"
+            },
+            "Firefox": {
+                "DriverType": "FirefoxDriver",
+                "AddBrowserQuirks": "True"
             }
         },
         "SelectedConfiguration": "DefaultInvalid"

CSF.Extensions.WebDriver/Factories/WebDriverConfigurationItemParser.cs

@@ -26,6 +26,12 @@ public WebDriverCreationOptions GetDriverConfiguration(IConfigurationSection con
                 DriverFactoryType = configuration.GetValue<string>(nameof(WebDriverCreationOptions.DriverFactoryType)),
             };
 
+            if(configuration.GetSection(nameof(WebDriverCreationOptions.AddBrowserIdentification)).Exists())
+                creationOptions.AddBrowserIdentification = configuration.GetValue<bool>(nameof(WebDriverCreationOptions.AddBrowserIdentification));
+
+            if(configuration.GetSection(nameof(WebDriverCreationOptions.AddBrowserQuirks)).Exists())
+                creationOptions.AddBrowserQuirks = configuration.GetValue<bool>(nameof(WebDriverCreationOptions.AddBrowserQuirks));
+
             if(!TryGetDriverType(creationOptions, configuration, out var driverType))
                 return null;