Merge branch 'main' of https://github.com/quantori/Behavioral.Automation into bap-126-playwright-basic-structure

Author: SergeyRuzin

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Behavioral.Automation.Playwright.csproj

@@ -29,17 +29,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
-        <PackageReference Include="Microsoft.Playwright" Version="1.22.0"/>
-        <PackageReference Include="NUnit" Version="3.13.2"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
-        <PackageReference Include="coverlet.collector" Version="3.1.0"/>
-        <PackageReference Include="SpecFlow" Version="3.9.74"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Microsoft.Playwright" Version="1.22.0" />
+        <PackageReference Include="NUnit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="coverlet.collector" Version="3.1.0" />
+        <PackageReference Include="SpecFlow" Version="3.9.74" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Bindings"/>
-        <Folder Include="ElementStorage"/>
+        <Folder Include="Bindings" />
+        <Folder Include="ElementStorage" />
     </ItemGroup>
 
 </Project>

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/BrowserRunner.cs

@@ -10,7 +10,6 @@ public async Task<IPage> LaunchBrowser()
             using var playwright = await Microsoft.Playwright.Playwright.CreateAsync();
             await using var browser = await playwright.Chromium.LaunchAsync();
             var page = await browser.NewPageAsync();
-            await page.GotoAsync("https://playwright.dev/dotnet");
 
             return page;
         }

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/ComplexBindingBuilder.cs renamed to Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/ComplexBindingBuilder/ComplexBindingBuilder.cs

@@ -6,7 +6,7 @@
 using TechTalk.SpecFlow;
 using TechTalk.SpecFlow.Bindings;
 
-namespace Behavioral.Automation.Playwright.Services
+namespace Behavioral.Automation.Playwright.Services.ComplexBindingBuilder
 {
     /// <summary>
     /// Contains BuildAction methods which should be used to call other bindings inside the code (multiple clicks, value selections, etc.)

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/IComplexBindingBuilder.cs renamed to Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/ComplexBindingBuilder/IComplexBindingBuilder.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Behavioral.Automation.Playwright.Services
+namespace Behavioral.Automation.Playwright.Services.ComplexBindingBuilder
 {
     /// <summary>
     /// This interface contain methods which are used to call other bindings inside test methods, so their actions appear in the logs

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/IStepParametersProcessor.cs renamed to Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/ComplexBindingBuilder/IStepParametersProcessor.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Behavioral.Automation.Playwright.Services
+namespace Behavioral.Automation.Playwright.Services.ComplexBindingBuilder
 {
     /// <summary>
     /// This interface contains methods which convert objects passed to ComplexBindingBuilder into step expression to use in Runner

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Services/StringExtensions.cs

@@ -0,0 +1,20 @@
+using System.Text.RegularExpressions;
+
+namespace Behavioral.Automation.Playwright.Utils
+{
+    /// <summary>
+    /// Perform various operations with strings
+    /// </summary>
+    public static class StringExtensions
+    {
+        /// <summary>
+        /// Convert string into int
+        /// </summary>
+        /// <param name="s">String to get number from</param>
+        /// <returns>int converted from string</returns>
+        public static int ParseNumberFromString(string s)
+        {
+            return int.Parse(Regex.Match(s, @"\d+").Value);
+        }
+    }
+}

Behavioral.Automation.Playwright/Behavioral.Automation.Playwright/Utils/StringExtensions.cs

@@ -1,4 +1,7 @@
-using Behavioral.Automation.Services.Mapping;
+using System;
+using System.Threading;
+using Behavioral.Automation.Services.Mapping;
+using Behavioral.Automation.Services.Mapping.Contract;
 using JetBrains.Annotations;
 
 namespace Behavioral.Automation.Services
@@ -10,9 +13,16 @@ namespace Behavioral.Automation.Services
     public sealed class AutomationIdProvider : IAutomationIdProvider
     {
         private readonly IScopeContextRuntime _scopeContextRuntime;
+        private readonly IDriverService _driverService;
+        private readonly IScopeContextManager _scopeContextManager;
 
-        public AutomationIdProvider([NotNull] IScopeContextRuntime scopeContextRuntime)
+        public AutomationIdProvider(
+            [NotNull] IScopeContextRuntime scopeContextRuntime,
+            [NotNull] IDriverService driverService,
+            [NotNull] IScopeContextManager scopeContextManager)
         {
+            _scopeContextManager = scopeContextManager;
+            _driverService = driverService;
             _scopeContextRuntime = scopeContextRuntime;
         }
 
@@ -25,7 +35,18 @@ public AutomationIdProvider([NotNull] IScopeContextRuntime scopeContextRuntime)
         public ControlDescription Get(string caption)
         {
             ParseCaption(caption, out var name, out var type);
-            return _scopeContextRuntime.FindControlDescription(type, name);
+
+            var controlDescription = _scopeContextRuntime.FindControlDescription(type, name);
+
+            if (controlDescription != null) 
+                return controlDescription;
+
+            Thread.Sleep(500);
+            _scopeContextManager.SwitchToCurrentUrl(new Uri(_driverService.CurrentUrl));
+
+            var scopeId = ((PageScopeContext)((ScopeContextRuntime)_scopeContextRuntime).CurrentContext).ScopeId;
+            return _scopeContextRuntime.FindControlDescription(type, name) ??
+                   throw new ArgumentException($"Control with alias=\"{type}\" and caption=\"{name}\" not found in PageContext with urlWildcard=\"{scopeId.UrlWildCard}\"");
         }
 
         public void ParseCaption(string caption, out string name, out string type)

Behavioral.Automation.Selenium/Behavioral.Automation/Services/AutomationIDProvider.cs

@@ -44,8 +44,7 @@ public ControlReference FindControlReference(string type,
                 }
             }
 
-            throw new ArgumentException(
-                    $"Control with alias=\"{type}\" and caption=\"{name}\" not found in PageContext with urlWildcard=\"{ScopeId.UrlWildCard}\"");
+            return null;
         }
 
         public IControlScopeContext GetNestedControlScopeContext(ControlScopeId controlScopeId)

Behavioral.Automation.Selenium/Behavioral.Automation/Services/Mapping/PageScopeContext.cs

@@ -41,7 +41,6 @@ public bool TryParseStepExpressionArguments(Regex regex, string stepExpression,
                 return true;
             }
 
-
             arguments = new string[] { };
             return false;
         }