Merge pull request #50 from AutomateThePlanet/ai-augmention-updates

AI Augmentation Updates and Fixes

Author: angelovstanton

.github/workflows/github-actions-tests-on-windows.yml

@@ -22,6 +22,6 @@ jobs:
       - name: Install dependencies
         run: dotnet restore
       - name: Build
-        run: dotnet build --configuration Debug --no-restore --no-parallel
+        run: dotnet build --configuration Debug --no-restore
       - name: Test
-        run: dotnet test --no-build --no-restore --verbosity normal --filter Category=CI
+        run: dotnet test --no-build --no-restore --verbosity normal --filter Category=CI

src/Bellatrix.KeyVault/SecretsResolver.cs

@@ -25,7 +25,7 @@ public static string GetSecret(Func<string> getConfigValue)
     {
         if (getConfigValue().StartsWith("env_"))
         {
-            string environmentalVariable = Environment.GetEnvironmentVariable(getConfigValue().Replace("env_", string.Empty), EnvironmentVariableTarget.Machine);
+            string environmentalVariable = Environment.GetEnvironmentVariable(getConfigValue().Replace("env_", string.Empty));
             return environmentalVariable;
         }
         else if (getConfigValue().StartsWith("vault_"))

src/Bellatrix.Playwright/components/common/Anchor.cs

@@ -39,7 +39,7 @@ public virtual void Hover()
     }
 
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-    public virtual string Href => HttpUtility.HtmlDecode(HttpUtility.UrlDecode(GetAttribute("href")));
+    public virtual string Href => new Uri(new Uri(WrappedBrowser.CurrentPage.Url), HttpUtility.HtmlDecode(HttpUtility.UrlDecode(GetAttribute("href")))).AbsoluteUri;
 
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]
     public virtual string InnerText => GetInnerText();

src/Bellatrix.Playwright/proxy/ProxyService.cs

@@ -51,7 +51,7 @@ public void Start()
     {
         if (IsEnabled)
         {
-            Console.WriteLine($"Start proxy on port {Port}"); 
+            Console.WriteLine($"Start proxy on port {Port}");
             Console.WriteLine($"PROXY STARTED");
             OnRequestCaptureTraffic();
             OnResponseCaptureTraffic();
@@ -191,7 +191,7 @@ public void ShouldExecute()
     {
         if (!IsEnabled)
         {
-            throw new ArgumentException("ProxyService is not enabled. To use open testFramework.json and set isEnabled = true of webProxySettings");
+            throw new ArgumentException("ProxyService is not enabled. To use open testFrameworkSettings json and set ShouldCaptureHttpTraffic = true of webSettings");
         }
     }
 

src/Bellatrix.Playwright/services/ProcessCleanupService.cs

@@ -80,6 +80,11 @@ private static void KillAllProcessesStartedAfterTime(List<string> processesToKil
         {
             try
             {
+                if (!OperatingSystem.IsWindows())
+                {
+                    continue;
+                }
+
                 var children = process.GetChildProcesses();
                 foreach (var child in children)
                 {
@@ -114,4 +119,4 @@ private static void KillProcessStartedAfterTime(List<string> processesToKill, Da
             }
         }
     }
-}
+}

src/Bellatrix.Playwright/syncplaywright/core/elements/WebElement.cs

@@ -38,7 +38,19 @@ internal WebElement(BrowserPage page, WebElement element)
         WrappedLocator = element.WrappedLocator;
     }
 
-    public ILocator WrappedLocator { get; set; }
+    private ILocator _wrappedLocator;
+
+    public ILocator WrappedLocator
+    {
+        get
+        {
+            return _wrappedLocator.First;
+        }
+        set
+        {
+            _wrappedLocator = value;
+        }
+    }
 
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]
     public virtual WebElement First => new WebElement(Page, WrappedLocator.First);
@@ -439,4 +451,4 @@ public virtual FrameElement LocateFrame(string selector)
     {
         return new FrameElement(Page, Locate(selector));
     }
-}
+}

src/Bellatrix.Web/findstrategies/FindAttributeContainingStrategy.cs

@@ -14,7 +14,7 @@
 
 namespace Bellatrix.Web;
 
-public class FindAttributeContainingStrategy : FindXpathStrategy
+public class FindAttributeContainingStrategy : FindCssStrategy
 {
     private readonly string _attributeName;
     private readonly string _value;

src/Bellatrix.Web/proxy/ProxyService.cs

@@ -74,7 +74,7 @@ public void Start()
         {
             Port = GetFreeTcpPort();
             var explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, Port);
-            Console.WriteLine($"Start proxy on port {Port}"); 
+            Console.WriteLine($"Start proxy on port {Port}");
             ProxyServer.AddEndPoint(explicitEndPoint);
             ProxyServer.Start();
             Console.WriteLine($"PROXY STARTED");
@@ -225,7 +225,7 @@ public void ShouldExecute()
     {
         if (!IsEnabled)
         {
-            throw new ArgumentException("ProxyService is not enabled. To use open testFramework.json and set isEnabled = true of webProxySettings");
+            throw new ArgumentException("ProxyService is not enabled. To use open testFrameworkSettings json and set ShouldCaptureHttpTraffic = true of webSettings");
         }
     }
 

templates/Bellatrix.Playwright.GettingStarted/19. Capture HTTP Traffic/CaptureHttpTrafficTests.cs

@@ -52,6 +52,7 @@ public void CaptureTrafficTests()
         App.Proxy.AssertNoLargeImagesRequested();
 
         // Check if some specific request is made.
+        App.Browser.WaitForAjax();
         App.Proxy.AssertRequestMade("https://demos.bellatrix.solutions/wp-content/uploads/2018/04/cropped-bellatrix-logo.png");
     }
 

templates/Bellatrix.Playwright.GettingStarted/testFrameworkSettings.Debug.json

@@ -10,7 +10,7 @@
     "waitUntilReadyOnElementFound": "false",
     "waitForAngular": "false",
     "shouldHighlightElements": "true",
-    "shouldCaptureHttpTraffic": "false",
+    "shouldCaptureHttpTraffic": "true",
     "pathToSslCertificate": "path",
     "shouldCheckForJavaScriptErrors": "false",
     "timeoutSettings": {
@@ -227,7 +227,7 @@
     "modelSettings": [
       {
         "endpoint": "env_AZURE_OPENAI_ENDPOINT",
-        "key": "env_AZURE_OPENAI_KEY",
+        "key": "env_AZURE_OPENAI_API_KEY",
         "deployment": "gpt-4o"
       },
       {