fixed prompt find strategies

Author: teo-nikolov

src/Bellatrix.Desktop/llm/FindByPrompt.cs

@@ -39,6 +39,8 @@ public class FindByPrompt : FindStrategy
 {
     private bool _tryResolveFromPages = true;
 
+    private WindowsDriver WrappedDriver => ServicesCollection.Current.Resolve<WindowsDriver>();
+
     /// <summary>
     /// Initializes a new instance of the <see cref="FindByPrompt"/> class with the specified prompt value.
     /// </summary>
@@ -49,44 +51,24 @@ public FindByPrompt(string value, bool tryResolveFromPages = true) : base(value)
         _tryResolveFromPages = tryResolveFromPages;
     }
 
-    /// <summary>
-    /// Locates a single AppiumElement using the resolved XPath.
-    /// </summary>
-    public override AppiumElement FindElement(WindowsDriver driver)
-    {
-        var location = driver.CurrentWindowHandle;
-        var xpath = ResolveLocator(location, driver);
-        return driver.FindElement(By.XPath(xpath));
-    }
-
-    /// <summary>
-    /// Locates all matching AppiumElements using the resolved XPath.
-    /// </summary>
-    public override IEnumerable<AppiumElement> FindAllElements(WindowsDriver driver)
-    {
-        var location = driver.CurrentWindowHandle;
-        var xpath = ResolveLocator(location, driver);
-        return driver.FindElements(By.XPath(xpath));
-    }
-
     /// <summary>
     /// Locates a single AppiumElement in the context of a parent element using the resolved XPath.
     /// </summary>
-    public override AppiumElement FindElement(AppiumElement element)
+    public override AppiumElement FindElement(ISearchContext searchContext)
     {
-        var location = element.WrappedDriver.CurrentWindowHandle;
-        var xpath = ResolveLocator(location, element.WrappedDriver as WindowsDriver);
-        return element.FindElement(By.XPath(xpath));
+        var location = WrappedDriver.CurrentWindowHandle;
+        var xpath = ResolveLocator(location, WrappedDriver as WindowsDriver);
+        return searchContext.FindElement(By.XPath(xpath)) as AppiumElement;
     }
 
     /// <summary>
     /// Locates all matching AppiumElements in the context of a parent element using the resolved XPath.
     /// </summary>
-    public override IEnumerable<AppiumElement> FindAllElements(AppiumElement element)
+    public override IEnumerable<AppiumElement> FindAllElements(ISearchContext searchContext)
     {
-        var location = element.WrappedDriver.CurrentWindowHandle;
-        var xpath = ResolveLocator(location, element.WrappedDriver as WindowsDriver);
-        return element.FindElements(By.XPath(xpath));
+        var location = WrappedDriver.CurrentWindowHandle;
+        var xpath = ResolveLocator(location, WrappedDriver as WindowsDriver);
+        return searchContext.FindElements(By.XPath(xpath)).Select(el => el as AppiumElement);
     }
 
     /// <summary>

templates/Bellatrix.Desktop.GettingStarted/29. Add New Find Locators/FindNameStartingWithStrategy.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
+using System.Linq;
 using Bellatrix.Desktop.Locators;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
-using OpenQA.Selenium.Appium.Windows;
 
 namespace Bellatrix.Desktop.GettingStarted;
 
@@ -18,28 +18,18 @@ public FindNameStartingWithStrategy(string value)
     }
 
     // 2. We override all available methods and use XPath expression for finding an element with Name starting with.
-    public override AppiumElement FindElement(WindowsDriver searchContext)
+    public override AppiumElement FindElement(ISearchContext searchContext)
     {
-        return searchContext.FindElement(By.XPath(string.Format(XpathStartingWithExpression, Value)));
+        return searchContext.FindElement(By.XPath(string.Format(XpathStartingWithExpression, Value))) as AppiumElement;
     }
 
-    public override IEnumerable<AppiumElement> FindAllElements(WindowsDriver searchContext)
+    public override IEnumerable<AppiumElement> FindAllElements(ISearchContext searchContext)
     {
-        return searchContext.FindElements(By.XPath(string.Format(XpathStartingWithExpression, Value)));
-    }
-
-    public override AppiumElement FindElement(AppiumElement element)
-    {
-        return element.FindElement(By.XPath(string.Format(XpathStartingWithExpression, Value)));
-    }
-
-    public override IEnumerable<AppiumElement> FindAllElements(AppiumElement element)
-    {
-        return element.FindElements(By.XPath(string.Format(XpathStartingWithExpression, Value)));
+        return searchContext.FindElements(By.XPath(string.Format(XpathStartingWithExpression, Value))).Select(el => el as AppiumElement);
     }
 
     public override string ToString()
     {
         return $"By Name starting with = {Value}";
     }
-}
+}