Merge pull request #3881 from Ginger-Automation/BugFix/42099-Accessib…

…ilityBugFixPlaywright BugFix - 42099 Accessibility Bug Fix for Playwright
Ginger-Automation · Aug 28, 2024 · bdb4d30 · bdb4d30
2 parents 7d1d3d3 + ef5d363
commit bdb4d30
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/Ginger/GingerCoreNET/ActionsLib/UI/Web/ActAccessibilityTesting.cs b/Ginger/GingerCoreNET/ActionsLib/UI/Web/ActAccessibilityTesting.cs
@@ -390,6 +390,15 @@ public enum ReportTypes
 
         public override eImageType Image { get { return eImageType.Accessibility; } }
 
+        public eTarget GetAccessibilityTarget()
+        {
+            if (Enum.TryParse(GetInputParamValue(Fields.Target), out eTarget target))
+            {
+                return target;
+            }
+            return eTarget.Page;
+        }
+
         private static string GetAccessiblityrules()
         {
             try

diff --git a/...er/GingerCoreNET/Drivers/CoreDrivers/Web/ActionHandlers/ActAccessibilityTestingHandler.cs b/...er/GingerCoreNET/Drivers/CoreDrivers/Web/ActionHandlers/ActAccessibilityTestingHandler.cs
@@ -38,7 +38,7 @@ internal async Task HandleAsync()
                 AxeResult? result;
                 AxeRunOptions options = CreateAxeRunOptions();
 
-                if (GetAccessibilityTarget() == ActAccessibilityTesting.eTarget.Page)
+                if (_act.GetAccessibilityTarget() == ActAccessibilityTesting.eTarget.Page)
                 {
                     result = await TestPageAccessibilityAsync(options);
                 }
@@ -135,15 +135,6 @@ private AxeRunOptions CreateAxeRunOptions()
             return axeRunOptions;
         }
 
-        private ActAccessibilityTesting.eTarget GetAccessibilityTarget()
-        {
-            if (Enum.TryParse(_act.GetInputParamValue(ActAccessibilityTesting.Fields.Target), out ActAccessibilityTesting.eTarget target))
-            {
-                return target;
-            }
-            return ActAccessibilityTesting.eTarget.Page;
-        }
-
         private async Task<AxeResult?> TestPageAccessibilityAsync(AxeRunOptions options)
         {
             return await _tab.TestAccessibilityAsync(options);

diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
@@ -223,15 +223,27 @@ public override void RunAction(Act act)
                         }
                         break;
                     case ActAccessibilityTesting actAccessibilityTesting:
-                        ActAccessibilityTestingHandler actAccessibilityTestingHandler = new(
-                            actAccessibilityTesting, 
-                            _browser.CurrentWindow.CurrentTab, 
-                            new BrowserElementLocator(_browser.CurrentWindow.CurrentTab, new()
+                        ActAccessibilityTestingHandler actAccessibilityTestingHandler;
+                        if (actAccessibilityTesting.GetAccessibilityTarget() == ActAccessibilityTesting.eTarget.Element)
+                        {
+                            BrowserElementLocator browserElementLocator = new(_browser.CurrentWindow.CurrentTab, new()
                             {
                                 BusinessFlow = BusinessFlow,
                                 Environment = Environment,
-                                POMExecutionUtils = new(actAccessibilityTesting, actAccessibilityTesting.LocateValue)
-                            }));
+                                POMExecutionUtils = new(actAccessibilityTesting, actAccessibilityTesting.LocateValueCalculated)
+                            });
+                            actAccessibilityTestingHandler = new(
+                            actAccessibilityTesting,
+                            _browser.CurrentWindow.CurrentTab,
+                            browserElementLocator);
+                        }
+                        else
+                        {
+                            actAccessibilityTestingHandler = new(
+                            actAccessibilityTesting,
+                            _browser.CurrentWindow.CurrentTab, 
+                            browserElementLocator: null);
+                        }
                         actAccessibilityTestingHandler.HandleAsync().Wait();
                         break;
                     default: