Merge remote-tracking branch 'origin/dev' into issue/NEST-464

Lombiq · Aug 7, 2023 · 54584e6 · 54584e6
2 parents dc9c680 + ab9a656
commit 54584e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj b/Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj
@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
@@ -97,7 +97,7 @@ Tips on making specific features testable are under the ["Creating tests" page](
 - Some features send out e-mails. You can test them with the Lombiq UI Testing Toolbox's built-in feature to run an isolated local SMTP server with a web UI. The `OrchardCore.Email` feature will be automatically enabled, as well as the rest of the configuration applied.
 - If you want the site to use Azure Blob Storage then you have to do the following:
   - The `OrchardCore.Media.Azure` feature will be automatically enabled, as well as the rest of the configuration applied.
-  - It's recommended that you use the [Azurite emulator](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite) as the storage for tests, not a real Azure Blob Storage resource. This is used by the UI Testing Toolbox by default. Be sure that it's running when the tests are executing.
+  - It's recommended that you use the [Azurite emulator](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite) as the storage for tests, not a real Azure Blob Storage resource. This is used by the UI Testing Toolbox by default. Be sure that it's running when the tests are executing. You'll need at least v3.25.0 of Azurite (you can check this with `azurite -v`, otherwise you'll get "The API version 2022-11-02 is not supported by Azurite." exceptions).
   - If you want to use Blob Storage during local development then you can also configure it in your app's _appsettings.json_ or _appsettings.Development.json_ file like below but this is not necessary for UI testing:
 
     ```json

diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -93,9 +93,9 @@
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
     <PackageReference Include="Lombiq.Tests" Version="2.2.2" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="6.0.0" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.0" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.Refit" Version="6.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="7.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="7.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.Refit" Version="7.0.0" />
     <PackageReference Include="Lombiq.Npm.Targets" Version="1.4.0" />
     <!--The reference for NodeJs Extensions is for the reason to prevent NuGet build
     to use a PNPM version higher than 7.x.x. We need to upgrade solutions to use PNPM 8, also see

diff --git a/Lombiq.Tests.UI/Services/WebDriverFactory.cs b/Lombiq.Tests.UI/Services/WebDriverFactory.cs
@@ -13,6 +13,8 @@ namespace Lombiq.Tests.UI.Services;
 
 public static class WebDriverFactory
 {
+    private static readonly object _setupLock = new();
+
     public static ChromeDriver CreateChromeDriver(BrowserConfiguration configuration, TimeSpan pageLoadTimeout)
     {
         ChromeDriver CreateDriverInner(ChromeDriverService service)
@@ -163,7 +165,7 @@ private static TDriver CreateDriver<TDriver>(string browserName, Func<TDriver> d
     {
         try
         {
-            DriverSetup.AutoSetUp(browserName);
+            lock (_setupLock) DriverSetup.AutoSetUp(browserName);
             return driverFactory();
         }
         catch (Exception ex)