Merge pull request #62 from FlaUI/find-desktop-elements

Add ability to find desktop elements
FlaUI · Aug 26, 2024 · d463d38 · d463d38
2 parents b84a2ec + 666feb6
commit d463d38
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/FlaUI.WebDriver.UITests/FindElementsTests.cs b/src/FlaUI.WebDriver.UITests/FindElementsTests.cs
@@ -8,6 +8,17 @@ namespace FlaUI.WebDriver.UITests
 {
     public class FindElementsTests
     {
+        [Test]
+        public void FindElement_FromRoot_ReturnsElement()
+        {
+            var driverOptions = FlaUIDriverOptions.RootApp();
+            using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
+
+            var element = driver.FindElement(By.Name("Taskbar"));
+
+            Assert.That(element, Is.Not.Null);
+        }
+
         [Test]
         public void FindElement_ByXPath_ReturnsElement()
         {

diff --git a/src/FlaUI.WebDriver/Controllers/FindElementsController.cs b/src/FlaUI.WebDriver/Controllers/FindElementsController.cs
@@ -24,7 +24,7 @@ public FindElementsController(ILogger<FindElementsController> logger, ISessionRe
         public async Task<ActionResult> FindElement([FromRoute] string sessionId, [FromBody] FindElementRequest findElementRequest)
         {
             var session = GetActiveSession(sessionId);
-            return await FindElementFrom(() => session.CurrentWindow, findElementRequest, session);
+            return await FindElementFrom(() => session.App == null ? session.Automation.GetDesktop() : session.CurrentWindow, findElementRequest, session);
         }
 
         [HttpPost("element/{elementId}/element")]
@@ -39,7 +39,7 @@ public async Task<ActionResult> FindElementFromElement([FromRoute] string sessio
         public async Task<ActionResult> FindElements([FromRoute] string sessionId, [FromBody] FindElementRequest findElementRequest)
         {
             var session = GetActiveSession(sessionId);
-            return await FindElementsFrom(() => session.CurrentWindow, findElementRequest, session);
+            return await FindElementsFrom(() => session.App == null ? session.Automation.GetDesktop() : session.CurrentWindow, findElementRequest, session);
         }
 
         [HttpPost("element/{elementId}/elements")]
@@ -203,7 +203,7 @@ private AutomationElement GetElement(Session session, string elementId)
         private Session GetActiveSession(string sessionId)
         {
             var session = GetSession(sessionId);
-            if (session.App == null || session.App.HasExited)
+            if (session.App != null && session.App.HasExited)
             {
                 throw WebDriverResponseException.NoWindowsOpenForSession();
             }