Fixed Issue #23: Speedup Search in List Element

CosminSontu · Mar 13, 2024 · 650fc55 · 650fc55
1 parent 1c3281f
commit 650fc55
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 73 deletions.
diff --git a/SpecDrill.Infrastructure/SpecDrill.Infrastructure.csproj b/SpecDrill.Infrastructure/SpecDrill.Infrastructure.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>specdrill.png</PackageIcon>
-    <BuildNumber>554</BuildNumber>
-    <Version>1.3.0.$(BuildNumber)</Version>
+    <BuildNumber>4</BuildNumber>
+    <Version>1.4.0.$(BuildNumber)</Version>
     <Description>SpecDrill.Infrastructure</Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackageReleaseNotes>
@@ -20,8 +20,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="NReco.Logging.File" Version="1.1.7" />
-    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="NReco.Logging.File" Version="1.2.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="pwsh ../incver.ps1 -csproj $(ProjectFileName)" />

diff --git a/SpecDrill.MsTest/SpecDrill.MsTest.csproj b/SpecDrill.MsTest/SpecDrill.MsTest.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>specdrill.png</PackageIcon>
-    <BuildNumber>1160</BuildNumber>
-    <Version>1.3.0.$(BuildNumber)</Version>
+    <BuildNumber>4</BuildNumber>
+    <Version>1.4.0.$(BuildNumber)</Version>
     <Description>SpecDrill.MsTest - SpecDrill integration with MsTest </Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackageReleaseNotes>
@@ -15,9 +15,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="SpecDrill" Version="1.3.0.1287" />
-    <PackageReference Include="SpecDrill.Secondary.Adapters.WebDriver" Version="[1.3.*,)" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="SpecDrill" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.Secondary.Adapters.WebDriver" Version="1.4.0.3" />
     <None Include="..\LICENSE" Pack="true" PackagePath=".\" />
     <None Include="..\specdrill.png" Pack="true" PackagePath=".\" />
     <Content Include="..\NuGet\content\*.template.*" Pack="true" PackagePath="content" PackageCopyToOutput="true" CopyToOutputFolder="PreserveNewest" />

diff --git a/SpecDrill.NUnit3/SpecDrill.NUnit3.csproj b/SpecDrill.NUnit3/SpecDrill.NUnit3.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>specdrill.png</PackageIcon>
-    <BuildNumber>879</BuildNumber>
-    <Version>1.3.0.$(BuildNumber)</Version>
+    <BuildNumber>4</BuildNumber>
+    <Version>1.4.0.$(BuildNumber)</Version>
     <Description>SpecDrill.NUnit - SpecDrill integration with NUnit 3</Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <OutputType>Library</OutputType>
@@ -15,9 +15,9 @@
     </PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="SpecDrill" Version="1.3.0.1287" />
-    <PackageReference Include="SpecDrill.Secondary.Adapters.WebDriver" Version="[1.3.*,)" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="SpecDrill" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.Secondary.Adapters.WebDriver" Version="1.4.0.3" />
     <None Include="..\LICENSE" Pack="true" PackagePath=".\" />
     <None Include="..\specdrill.png" Pack="true" PackagePath=".\" />
     <Content Include="..\NuGet\content\*.template.*" Pack="true" PackagePath="content" PackageCopyToOutput="true" CopyToOutputFolder="PreserveNewest" />

diff --git a/SpecDrill.Samples.MsTest/SpecDrill.Samples.MsTest.csproj b/SpecDrill.Samples.MsTest/SpecDrill.Samples.MsTest.csproj
@@ -2,23 +2,23 @@
 
 	<PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+		<PackageReference Include="coverlet.collector" Version="6.0.2">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="119.0.6045.10500" />
-    <PackageReference Include="SpecDrill" Version="1.3.0.1287" />
-    <PackageReference Include="SpecDrill.MsTest" Version="1.3.0.1156" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
+    <PackageReference Include="SpecDrill" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.MsTest" Version="1.4.0.3" />
 	</ItemGroup>
 
 

diff --git a/SpecDrill.Samples.NUnit/Features/GoogleSearch.feature b/SpecDrill.Samples.NUnit/Features/GoogleSearch.feature
@@ -13,4 +13,4 @@ Scenario: 1.Find wiki entry for searched keyword
 Scenario: 2.Find wiki entry for searched keyword
 	Given I have entered "drill wiki" into Google search
 	When I press Search button
-	Then You should get a "Drill" entry in search results
+	Then You should get a "Fandom" entry in search results
diff --git a/SpecDrill.Samples.NUnit/Features/GoogleSearch.feature.cs b/SpecDrill.Samples.NUnit/Features/GoogleSearch.feature.cs
diff --git a/SpecDrill.Samples.NUnit/SpecDrill.Samples.NUnit3.csproj b/SpecDrill.Samples.NUnit/SpecDrill.Samples.NUnit3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -11,15 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Allure.NUnit" Version="2.10.0" />
+    <PackageReference Include="Allure.NUnit" Version="2.11.0" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="119.0.6045.10500" />
-    <PackageReference Include="SpecDrill" Version="1.3.0.1287" />
-    <PackageReference Include="SpecDrill.NUnit3" Version="1.3.0.875" />
-    <PackageReference Include="SpecDrill.SpecFlow" Version="1.3.0.970" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
+    <PackageReference Include="SpecDrill" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.NUnit3" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.SpecFlow" Version="1.4.0.3" />
 	  <PackageReference Include="SpecFlow" Version="3.9.74" />
 	  <PackageReference Include="SpecFlow.NUnit" Version="3.9.74" />
   </ItemGroup>

diff --git a/SpecDrill.Samples.NUnit/specDrillConfig.json b/SpecDrill.Samples.NUnit/specDrillConfig.json
@@ -14,7 +14,7 @@
       "seleniumServerUri": "http://localhost:5555/wd/hub",
       "drivers": {
         "chrome": {
-          "path": "%USERPROFILE%\\.nuget\\packages\\selenium.webdriver.chromedriver\\117.0.5938.8800\\driver\\win32", //"C:\\Your Browser Drivers Path"//
+          "path": "%USERPROFILE%\\.nuget\\packages\\selenium.webdriver.chromedriver\\122.0.6261.11100\\driver\\win32", //"C:\\Your Browser Drivers Path"//
           "arguments": [ "--incognito" ] //add , "headless" for headless test run
         },
         "ie": { "path": "" },

diff --git a/SpecDrill.Secondary.Adapters.WebDriver/SpecDrill.Secondary.Adapters.WebDriver.csproj b/SpecDrill.Secondary.Adapters.WebDriver/SpecDrill.Secondary.Adapters.WebDriver.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>specdrill.png</PackageIcon>
-    <BuildNumber>1330</BuildNumber>
-    <Version>1.3.0.$(BuildNumber)</Version>
+    <BuildNumber>4</BuildNumber>
+    <Version>1.4.0.$(BuildNumber)</Version>
     <Deterministic>true</Deterministic>
     <Description>SpecDrill.SecondaryPorts.Adapters.WebDriver - WebDriver adapter for SpecDrill</Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -20,12 +20,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
-    <PackageReference Include="Selenium.Support" Version="4.15.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.15.0" />
-    <PackageReference Include="SpecDrill" Version="1.3.0.1287" />
-    <PackageReference Include="SpecDrill.Infrastructure" Version="1.3.0.550" />
+    <PackageReference Include="Selenium.Support" Version="4.18.1" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.18.1" />
+    <PackageReference Include="SpecDrill" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.Infrastructure" Version="1.4.0.3" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="itext7" Version="8.0.2" />
+    <PackageReference Include="itext7" Version="8.0.3" />
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <WarningLevel>2</WarningLevel>

diff --git a/SpecDrill.SpecFlow/SpecDrill.SpecFlow.csproj b/SpecDrill.SpecFlow/SpecDrill.SpecFlow.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>specdrill.png</PackageIcon>
-    <BuildNumber>974</BuildNumber>
-    <Version>1.3.0.$(BuildNumber)</Version>
+    <BuildNumber>4</BuildNumber>
+    <Version>1.4.0.$(BuildNumber)</Version>
     <Description>SpecDrill.SpecFlow - SpecDrill integration with SpecFlow </Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackageReleaseNotes>
@@ -15,8 +15,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="SpecDrill" Version="1.3.0.1287" />
-    <PackageReference Include="SpecDrill.Secondary.Adapters.WebDriver" Version="[1.3.*,)" />
+    <PackageReference Include="SpecDrill" Version="1.4.0.3" />
+    <PackageReference Include="SpecDrill.Secondary.Adapters.WebDriver" Version="1.4.0.3" />
     <PackageReference Include="SpecFlow" Version="3.9.74" IncludeAssets="All" />
     <None Include="..\LICENSE" Pack="true" PackagePath=".\" />
     <None Include="..\specdrill.png" Pack="true" PackagePath=".\" />

diff --git a/SpecDrill.Tests/SpecDrill.Tests.csproj b/SpecDrill.Tests/SpecDrill.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
 	  <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -34,29 +34,29 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 	<PackageReference Include="FluentAssertions" Version="6.12.0" />
-	<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-	<PackageReference Include="NReco.Logging.File" Version="1.1.7" />
+	<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+	<PackageReference Include="NReco.Logging.File" Version="1.2.0" />
 	<!--<PackageReference Include="NUnit" Version="3.13.3" />
 	<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />-->
-	<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="119.0.6045.10500" />
+	<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="122.0.6261.11100" />
 	<!--<PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="109.0.1518.61" />-->
 	<!--<PackageReference Include="SpecDrill.MsTest" Version="[1.1.15.*,)" />
 	<PackageReference Include="SpecDrill.SpecFlow" Version="[1.1.14.*,)" />-->
     <!--<PackageReference Include="SpecFlow" Version="3.9.74" />
     <PackageReference Include="SpecFlow.MsTest" Version="3.9.74" />-->
     <!--<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.74" />-->
-    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SpecDrill/SpecDrill.csproj b/SpecDrill/SpecDrill.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RestoreSources>$(RestoreSources)</RestoreSources>
     <PackageSource>bin\$(Configuration)\Package</PackageSource>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>specdrill.png</PackageIcon>
-    <BuildNumber>1291</BuildNumber>
-    <Version>1.3.0.$(BuildNumber)</Version>
+    <BuildNumber>4</BuildNumber>
+    <Version>1.4.0.$(BuildNumber)</Version>
     <Description>SpecDrill - An opinionated automated testing framework based on Selenium WebDriver</Description>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <PackageReleaseNotes>
@@ -24,7 +24,7 @@
   <ItemGroup>
     <!--<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />-->
-    <PackageReference Include="SpecDrill.Infrastructure" Version="1.3.0.550" />
+    <PackageReference Include="SpecDrill.Infrastructure" Version="1.4.0.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="bin\**" />

diff --git a/SpecDrill/WebControls/ListElement.cs b/SpecDrill/WebControls/ListElement.cs
@@ -3,6 +3,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text.RegularExpressions;
 
 namespace SpecDrill
@@ -50,11 +51,19 @@ public T GetElementByIndex(int index)
 
         public T GetElementByText(string regex)
         {
-            var elements = this.ToArray();
-            var match = elements.FirstOrDefault(
-                item => 
-                    Regex.IsMatch(item.Text, regex, RegexOptions.None, TimeSpan.FromSeconds(30))
-                    );
+            T? match;
+            if (this.locator.LocatorType == By.XPath)
+            {
+                match = ElementFactory.CreateControl<T>(parent, ElementLocatorFactory.Create(By.XPath, locator.LocatorValue + $"[.//text()[contains(.,'{regex}')]]"));
+            }
+            else
+            {
+                var elements = this.ToArray();
+                match = elements.FirstOrDefault(
+                    item =>
+                        Regex.IsMatch(item.Text, regex, RegexOptions.None, TimeSpan.FromSeconds(30))
+                        );
+            }
 
             if (match == default(T))
                 throw new Exception($"SpecDrill: No element matching '{regex}' was found!");