Merge pull request #103 from FlaUI/ignore-not-matched-capabilities

Ignore not matched capabilities
FlaUI · Oct 28, 2024 · 6d0cbc6 · 6d0cbc6
2 parents 1441dde + 56181e3
commit 6d0cbc6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/FlaUI.WebDriver.UITests/SessionTests.cs b/src/FlaUI.WebDriver.UITests/SessionTests.cs
@@ -106,13 +106,23 @@ public void NewSession_Timeouts_IsSupported()
         }
 
         [Test]
-        public void NewSession_NotSupportedCapability_Throws()
+        public void NewSession_NotSupportedAppiumCapability_Throws()
+        {
+            var driverOptions = FlaUIDriverOptions.TestApp();
+            driverOptions.AddAdditionalOption("appium:unknown", "value");
+
+            Assert.That(() => { using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions); },
+                Throws.TypeOf<InvalidOperationException>().With.Message.EqualTo("The following capabilities could not be matched: 'appium:unknown' (SessionNotCreated)"));
+        }
+
+        [Test]
+        public void NewSession_UnknownExtensionCapability_Ignores()
         {
             var driverOptions = FlaUIDriverOptions.TestApp();
             driverOptions.AddAdditionalOption("unknown:unknown", "value");
 
-            Assert.That(() => new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions),
-                Throws.TypeOf<InvalidOperationException>().With.Message.EqualTo("The following capabilities could not be matched: 'unknown:unknown' (SessionNotCreated)"));
+            Assert.That(() => { using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions); },
+                Throws.Nothing);
         }
 
         [Test]

diff --git a/src/FlaUI.WebDriver/Controllers/SessionController.cs b/src/FlaUI.WebDriver/Controllers/SessionController.cs
@@ -200,10 +200,16 @@ private bool TryMatchCapabilities(MergedCapabilities capabilities, [MaybeNullWhe
             }
 
             var notMatchedCapabilities = capabilities.Capabilities.Keys.Except(matchedCapabilities.Capabilities.Keys);
+            var notMatchedStandardOrAppiumCapabilities = notMatchedCapabilities.Where(c => !c.Contains(":") || c.StartsWith("appium:"));
+            if (notMatchedStandardOrAppiumCapabilities.Any())
+            {
+                // Do not ignore non-extension capabilities or appium capabilities
+                mismatchIndication = $"The following capabilities could not be matched: '{string.Join("', '", notMatchedStandardOrAppiumCapabilities)}'";
+                return false;            
+            }
             if (notMatchedCapabilities.Any())
             {
-                mismatchIndication = $"The following capabilities could not be matched: '{string.Join("', '", notMatchedCapabilities)}'";
-                return false;
+                _logger.LogDebug("The following capabilities could not be matched and are ignored: '{NotMatchedCapabilities}'", string.Join("', '", notMatchedCapabilities));
             }
 
             mismatchIndication = null;