From 42895f7dffe125e1b0057ad46388e23395d64a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com>
Date: Thu, 21 Oct 2021 17:25:06 +0200
Subject: [PATCH 01/53] Basics of WebApplicationFactory usage

---
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj        |   3 +-
 .../CustomWebApplicationFactory.cs            | 174 ++++++++++++++++++
 .../OrchardCoreInstance.cs                    |  59 ++++--
 3 files changed, 217 insertions(+), 19 deletions(-)
 create mode 100644 Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs
 rename Lombiq.Tests.UI/Services/{ => OrchardCoreHosting}/OrchardCoreInstance.cs (75%)

diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index 003045a92..d8ef6150a 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
     <!-- With these the driver exe files will be copied to all projects referencing this project. Otherwise all child
@@ -71,6 +71,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs
new file mode 100644
index 000000000..41874f7d7
--- /dev/null
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs
@@ -0,0 +1,174 @@
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Linq;
+
+namespace Lombiq.Tests.UI.Services.OrchardCoreHosting
+{
+    // Taken from: https://github.com/benday-inc/SeleniumDemo.
+    public class CustomWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup>
+       where TStartup : class
+    {
+        private readonly string _baseAddress = "https://localhost";
+        private IWebHost _webHost;
+        private Action<IWebHostBuilder> _addDevelopmentConfigs;
+        private readonly bool _verbose;
+
+        public CustomWebApplicationFactory(
+            bool verbose = false,
+            Action<IWebHostBuilder> addDevelopmentConfigurations = null)
+        {
+            _verbose = verbose;
+
+            WriteToLog($"CustomWebApplicationFactory.ctor starting...");
+
+            if (addDevelopmentConfigurations != null)
+            {
+                _addDevelopmentConfigs = addDevelopmentConfigurations;
+            }
+
+            ClientOptions.BaseAddress = new Uri(_baseAddress);
+
+            WriteToLog($"CustomWebApplicationFactory.ctor calling CreateServer()...");
+
+            CreateServer(CreateWebHostBuilder());
+
+            WriteToLog($"CustomWebApplicationFactory.ctor exiting...");
+        }
+
+        private void WriteToLog(string message)
+        {
+            if (_verbose == true)
+            {
+                Console.WriteLine(message);
+            }
+        }
+
+        public string GetServerAddress()
+        {
+            var serverAddresses = _webHost.ServerFeatures.Get<IServerAddressesFeature>();
+
+            if (serverAddresses == null)
+            {
+                throw new InvalidOperationException($"Could not get instance of IServerAddressFeature.");
+            }
+
+            var addresses = serverAddresses.Addresses;
+
+            var returnValue = addresses.FirstOrDefault();
+
+            return returnValue;
+        }
+
+        public string GetServerAddressForRelativeUrl(string url)
+        {
+            var baseAddr = GetServerAddress();
+
+            return $"{baseAddr}/{url}";
+        }
+
+        public TestServer TestServer { get; private set; }
+
+        protected override TestServer CreateServer(IWebHostBuilder builder)
+        {
+            WriteToLog($"CustomWebApplicationFactory.CreateServer() starting...");
+
+            WriteToLog($"CustomWebApplicationFactory.CreateServer() calling builder.Build()...");
+            _webHost = builder.Build();
+
+            WriteToLog($"CustomWebApplicationFactory.CreateServer() calling webhost.start()...");
+            _webHost.Start();
+
+            TestServer returnValue = InitializeTestServer();
+
+            WriteToLog($"CustomWebApplicationFactory.CreateServer() exiting...");
+
+            return returnValue;
+        }
+
+        private TestServer InitializeTestServer()
+        {
+            WriteToLog($"CustomWebApplicationFactory.InitializeTestServer() creating instance of test server...");
+
+            var builder = new WebHostBuilder().UseStartup<TStartup>();
+
+            WriteToLog($"CustomWebApplicationFactory.InitializeTestServer() invoking add dev config...");
+            _addDevelopmentConfigs?.Invoke(builder);
+            WriteToLog($"CustomWebApplicationFactory.InitializeTestServer() invoked add dev config...");
+
+            var returnValue = new TestServer(builder);
+            // var returnValue = new TestServer(builder.UseStartup<TStartup>());
+
+            TestServer = returnValue;
+            return returnValue;
+        }
+
+        protected override IWebHostBuilder CreateWebHostBuilder()
+        {
+            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() starting...");
+
+            var builder = WebHost.CreateDefaultBuilder(Array.Empty<string>());
+            builder.UseStartup<TStartup>();
+
+            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() invoking add dev config...");
+            _addDevelopmentConfigs?.Invoke(builder);
+            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() invoked add dev config...");
+
+            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() starting...");
+
+            return builder;
+        }
+
+        protected IServiceScope _scope;
+        protected IServiceScope Scope
+        {
+            get
+            {
+                if (_scope == null)
+                {
+                    var scopeFactory =
+                        TestServer.Services.GetRequiredService<IServiceScopeFactory>();
+
+                    if (scopeFactory == null)
+                    {
+                        throw new InvalidOperationException("Could not create instance of IServiceScopeFactory.");
+                    }
+
+                    _scope = scopeFactory.CreateScope();
+                }
+
+                return _scope;
+            }
+        }
+
+        public T CreateInstance<T>()
+        {
+            var provider = Scope.ServiceProvider;
+
+            var returnValue = provider.GetRequiredService<T>();
+
+            return returnValue;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _addDevelopmentConfigs = null;
+
+            _scope?.Dispose();
+            _scope = null;
+
+            _webHost?.Dispose();
+            _webHost = null;
+
+            base.Dispose(disposing);
+            if (disposing)
+            {
+                _webHost?.Dispose();
+            }
+        }
+    }
+}
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs
similarity index 75%
rename from Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
rename to Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs
index 979a1427c..d0571f0c1 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs
@@ -1,6 +1,7 @@
 using CliWrap;
 using CliWrap.Builders;
 using Lombiq.Tests.UI.Helpers;
+using Microsoft.AspNetCore.TestHost;
 using Microsoft.VisualBasic.FileIO;
 using System;
 using System.Collections.Generic;
@@ -11,7 +12,7 @@
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 
-namespace Lombiq.Tests.UI.Services
+namespace Lombiq.Tests.UI.Services.OrchardCoreHosting
 {
     public delegate Task BeforeAppStartHandler(string contentRootPath, ArgumentsBuilder argumentsBuilder);
 
@@ -37,7 +38,7 @@ public sealed class OrchardCoreInstance : IWebApplicationInstance
 
         private readonly OrchardCoreConfiguration _configuration;
         private readonly ITestOutputHelper _testOutputHelper;
-        private Command _command;
+        private CustomWebApplicationFactory<Startup> _app;
         private CancellationTokenSource _cancellationTokenSource;
         private int _port;
         private string _contentRootPath;
@@ -65,6 +66,14 @@ public OrchardCoreInstance(OrchardCoreConfiguration configuration, ITestOutputHe
         public async Task<Uri> StartUpAsync()
         {
             _port = _portLeaseManager.LeaseAvailableRandomPort();
+            // The public URL can be get via:
+            var url = _app.GetServerAddress();
+            // An HttpClient that goes to the app directly and not via a public URL can be retrieved with:
+            var client = _app.CreateClient();
+            // And then:
+            var response = await client.GetAsync(url);
+            var content = await response.Content.ReadAsStringAsync();
+
             var url = UrlPrefix + _port;
 
             _testOutputHelper.WriteLineTimestampedAndDebug("The generated URL for the Orchard Core instance is \"{0}\".", url);
@@ -83,24 +92,38 @@ public async Task<Uri> StartUpAsync()
                     .CopyAppConfigFiles(Path.GetDirectoryName(_configuration.AppAssemblyPath), _contentRootPath);
             }
 
-            _command = Cli.Wrap("dotnet.exe")
-                .WithArguments(argumentsBuilder =>
+            // This needs to use the Startup class of the web app and thus supplied from the outside.
+            _app = new CustomWebApplicationFactory<Startup>();
+
+            // With type replacements what we now have in Lombiq.Tests.UI.AppExtensions can be substituted and thus e.g.
+            // automatically turn on Lombiq.Tests.UI.Shortcuts without modifying the app.
+            _app = new CustomWebApplicationFactory<Startup>(addDevelopmentConfigurations: builder =>
+            {
+                builder.ConfigureTestServices(services =>
                 {
-                    var builder = argumentsBuilder
-                        .Add(_configuration.AppAssemblyPath)
-                        .Add("--urls").Add(url)
-                        .Add("--contentRoot").Add(_contentRootPath)
-                        .Add("--webroot=").Add(Path.Combine(_contentRootPath, "wwwroot"))
-                        .Add("--environment").Add("Development");
-
-                    // There is no other option here than to wait for the invoked Tasks.
-#pragma warning disable AsyncFixer02 // Long-running or blocking operations inside an async method
-                    _configuration.BeforeAppStart?.Invoke(_contentRootPath, builder)?.Wait();
-#pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method
+                    services.AddTransient<IUsefulService, FakeUsefulService>();
                 });
+            });
+
+            // How will we handle content roots and snapshots?
+            //            _app = Cli.Wrap("dotnet.exe")
+            //                .WithArguments(argumentsBuilder =>
+            //                {
+            //                    var builder = argumentsBuilder
+            //                        .Add(_configuration.AppAssemblyPath)
+            //                        .Add("--urls").Add(url)
+            //                        .Add("--contentRoot").Add(_contentRootPath)
+            //                        .Add("--webroot=").Add(Path.Combine(_contentRootPath, "wwwroot"))
+            //                        .Add("--environment").Add("Development");
+
+            //                    // There is no other option here than to wait for the invoked Tasks.
+            //#pragma warning disable AsyncFixer02 // Long-running or blocking operations inside an async method
+            //                    _configuration.BeforeAppStart?.Invoke(_contentRootPath, builder)?.Wait();
+            //#pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method
+            //                });
 
             _testOutputHelper.WriteLineTimestampedAndDebug(
-                "The Orchard Core instance will be launched with the following command: \"{0}\".", _command);
+                "The Orchard Core instance will be launched with the following command: \"{0}\".", _app);
 
             await StartOrchardAppAsync();
 
@@ -165,7 +188,7 @@ private async Task StartOrchardAppAsync()
         {
             _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to start the Orchard Core instance.");
 
-            if (_command == null)
+            if (_app == null)
             {
                 throw new InvalidOperationException("The app needs to be started up first.");
             }
@@ -174,7 +197,7 @@ private async Task StartOrchardAppAsync()
 
             _cancellationTokenSource = new CancellationTokenSource();
 
-            await _command.ExecuteDotNetApplicationAsync(
+            await _app.ExecuteDotNetApplicationAsync(
                 stdErr =>
                     throw new IOException(
                         "Starting the Orchard Core application via dotnet.exe failed with the following output:" +

From 771a74dd39b6a5e17c49f001cc9bb1309773a793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 18 Jul 2022 16:52:52 +0200
Subject: [PATCH 02/53] Adding minimal WebDriverFactory implementation

---
 .../Lombiq.Tests.UI.Samples.csproj            |   1 +
 Lombiq.Tests.UI.Samples/UITestBase.cs         |   2 +-
 Lombiq.Tests.UI/Delegates/MultiSizeTest.cs    |   6 +-
 Lombiq.Tests.UI/KillLeftoverProcesses.bat     |   1 +
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj        |   2 +-
 .../Models/InstanceCommandLineArgs.cs         |  19 ++
 Lombiq.Tests.UI/OrchardCoreUITestBase.cs      |  21 +-
 .../CustomWebApplicationFactory.cs            | 174 -----------
 .../OrchardApplicationFactory.cs              |  52 ++++
 .../OrchardCoreHosting/OrchardCoreInstance.cs | 292 ------------------
 .../Services/OrchardCoreInstance.cs           | 218 +++++++++++++
 .../Services/UITestExecutionSession.cs        |  65 ++--
 Lombiq.Tests.UI/Services/UITestExecutor.cs    |  10 +-
 13 files changed, 349 insertions(+), 514 deletions(-)
 create mode 100644 Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
 delete mode 100644 Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs
 create mode 100644 Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
 delete mode 100644 Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs
 create mode 100644 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index c2dad2989..b0334a654 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -43,6 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Lombiq.OSOCE.Web\Lombiq.OSOCE.Web.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
   </ItemGroup>
 
diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index 8acfe8b6a..5fa9fce31 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -12,7 +12,7 @@ namespace Lombiq.Tests.UI.Samples;
 
 // This will be the base class for our UI test classes. Here we'll set up some common configuration. Inheriting test
 // classes is not mandatory but the approach is simple and effective.
-public class UITestBase : OrchardCoreUITestBase
+public class UITestBase : OrchardCoreUITestBase<Program>
 {
     // We somehow need to tell the UI Testing Toolbox where the assemblies of the app under test is (since it'll run the
     // app from the command line). We use a helper for that.
diff --git a/Lombiq.Tests.UI/Delegates/MultiSizeTest.cs b/Lombiq.Tests.UI/Delegates/MultiSizeTest.cs
index 1f0159ecf..d132d0af1 100644
--- a/Lombiq.Tests.UI/Delegates/MultiSizeTest.cs
+++ b/Lombiq.Tests.UI/Delegates/MultiSizeTest.cs
@@ -4,13 +4,13 @@
 namespace Lombiq.Tests.UI.Delegates;
 
 /// <summary>
-/// An test action where the window is sized to one of the two screen sizes in <see cref="OrchardCoreUITestBase"/>.
+/// An test action where the window is sized to one of the two screen sizes in <see cref="OrchardCoreUITestBase{TEntryPoint}"/>.
 /// </summary>
 /// <param name="context">The context of the currently executed UI test.</param>
 /// <param name="isStandardSize">
 /// A value indicating the screen size being used. If <see langword="true"/> then the window is set to <see
-/// cref="OrchardCoreUITestBase.StandardBrowserSize"/>, otherwise to <see
-/// cref="OrchardCoreUITestBase.MobileBrowserSize"/>.
+/// cref="OrchardCoreUITestBase{TEntryPoint}.StandardBrowserSize"/>, otherwise to <see
+/// cref="OrchardCoreUITestBase{TEntryPoint}.MobileBrowserSize"/>.
 /// </param>
 public delegate void MultiSizeTest(UITestContext context, bool isStandardSize);
 
diff --git a/Lombiq.Tests.UI/KillLeftoverProcesses.bat b/Lombiq.Tests.UI/KillLeftoverProcesses.bat
index 2f3e5092a..320669db2 100644
--- a/Lombiq.Tests.UI/KillLeftoverProcesses.bat
+++ b/Lombiq.Tests.UI/KillLeftoverProcesses.bat
@@ -1,3 +1,4 @@
+@rem TODO: 
 taskkill /f /im "dotnet.exe"
 taskkill /f /im "chromedriver.exe"
 taskkill /f /im "geckodriver.exe"
diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index f53be5315..ac2726fca 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -67,7 +67,7 @@
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="WebDriverManager" Version="2.13.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
new file mode 100644
index 000000000..ebe903a31
--- /dev/null
+++ b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace Lombiq.Tests.UI.Models;
+
+public class InstanceCommandLineArgs
+{
+    private readonly List<string> _args = new();
+
+    public InstanceCommandLineArgs AddArg(string arg)
+    {
+        _args.Add(arg);
+        return this;
+    }
+
+    public InstanceCommandLineArgs AddArgValue<T>(string arg, T value) =>
+        AddArg($"{arg}={value}");
+
+    public IEnumerable<string> Args => _args;
+}
diff --git a/Lombiq.Tests.UI/OrchardCoreUITestBase.cs b/Lombiq.Tests.UI/OrchardCoreUITestBase.cs
index 7b9678241..28cc4be6e 100644
--- a/Lombiq.Tests.UI/OrchardCoreUITestBase.cs
+++ b/Lombiq.Tests.UI/OrchardCoreUITestBase.cs
@@ -11,16 +11,19 @@
 
 namespace Lombiq.Tests.UI;
 
-public abstract class OrchardCoreUITestBase
+internal static class OrchardCoreUITestBaseCounter
 {
-    private const string AppFolder = nameof(AppFolder);
+    public static object SnapshotCopyLock { get; } = new();
+    public static bool AppFolderCreated { get; set; }
+}
 
-    private static readonly object _snapshotCopyLock = new();
+public abstract class OrchardCoreUITestBase<TEntryPoint>
+     where TEntryPoint : class
+{
+    private const string AppFolder = nameof(AppFolder);
 
     protected ITestOutputHelper _testOutputHelper;
 
-    private static bool _appFolderCreated;
-
     protected abstract string AppAssemblyPath { get; }
 
     protected virtual Size StandardBrowserSize => CommonDisplayResolutions.Standard;
@@ -143,9 +146,9 @@ protected virtual Task ExecuteTestFromExistingDBAsync(
         string customSnapshotFolderPath = null,
         Func<OrchardCoreUITestExecutorConfiguration, Task> changeConfigurationAsync = null)
     {
-        lock (_snapshotCopyLock)
+        lock (OrchardCoreUITestBaseCounter.SnapshotCopyLock)
         {
-            if (!_appFolderCreated)
+            if (!OrchardCoreUITestBaseCounter.AppFolderCreated)
             {
                 DirectoryHelper.SafelyDeleteDirectoryIfExists(AppFolder);
 
@@ -153,7 +156,7 @@ protected virtual Task ExecuteTestFromExistingDBAsync(
                     customSnapshotFolderPath ?? OrchardCoreDirectoryHelper.GetAppRootPath(AppAssemblyPath),
                     AppFolder);
 
-                _appFolderCreated = true;
+                OrchardCoreUITestBaseCounter.AppFolderCreated = true;
             }
         }
 
@@ -234,7 +237,7 @@ protected virtual async Task ExecuteTestAsync(
 
         try
         {
-            await UITestExecutor.ExecuteOrchardCoreTestAsync(testManifest, configuration);
+            await UITestExecutor.ExecuteOrchardCoreTestAsync<TEntryPoint>(testManifest, configuration);
         }
         finally
         {
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs
deleted file mode 100644
index 41874f7d7..000000000
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/CustomWebApplicationFactory.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-
-namespace Lombiq.Tests.UI.Services.OrchardCoreHosting
-{
-    // Taken from: https://github.com/benday-inc/SeleniumDemo.
-    public class CustomWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup>
-       where TStartup : class
-    {
-        private readonly string _baseAddress = "https://localhost";
-        private IWebHost _webHost;
-        private Action<IWebHostBuilder> _addDevelopmentConfigs;
-        private readonly bool _verbose;
-
-        public CustomWebApplicationFactory(
-            bool verbose = false,
-            Action<IWebHostBuilder> addDevelopmentConfigurations = null)
-        {
-            _verbose = verbose;
-
-            WriteToLog($"CustomWebApplicationFactory.ctor starting...");
-
-            if (addDevelopmentConfigurations != null)
-            {
-                _addDevelopmentConfigs = addDevelopmentConfigurations;
-            }
-
-            ClientOptions.BaseAddress = new Uri(_baseAddress);
-
-            WriteToLog($"CustomWebApplicationFactory.ctor calling CreateServer()...");
-
-            CreateServer(CreateWebHostBuilder());
-
-            WriteToLog($"CustomWebApplicationFactory.ctor exiting...");
-        }
-
-        private void WriteToLog(string message)
-        {
-            if (_verbose == true)
-            {
-                Console.WriteLine(message);
-            }
-        }
-
-        public string GetServerAddress()
-        {
-            var serverAddresses = _webHost.ServerFeatures.Get<IServerAddressesFeature>();
-
-            if (serverAddresses == null)
-            {
-                throw new InvalidOperationException($"Could not get instance of IServerAddressFeature.");
-            }
-
-            var addresses = serverAddresses.Addresses;
-
-            var returnValue = addresses.FirstOrDefault();
-
-            return returnValue;
-        }
-
-        public string GetServerAddressForRelativeUrl(string url)
-        {
-            var baseAddr = GetServerAddress();
-
-            return $"{baseAddr}/{url}";
-        }
-
-        public TestServer TestServer { get; private set; }
-
-        protected override TestServer CreateServer(IWebHostBuilder builder)
-        {
-            WriteToLog($"CustomWebApplicationFactory.CreateServer() starting...");
-
-            WriteToLog($"CustomWebApplicationFactory.CreateServer() calling builder.Build()...");
-            _webHost = builder.Build();
-
-            WriteToLog($"CustomWebApplicationFactory.CreateServer() calling webhost.start()...");
-            _webHost.Start();
-
-            TestServer returnValue = InitializeTestServer();
-
-            WriteToLog($"CustomWebApplicationFactory.CreateServer() exiting...");
-
-            return returnValue;
-        }
-
-        private TestServer InitializeTestServer()
-        {
-            WriteToLog($"CustomWebApplicationFactory.InitializeTestServer() creating instance of test server...");
-
-            var builder = new WebHostBuilder().UseStartup<TStartup>();
-
-            WriteToLog($"CustomWebApplicationFactory.InitializeTestServer() invoking add dev config...");
-            _addDevelopmentConfigs?.Invoke(builder);
-            WriteToLog($"CustomWebApplicationFactory.InitializeTestServer() invoked add dev config...");
-
-            var returnValue = new TestServer(builder);
-            // var returnValue = new TestServer(builder.UseStartup<TStartup>());
-
-            TestServer = returnValue;
-            return returnValue;
-        }
-
-        protected override IWebHostBuilder CreateWebHostBuilder()
-        {
-            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() starting...");
-
-            var builder = WebHost.CreateDefaultBuilder(Array.Empty<string>());
-            builder.UseStartup<TStartup>();
-
-            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() invoking add dev config...");
-            _addDevelopmentConfigs?.Invoke(builder);
-            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() invoked add dev config...");
-
-            WriteToLog($"CustomWebApplicationFactory.CreateWebHostBuilder() starting...");
-
-            return builder;
-        }
-
-        protected IServiceScope _scope;
-        protected IServiceScope Scope
-        {
-            get
-            {
-                if (_scope == null)
-                {
-                    var scopeFactory =
-                        TestServer.Services.GetRequiredService<IServiceScopeFactory>();
-
-                    if (scopeFactory == null)
-                    {
-                        throw new InvalidOperationException("Could not create instance of IServiceScopeFactory.");
-                    }
-
-                    _scope = scopeFactory.CreateScope();
-                }
-
-                return _scope;
-            }
-        }
-
-        public T CreateInstance<T>()
-        {
-            var provider = Scope.ServiceProvider;
-
-            var returnValue = provider.GetRequiredService<T>();
-
-            return returnValue;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            _addDevelopmentConfigs = null;
-
-            _scope?.Dispose();
-            _scope = null;
-
-            _webHost?.Dispose();
-            _webHost = null;
-
-            base.Dispose(disposing);
-            if (disposing)
-            {
-                _webHost?.Dispose();
-            }
-        }
-    }
-}
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
new file mode 100644
index 000000000..2e8337e2d
--- /dev/null
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -0,0 +1,52 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Threading.Tasks;
+
+namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
+
+// Taken from: https://github.com/benday-inc/SeleniumDemo.
+public class OrchardApplicationFactory<TStartup> : WebApplicationFactory<TStartup>
+   where TStartup : class
+{
+    private readonly Action<IWebHostBuilder> _configuration;
+    private IHost _host;
+
+    public OrchardApplicationFactory(string rootUrl, Action<IWebHostBuilder> configuration = null)
+    {
+        RootUrl = rootUrl;
+        _configuration = configuration;
+    }
+
+    protected override void ConfigureWebHost(IWebHostBuilder builder) => _configuration?.Invoke(builder);
+
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        var host = builder.Build();
+
+        // configure and start the actual host.
+        builder.ConfigureWebHost(webHostBuilder =>
+            webHostBuilder.UseKestrel()
+                .UseUrls(RootUrl));
+
+        _host = builder.Build();
+        _host.Start();
+
+        return host;
+    }
+
+    // WebApplicationFactory<>.DisposeAsync() calls "GC.SuppressFinalize".
+#pragma warning disable CA1816 // Call GC.SuppressFinalize correctly
+    public override async ValueTask DisposeAsync()
+#pragma warning restore CA1816 // Call GC.SuppressFinalize correctly
+    {
+        await _host?.StopAsync();
+        _host?.Dispose();
+        _host = null;
+
+        await base.DisposeAsync();
+    }
+
+    public string RootUrl { get; private set; }
+}
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs
deleted file mode 100644
index a765f6487..000000000
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardCoreInstance.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-using CliWrap;
-using CliWrap.Builders;
-using Lombiq.HelpfulLibraries.Common.Utilities;
-using Lombiq.Tests.UI.Constants;
-using Lombiq.Tests.UI.Helpers;
-using Microsoft.VisualBasic.FileIO;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit.Abstractions;
-
-namespace Lombiq.Tests.UI.Services;
-
-public delegate Task BeforeAppStartHandler(string contentRootPath, ArgumentsBuilder argumentsBuilder);
-
-public delegate Task BeforeTakeSnapshotHandler(string contentRootPath, string snapshotDirectoryPath);
-
-public class OrchardCoreConfiguration
-{
-    public string AppAssemblyPath { get; set; }
-    public string SnapshotDirectoryPath { get; set; }
-    public BeforeAppStartHandler BeforeAppStart { get; set; }
-    public BeforeTakeSnapshotHandler BeforeTakeSnapshot { get; set; }
-
-    /// <summary>
-    /// Adds a command line argument to the app during <see cref="BeforeAppStart"/> that switches AI into offline mode.
-    /// This way it won't try to reach out to a remote server with telemetry and the test remains self-sufficient.
-    /// </summary>
-    public void EnableApplicationInsightsOfflineOperation() =>
-        BeforeAppStart +=
-            (_, argumentsBuilder) =>
-            {
-                argumentsBuilder
-                    .Add("--OrchardCore:Lombiq_Hosting_Azure_ApplicationInsights:EnableOfflineOperation")
-                    .Add("true");
-
-                return Task.CompletedTask;
-            };
-}
-
-/// <summary>
-/// A locally executing Orchard Core application.
-/// </summary>
-public sealed class OrchardCoreInstance : IWebApplicationInstance
-{
-    // Using an HTTPS URL so it's the same as in the actual app.
-    private const string UrlPrefix = "https://localhost:";
-
-    private static readonly PortLeaseManager _portLeaseManager;
-    private static readonly ConcurrentDictionary<string, string> _exeCopyMarkers = new();
-    private static readonly object _exeCopyLock = new();
-    private static readonly string _executableExtension = OperatingSystem.IsWindows() ? ".exe" : string.Empty;
-
-    private readonly OrchardCoreConfiguration _configuration;
-    private readonly string _contextId;
-    private readonly ITestOutputHelper _testOutputHelper;
-    private Command _command;
-    private CancellationTokenSource _cancellationTokenSource;
-    private int _port;
-    private string _contentRootPath;
-    private bool _isDisposed;
-
-    // Not actually unnecessary.
-#pragma warning disable IDE0079 // Remove unnecessary suppression
-    [SuppressMessage(
-        "Performance",
-        "CA1810:Initialize reference type static fields inline",
-        Justification = "No GetAgentIndexOrDefault() duplication this way.")]
-#pragma warning restore IDE0079 // Remove unnecessary suppression
-    static OrchardCoreInstance()
-    {
-        var agentIndexTimesHundred = TestConfigurationManager.GetAgentIndexOrDefault() * 100;
-        _portLeaseManager = new PortLeaseManager(9000 + agentIndexTimesHundred, 9099 + agentIndexTimesHundred);
-    }
-
-    public OrchardCoreInstance(OrchardCoreConfiguration configuration, string contextId, ITestOutputHelper testOutputHelper)
-    {
-        _configuration = configuration;
-        _contextId = contextId;
-        _testOutputHelper = testOutputHelper;
-    }
-
-    public async Task<Uri> StartUpAsync()
-    {
-        _port = _portLeaseManager.LeaseAvailableRandomPort();
-        var url = UrlPrefix + _port.ToTechnicalString();
-
-        _testOutputHelper.WriteLineTimestampedAndDebug("The generated URL for the Orchard Core instance is \"{0}\".", url);
-
-        CreateContentRootFolder();
-
-        if (!string.IsNullOrEmpty(_configuration.SnapshotDirectoryPath) && Directory.Exists(_configuration.SnapshotDirectoryPath))
-        {
-            FileSystem.CopyDirectory(_configuration.SnapshotDirectoryPath, _contentRootPath, overwrite: true);
-        }
-        else
-        {
-            // Copying the config files from the assembly path, i.e. the build output path so only those are included
-            // that actually matter.
-            OrchardCoreDirectoryHelper
-                .CopyAppConfigFiles(Path.GetDirectoryName(_configuration.AppAssemblyPath), _contentRootPath);
-        }
-
-        // If you try to use the dotnet command to run a dll published for a different platform (seen this with running
-        // win10-x86 dll files on an x64 Windows machine) then you'll get a "Failed to load the dll from hostpolicy.dll
-        // HRESULT: 0x800700C1" error even if the exe will run without issues. So, if an exe exists, we'll run that.
-        var exePath = _configuration.AppAssemblyPath.ReplaceOrdinalIgnoreCase(".dll", _executableExtension);
-        var useExeToExecuteApp = File.Exists(exePath);
-
-        // Running randomly named executables will make it harder to kill leftover processes in the event of an
-        // interrupted test execution. So using a unified name pattern for such executables.
-        if (useExeToExecuteApp)
-        {
-            exePath = _exeCopyMarkers.GetOrAdd(
-                exePath,
-                exePathKey =>
-                {
-                    // Using a lock because ConcurrentDictionary doesn't guarantee that two value factories won't run
-                    // for the same key.
-                    lock (_exeCopyLock)
-                    {
-                        var copyExePath = Path.Combine(
-                            Path.GetDirectoryName(exePathKey) ?? throw new InvalidOperationException(
-                                $"Unable to find the directory of \"{exePathKey}\"."),
-                            "Lombiq.UITestingToolbox.AppUnderTest." + Path.GetFileName(exePathKey));
-
-                        if (File.Exists(copyExePath) &&
-                            File.GetLastWriteTimeUtc(copyExePath) < File.GetLastWriteTimeUtc(exePathKey))
-                        {
-                            File.Delete(copyExePath);
-                        }
-
-                        if (!File.Exists(copyExePath)) File.Copy(exePathKey, copyExePath);
-
-                        return copyExePath;
-                    }
-                });
-        }
-
-        var argumentsBuilder = new ArgumentsBuilder()
-            .Add("--urls").Add(url)
-            .Add("--contentRoot").Add(_contentRootPath)
-            .Add("--webroot").Add(Path.Combine(_contentRootPath, "wwwroot"))
-            .Add("--environment").Add("Development")
-            // This logging provider is a hard requirement, because we identify when the web server has started by the
-            // information log with the message "Application started. Press Ctrl+C to shut down.". The MS Docs says
-            // (https://docs.microsoft.com/en-us/aspnet/core/migration/50-to-60?view=aspnetcore-6.0&tabs=visual-studio#new-hosting-model)
-            // that you don't need the Microsoft.Hosting.Lifetime provider so some consumers may remove it during the
-            // .NET 6 migration, which would cause Lombiq.Tests.UI to wait indefinitely.
-            .Add("--Logging:LogLevel:Microsoft.Hosting.Lifetime").Add("Information");
-
-        if (!useExeToExecuteApp) argumentsBuilder = argumentsBuilder.Add(_configuration.AppAssemblyPath);
-
-        await _configuration.BeforeAppStart
-            .InvokeAsync<BeforeAppStartHandler>(handler => handler(_contentRootPath, argumentsBuilder));
-
-        _command = Cli.Wrap(useExeToExecuteApp ? exePath : ("dotnet" + _executableExtension))
-            .WithArguments(argumentsBuilder.Build());
-
-        _testOutputHelper.WriteLineTimestampedAndDebug(
-            "The Orchard Core instance will be launched with the following command: \"{0}\".", _command);
-
-        await StartOrchardAppAsync();
-
-        return new Uri(url);
-    }
-
-    public Task PauseAsync() => StopOrchardAppAsync();
-
-    public Task ResumeAsync() => StartOrchardAppAsync();
-
-    public async Task TakeSnapshotAsync(string snapshotDirectoryPath)
-    {
-        ArgumentNullException.ThrowIfNull(snapshotDirectoryPath);
-
-        await PauseAsync();
-
-        if (Directory.Exists(snapshotDirectoryPath)) Directory.Delete(snapshotDirectoryPath, recursive: true);
-
-        Directory.CreateDirectory(snapshotDirectoryPath);
-
-        await _configuration.BeforeTakeSnapshot
-            .InvokeAsync<BeforeTakeSnapshotHandler>(handler => handler(_contentRootPath, snapshotDirectoryPath));
-
-        FileSystem.CopyDirectory(_contentRootPath, snapshotDirectoryPath, overwrite: true);
-    }
-
-    public IEnumerable<IApplicationLog> GetLogs(CancellationToken cancellationToken = default)
-    {
-        if (cancellationToken == default) cancellationToken = CancellationToken.None;
-
-        var logFolderPath = Path.Combine(_contentRootPath, "App_Data", "logs");
-        return Directory.Exists(logFolderPath)
-            ? Directory
-                .EnumerateFiles(logFolderPath, "*.log")
-                .Select(filePath => (IApplicationLog)new ApplicationLog
-                {
-                    Name = Path.GetFileName(filePath),
-                    FullName = Path.GetFullPath(filePath),
-                    ContentLoader = () => File.ReadAllTextAsync(filePath, cancellationToken),
-                })
-            : Enumerable.Empty<IApplicationLog>();
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        if (_isDisposed) return;
-
-        _isDisposed = true;
-
-        await StopOrchardAppAsync();
-
-        _portLeaseManager.StopLease(_port);
-
-        DirectoryHelper.SafelyDeleteDirectoryIfExists(_contentRootPath, 60);
-    }
-
-    private void CreateContentRootFolder()
-    {
-        _contentRootPath = DirectoryPaths.GetTempSubDirectoryPath(_contextId, "App");
-        Directory.CreateDirectory(_contentRootPath);
-        _testOutputHelper.WriteLineTimestampedAndDebug("Content root path was created: {0}", _contentRootPath);
-    }
-
-    private async Task StartOrchardAppAsync()
-    {
-        _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to start the Orchard Core instance.");
-
-        if (_command == null)
-        {
-            throw new InvalidOperationException("The app needs to be started up first.");
-        }
-
-        if (_cancellationTokenSource != null) return;
-
-        _cancellationTokenSource = new CancellationTokenSource();
-
-        await _command.ExecuteDotNetApplicationAsync(
-            stdErr =>
-            {
-                var dotnet = "dotnet" + _executableExtension;
-                var note = stdErr.Text.ContainsOrdinalIgnoreCase("Failed to bind to address")
-                    ? " This can happen when there are leftover " + dotnet +
-                      " processes after an aborted test run or some other app is listening on the same port too."
-                    : string.Empty;
-
-                throw new IOException(
-                    StringHelper.Concatenate(
-                        $"Starting the Orchard Core application via {dotnet} failed with the following output:",
-                        $"{Environment.NewLine}{stdErr.Text}{note}"));
-            },
-            _cancellationTokenSource.Token);
-
-        _testOutputHelper.WriteLineTimestampedAndDebug("The Orchard Core instance was started.");
-    }
-
-    private Task StopOrchardAppAsync()
-    {
-        if (_cancellationTokenSource == null) return Task.CompletedTask;
-
-        _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to stop the Orchard Core instance.");
-
-        // Cancellation is the only way to stop the process, won't be able to send a Ctrl+C, see:
-        // https://github.com/Tyrrrz/CliWrap/issues/47
-        if (!_cancellationTokenSource.IsCancellationRequested) _cancellationTokenSource.Cancel();
-        _cancellationTokenSource.Dispose();
-        _cancellationTokenSource = null;
-
-        _testOutputHelper.WriteLineTimestampedAndDebug("The Orchard Core instance was stopped.");
-
-        return Task.CompletedTask;
-    }
-
-    private class ApplicationLog : IApplicationLog
-    {
-        public string Name { get; init; }
-        public string FullName { get; init; }
-        public Func<Task<string>> ContentLoader { get; init; }
-
-        public Task<string> GetContentAsync() => ContentLoader();
-
-        public void Remove()
-        {
-            if (File.Exists(FullName)) File.Delete(FullName);
-        }
-    }
-}
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
new file mode 100644
index 000000000..305a3e1e0
--- /dev/null
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -0,0 +1,218 @@
+using Lombiq.Tests.UI.Constants;
+using Lombiq.Tests.UI.Helpers;
+using Lombiq.Tests.UI.Models;
+using Lombiq.Tests.UI.Services.OrchardCoreHosting;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.VisualBasic.FileIO;
+using OrchardCore.Modules;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit.Abstractions;
+
+namespace Lombiq.Tests.UI.Services;
+
+public delegate Task BeforeAppStartHandler(string contentRootPath, InstanceCommandLineArgs arguments);
+
+public delegate Task BeforeTakeSnapshotHandler(string contentRootPath, string snapshotDirectoryPath);
+
+public class OrchardCoreConfiguration
+{
+    public string AppAssemblyPath { get; set; }
+    public string SnapshotDirectoryPath { get; set; }
+    public BeforeAppStartHandler BeforeAppStart { get; set; }
+    public BeforeTakeSnapshotHandler BeforeTakeSnapshot { get; set; }
+
+    /// <summary>
+    /// Adds a command line argument to the app during <see cref="BeforeAppStart"/> that switches AI into offline mode.
+    /// This way it won't try to reach out to a remote server with telemetry and the test remains self-sufficient.
+    /// </summary>
+    public void EnableApplicationInsightsOfflineOperation() =>
+        BeforeAppStart +=
+            (_, argumentsBuilder) =>
+            {
+                argumentsBuilder
+                    .AddArgValue("OrchardCore:Lombiq_Hosting_Azure_ApplicationInsights:EnableOfflineOperation", value: true);
+
+                return Task.CompletedTask;
+            };
+}
+
+internal static class OrchardCoreInstanceCounter
+{
+    public const string UrlPrefix = "https://localhost:";
+
+#pragma warning disable IDE0079 // Remove unnecessary suppression
+    [SuppressMessage(
+        "Performance",
+        "CA1810:Initialize reference type static fields inline",
+        Justification = "No GetAgentIndexOrDefault() duplication this way.")]
+#pragma warning restore IDE0079 // Remove unnecessary suppression
+    static OrchardCoreInstanceCounter()
+    {
+        var agentIndexTimesHundred = TestConfigurationManager.GetAgentIndexOrDefault() * 100;
+        PortLeases = new PortLeaseManager(9000 + agentIndexTimesHundred, 9099 + agentIndexTimesHundred);
+    }
+
+    public static PortLeaseManager PortLeases { get; private set; }
+}
+
+/// <summary>
+/// A locally executing Orchard Core application.
+/// </summary>
+public sealed class OrchardCoreInstance<TEntryPoint> : IWebApplicationInstance
+    where TEntryPoint : class
+{
+    private readonly OrchardCoreConfiguration _configuration;
+    private readonly string _contextId;
+    private readonly ITestOutputHelper _testOutputHelper;
+    private string _contentRootPath;
+    private bool _isDisposed;
+    private WebApplicationFactory<TEntryPoint> _orchardApplication;
+    private string _url;
+
+    public OrchardCoreInstance(OrchardCoreConfiguration configuration, string contextId, ITestOutputHelper testOutputHelper)
+    {
+        _configuration = configuration;
+        _contextId = contextId;
+        _testOutputHelper = testOutputHelper;
+    }
+
+    public async Task<Uri> StartUpAsync()
+    {
+        var port = OrchardCoreInstanceCounter.PortLeases.LeaseAvailableRandomPort();
+        _url = OrchardCoreInstanceCounter.UrlPrefix + port.ToTechnicalString();
+        _testOutputHelper.WriteLineTimestampedAndDebug("The generated URL for the Orchard Core instance is \"{0}\".", _url);
+
+        CreateContentRootFolder();
+
+        if (!string.IsNullOrEmpty(_configuration.SnapshotDirectoryPath) && Directory.Exists(_configuration.SnapshotDirectoryPath))
+        {
+            FileSystem.CopyDirectory(_configuration.SnapshotDirectoryPath, _contentRootPath, overwrite: true);
+        }
+        else
+        {
+            // Copying the config files from the assembly path, i.e. the build output path so only those are included
+            // that actually matter.
+            OrchardCoreDirectoryHelper
+                .CopyAppConfigFiles(Path.GetDirectoryName(_configuration.AppAssemblyPath), _contentRootPath);
+        }
+
+        await StartOrchardAppAsync();
+
+        return new Uri(_url);
+    }
+
+    public Task PauseAsync() => StopOrchardAppAsync();
+
+    public Task ResumeAsync() => StartOrchardAppAsync();
+
+    public async Task TakeSnapshotAsync(string snapshotDirectoryPath)
+    {
+        ArgumentNullException.ThrowIfNull(snapshotDirectoryPath);
+
+        await PauseAsync();
+
+        if (Directory.Exists(snapshotDirectoryPath)) Directory.Delete(snapshotDirectoryPath, recursive: true);
+
+        Directory.CreateDirectory(snapshotDirectoryPath);
+
+        await _configuration.BeforeTakeSnapshot
+            .InvokeAsync<BeforeTakeSnapshotHandler>(handler => handler(_contentRootPath, snapshotDirectoryPath));
+
+        FileSystem.CopyDirectory(_contentRootPath, snapshotDirectoryPath, overwrite: true);
+    }
+
+    public IEnumerable<IApplicationLog> GetLogs(CancellationToken cancellationToken = default)
+    {
+        if (cancellationToken == default) cancellationToken = CancellationToken.None;
+
+        var logFolderPath = Path.Combine(_contentRootPath, "App_Data", "logs");
+        return Directory.Exists(logFolderPath)
+            ? Directory
+                .EnumerateFiles(logFolderPath, "*.log")
+                .Select(filePath => (IApplicationLog)new ApplicationLog
+                {
+                    Name = Path.GetFileName(filePath),
+                    FullName = Path.GetFullPath(filePath),
+                    ContentLoader = () => File.ReadAllTextAsync(filePath, cancellationToken),
+                })
+            : Enumerable.Empty<IApplicationLog>();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (_isDisposed) return;
+
+        _isDisposed = true;
+
+        await StopOrchardAppAsync();
+
+        DirectoryHelper.SafelyDeleteDirectoryIfExists(_contentRootPath, 60);
+    }
+
+    private void CreateContentRootFolder()
+    {
+        _contentRootPath = DirectoryPaths.GetTempSubDirectoryPath(_contextId, "App");
+        Directory.CreateDirectory(_contentRootPath);
+        _testOutputHelper.WriteLineTimestampedAndDebug("Content root path was created: {0}", _contentRootPath);
+    }
+
+    private async Task StartOrchardAppAsync()
+    {
+        _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to start the Orchard Core instance.");
+
+        var arguments = new InstanceCommandLineArgs();
+
+        await _configuration.BeforeAppStart
+            .InvokeAsync<BeforeAppStartHandler>(handler => handler(_contentRootPath, arguments));
+
+        _orchardApplication = new OrchardApplicationFactory<TEntryPoint>(_url, builder =>
+        {
+            builder.UseContentRoot(_contentRootPath)
+                .UseWebRoot(Path.Combine(_contentRootPath, "wwwroot"))
+                .UseEnvironment("Development");
+
+            builder.ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Args.ToArray()));
+        });
+
+        _orchardApplication.CreateClient();
+
+        _testOutputHelper.WriteLineTimestampedAndDebug("The Orchard Core instance was started.");
+    }
+
+    private async Task StopOrchardAppAsync()
+    {
+        if (_orchardApplication == null) return;
+
+        _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to stop the Orchard Core instance.");
+
+        await _orchardApplication.DisposeAsync();
+        _orchardApplication = null;
+
+        _testOutputHelper.WriteLineTimestampedAndDebug("The Orchard Core instance was stopped.");
+
+        return;
+    }
+
+    private class ApplicationLog : IApplicationLog
+    {
+        public string Name { get; init; }
+        public string FullName { get; init; }
+        public Func<Task<string>> ContentLoader { get; init; }
+
+        public Task<string> GetContentAsync() => ContentLoader();
+
+        public void Remove()
+        {
+            if (File.Exists(FullName)) File.Delete(FullName);
+        }
+    }
+}
diff --git a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
index bf3460305..ddd2fc62e 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
@@ -1,5 +1,4 @@
 using Atata.HtmlValidation;
-using CliWrap.Builders;
 using Lombiq.HelpfulLibraries.Common.Utilities;
 using Lombiq.Tests.UI.Constants;
 using Lombiq.Tests.UI.Exceptions;
@@ -13,7 +12,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -23,12 +21,9 @@
 
 namespace Lombiq.Tests.UI.Services;
 
-internal sealed class UITestExecutionSession : IAsyncDisposable
+internal sealed class UITestExecutionSession<TEntryPoint> : IAsyncDisposable
+    where TEntryPoint : class
 {
-    // We need to have different snapshots based on whether the test uses the defaults, SQL Server and/or Azure Blob.
-    private static readonly ConcurrentDictionary<string, SynchronizingWebApplicationSnapshotManager> _setupSnapshotManagers = new();
-    private static readonly ConcurrentDictionary<string, (int FailureCount, Exception LatestException)> _setupOperationFailureCount = new();
-
     private readonly UITestManifest _testManifest;
     private readonly OrchardCoreUITestExecutorConfiguration _configuration;
     private readonly UITestExecutorFailureDumpConfiguration _dumpConfiguration;
@@ -91,7 +86,7 @@ public async Task<bool> ExecuteAsync(int retryCount, string dumpRootPath)
 
                 _configuration.OrchardCoreConfiguration.SnapshotDirectoryPath = _snapshotDirectoryPath;
 
-                _currentSetupSnapshotManager = _setupSnapshotManagers.GetOrAdd(
+                _currentSetupSnapshotManager = UITestExecutionSessionsMeta.SetupSnapshotManagers.GetOrAdd(
                     _snapshotDirectoryPath,
                     path => new SynchronizingWebApplicationSnapshotManager(path));
 
@@ -436,7 +431,7 @@ private async Task SetupAsync()
                 await setupConfiguration.BeforeSetup.InvokeAsync<BeforeSetupHandler>(handler => handler(_configuration));
 
                 if (setupConfiguration.FastFailSetup &&
-                    _setupOperationFailureCount.TryGetValue(GetSetupHashCode(), out var failure) &&
+                    UITestExecutionSessionsMeta.SetupOperationFailureCount.TryGetValue(GetSetupHashCode(), out var failure) &&
                     failure.FailureCount > _configuration.MaxRetryCount)
                 {
                     throw new SetupFailedFastException(failure.FailureCount, failure.LatestException);
@@ -476,7 +471,7 @@ private async Task SetupAsync()
         {
             if (setupConfiguration.FastFailSetup)
             {
-                _setupOperationFailureCount.AddOrUpdate(
+                UITestExecutionSessionsMeta.SetupOperationFailureCount.AddOrUpdate(
                     GetSetupHashCode(),
                     (1, ex),
                     (_, pair) => (pair.FailureCount, ex));
@@ -557,15 +552,15 @@ private async Task<UITestContext> CreateContextAsync()
         if (_configuration.UseAzureBlobStorage) azureBlobStorageContext = await SetUpAzureBlobStorageAsync();
         if (_configuration.UseSmtpService) smtpContext = await StartSmtpServiceAsync();
 
-        Task UITestingBeforeAppStartHandlerAsync(string contentRootPath, ArgumentsBuilder argumentsBuilder)
+        Task UITestingBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= UITestingBeforeAppStartHandlerAsync;
 
-            argumentsBuilder.Add("--Lombiq_Tests_UI:IsUITesting").Add("true");
+            arguments.AddArgValue("Lombiq_Tests_UI:IsUITesting", value: true);
 
             if (_configuration.ShortcutsConfiguration.InjectApplicationInfo)
             {
-                argumentsBuilder.Add("--Lombiq_Tests_UI:InjectApplicationInfo").Add("true");
+                arguments.AddArgValue("Lombiq_Tests_UI:InjectApplicationInfo", value: true);
             }
 
             return Task.CompletedTask;
@@ -575,7 +570,10 @@ Task UITestingBeforeAppStartHandlerAsync(string contentRootPath, ArgumentsBuilde
             _configuration.OrchardCoreConfiguration.BeforeAppStart.RemoveAll(UITestingBeforeAppStartHandlerAsync);
         _configuration.OrchardCoreConfiguration.BeforeAppStart += UITestingBeforeAppStartHandlerAsync;
 
-        _applicationInstance = new OrchardCoreInstance(_configuration.OrchardCoreConfiguration, contextId, _testOutputHelper);
+        _applicationInstance = new OrchardCoreInstance<TEntryPoint>(
+            _configuration.OrchardCoreConfiguration,
+            contextId,
+            _testOutputHelper);
         var uri = await _applicationInstance.StartUpAsync();
 
         _configuration.SetUpEvents();
@@ -625,7 +623,7 @@ private SqlServerRunningContext SetUpSqlServer()
         _sqlServerManager = new SqlServerManager(_configuration.SqlServerDatabaseConfiguration);
         var sqlServerContext = _sqlServerManager.CreateDatabase();
 
-        async Task SqlServerManagerBeforeAppStartHandlerAsync(string contentRootPath, ArgumentsBuilder argumentsBuilder)
+        async Task SqlServerManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= SqlServerManagerBeforeAppStartHandlerAsync;
 
@@ -666,23 +664,22 @@ private async Task<AzureBlobStorageRunningContext> SetUpAzureBlobStorageAsync()
         _azureBlobStorageManager = new AzureBlobStorageManager(_configuration.AzureBlobStorageConfiguration);
         var azureBlobStorageContext = await _azureBlobStorageManager.SetupBlobStorageAsync();
 
-        async Task AzureBlobStorageManagerBeforeAppStartHandlerAsync(string contentRootPath, ArgumentsBuilder argumentsBuilder)
+        async Task AzureBlobStorageManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= AzureBlobStorageManagerBeforeAppStartHandlerAsync;
 
             // These need to be configured directly, since that module reads the configuration directly instead of
             // allowing post-configuration.
-            argumentsBuilder
-                .Add("--OrchardCore:OrchardCore_Media_Azure:BasePath")
-                .Add(azureBlobStorageContext.BasePath);
-            argumentsBuilder
-                .Add("--OrchardCore:OrchardCore_Media_Azure:ConnectionString")
-                .Add(_configuration.AzureBlobStorageConfiguration.ConnectionString);
-            argumentsBuilder
-                .Add("--OrchardCore:OrchardCore_Media_Azure:ContainerName")
-                .Add(_configuration.AzureBlobStorageConfiguration.ContainerName);
-            argumentsBuilder.Add("--OrchardCore:OrchardCore_Media_Azure:CreateContainer").Add("true");
-            argumentsBuilder.Add("--Lombiq_Tests_UI:UseAzureBlobStorage").Add("true");
+            arguments
+                .AddArgValue("OrchardCore:OrchardCore_Media_Azure:BasePath", value: azureBlobStorageContext.BasePath)
+                .AddArgValue(
+                    "OrchardCore:OrchardCore_Media_Azure:ConnectionString",
+                    value: _configuration.AzureBlobStorageConfiguration.ConnectionString)
+                .AddArgValue(
+                    "OrchardCore:OrchardCore_Media_Azure:ContainerName",
+                    value: _configuration.AzureBlobStorageConfiguration.ContainerName)
+                .AddArgValue("OrchardCore:OrchardCore_Media_Azure:CreateContainer", value: true)
+                .AddArgValue("Lombiq_Tests_UI:UseAzureBlobStorage", value: true);
 
             if (!_hasSetupOperation || !Directory.Exists(_snapshotDirectoryPath)) return;
 
@@ -701,11 +698,12 @@ private async Task<SmtpServiceRunningContext> StartSmtpServiceAsync()
         _smtpService = new SmtpService(_configuration.SmtpServiceConfiguration);
         var smtpContext = await _smtpService.StartAsync();
 
-        Task SmtpServiceBeforeAppStartHandlerAsync(string contentRootPath, ArgumentsBuilder argumentsBuilder)
+        Task SmtpServiceBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= SmtpServiceBeforeAppStartHandlerAsync;
-            argumentsBuilder.Add("--Lombiq_Tests_UI:SmtpSettings:Port").Add(smtpContext.Port, CultureInfo.InvariantCulture);
-            argumentsBuilder.Add("--Lombiq_Tests_UI:SmtpSettings:Host").Add("localhost");
+            arguments
+                .AddArgValue("Lombiq_Tests_UI:SmtpSettings:Port", value: smtpContext.Port)
+                .AddArgValue("Lombiq_Tests_UI:SmtpSettings:Host", value: "localhost");
             return Task.CompletedTask;
         }
 
@@ -765,3 +763,10 @@ private async Task CreateScreenshotsDumpAsync(string debugInformationPath)
     private static string GetScreenshotPath(string parentDirectoryPath, int index) =>
         Path.Combine(parentDirectoryPath, index.ToTechnicalString() + ".png");
 }
+
+internal static class UITestExecutionSessionsMeta
+{
+    // We need to have different snapshots based on whether the test uses the defaults, SQL Server and/or Azure Blob.
+    public static ConcurrentDictionary<string, SynchronizingWebApplicationSnapshotManager> SetupSnapshotManagers { get; } = new();
+    public static ConcurrentDictionary<string, (int FailureCount, Exception LatestException)> SetupOperationFailureCount { get; } = new();
+}
diff --git a/Lombiq.Tests.UI/Services/UITestExecutor.cs b/Lombiq.Tests.UI/Services/UITestExecutor.cs
index 0b34ceb1a..91341e11a 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutor.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutor.cs
@@ -18,9 +18,10 @@ public static class UITestExecutor
     /// <summary>
     /// Executes a test on a new Orchard Core web app instance within a newly created Atata scope.
     /// </summary>
-    public static Task ExecuteOrchardCoreTestAsync(
+    public static Task ExecuteOrchardCoreTestAsync<TEntryPoint>(
         UITestManifest testManifest,
         OrchardCoreUITestExecutorConfiguration configuration)
+        where TEntryPoint : class
     {
         if (string.IsNullOrEmpty(testManifest.Name))
         {
@@ -58,13 +59,14 @@ public static Task ExecuteOrchardCoreTestAsync(
             }
         }
 
-        return ExecuteOrchardCoreTestInnerAsync(testManifest, configuration, dumpRootPath);
+        return ExecuteOrchardCoreTestInnerAsync<TEntryPoint>(testManifest, configuration, dumpRootPath);
     }
 
-    private static async Task ExecuteOrchardCoreTestInnerAsync(
+    private static async Task ExecuteOrchardCoreTestInnerAsync<TEntryPoint>(
         UITestManifest testManifest,
         OrchardCoreUITestExecutorConfiguration configuration,
         string dumpRootPath)
+        where TEntryPoint : class
     {
         var retryCount = 0;
         var passed = false;
@@ -77,7 +79,7 @@ private static async Task ExecuteOrchardCoreTestInnerAsync(
                     await _numberOfTestsLimit.WaitAsync();
                 }
 
-                await using var instance = new UITestExecutionSession(testManifest, configuration);
+                await using var instance = new UITestExecutionSession<TEntryPoint>(testManifest, configuration);
                 passed = await instance.ExecuteAsync(retryCount, dumpRootPath);
             }
             catch (Exception ex) when (retryCount < configuration.MaxRetryCount)

From cc9064b6a9ae9afdddf796304d071c2aa2d38ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 18 Jul 2022 21:57:31 +0200
Subject: [PATCH 03/53] Injecting FakeStore

---
 .../Services/OrchardCoreHosting/FakeStore.cs  | 62 +++++++++++++++++++
 .../OrchardApplicationFactory.cs              | 57 ++++++++++++++++-
 2 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
new file mode 100644
index 000000000..926b659df
--- /dev/null
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using YesSql;
+using YesSql.Indexes;
+
+namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
+
+public class FakeStore : IStore
+{
+    private readonly List<ISession> _createdSessions = new();
+    private readonly IStore _store;
+
+    public FakeStore(IStore store) =>
+        _store = store;
+
+    public IConfiguration Configuration => _store.Configuration;
+
+    public ITypeService TypeNames => _store.TypeNames;
+
+    public ISession CreateSession()
+    {
+        lock (_createdSessions)
+        {
+            var session = _store.CreateSession();
+            _createdSessions.Add(session);
+
+            return session;
+        }
+    }
+
+    public IEnumerable<IndexDescriptor> Describe(Type target, string collection = null) => _store.Describe(target, collection);
+
+    public void Dispose()
+    {
+        foreach (var session in _createdSessions)
+        {
+            try
+            {
+                session.Dispose();
+            }
+            catch
+#pragma warning disable S108 // Nested blocks of code should not be left empty
+            {
+            }
+#pragma warning restore S108 // Nested blocks of code should not be left empty
+        }
+
+        _createdSessions.Clear();
+
+        _store?.Dispose();
+
+        GC.Collect();
+    }
+
+    public Task InitializeAsync() => _store.InitializeAsync();
+
+    public Task InitializeCollectionAsync(string collection) => _store.InitializeCollectionAsync(collection);
+
+    public IStore RegisterIndexes(IEnumerable<IIndexProvider> indexProviders, string collection = null) =>
+        _store.RegisterIndexes(indexProviders, collection);
+}
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 2e8337e2d..d2dd11ba9 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -1,8 +1,14 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using YesSql;
 
 namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
 
@@ -11,6 +17,7 @@ public class OrchardApplicationFactory<TStartup> : WebApplicationFactory<TStartu
    where TStartup : class
 {
     private readonly Action<IWebHostBuilder> _configuration;
+    private readonly List<IStore> _createdStores = new();
     private IHost _host;
 
     public OrchardApplicationFactory(string rootUrl, Action<IWebHostBuilder> configuration = null)
@@ -19,7 +26,11 @@ public OrchardApplicationFactory(string rootUrl, Action<IWebHostBuilder> configu
         _configuration = configuration;
     }
 
-    protected override void ConfigureWebHost(IWebHostBuilder builder) => _configuration?.Invoke(builder);
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
+    {
+        builder.ConfigureTestServices(ConfigureTestServices);
+        _configuration?.Invoke(builder);
+    }
 
     protected override IHost CreateHost(IHostBuilder builder)
     {
@@ -28,7 +39,8 @@ protected override IHost CreateHost(IHostBuilder builder)
         // configure and start the actual host.
         builder.ConfigureWebHost(webHostBuilder =>
             webHostBuilder.UseKestrel()
-                .UseUrls(RootUrl));
+                .UseUrls(RootUrl)
+                .ConfigureTestServices(ConfigureTestServices));
 
         _host = builder.Build();
         _host.Start();
@@ -36,16 +48,57 @@ protected override IHost CreateHost(IHostBuilder builder)
         return host;
     }
 
+    private void ConfigureTestServices(IServiceCollection services)
+    {
+        var builder = services
+                .LastOrDefault(d => d.ServiceType == typeof(OrchardCoreBuilder))?
+                .ImplementationInstance as OrchardCoreBuilder;
+        builder.ConfigureServices(builderServices => AddFakeStore(builderServices));
+    }
+
+    private void AddFakeStore(IServiceCollection services)
+    {
+        var storeDescriptor = services.LastOrDefault(d => d.ServiceType == typeof(IStore));
+
+        services.RemoveAll<IStore>();
+
+        services.AddSingleton<IStore>(serviceProvider =>
+        {
+            var store = (IStore)storeDescriptor.ImplementationFactory.Invoke(serviceProvider);
+            if (store is null)
+            {
+                return null;
+            }
+
+            lock (_createdStores)
+            {
+                var fakeStore = new FakeStore((IStore)storeDescriptor.ImplementationFactory.Invoke(serviceProvider));
+                _createdStores.Add(fakeStore);
+
+                return fakeStore;
+            }
+        });
+    }
+
     // WebApplicationFactory<>.DisposeAsync() calls "GC.SuppressFinalize".
 #pragma warning disable CA1816 // Call GC.SuppressFinalize correctly
     public override async ValueTask DisposeAsync()
 #pragma warning restore CA1816 // Call GC.SuppressFinalize correctly
     {
         await _host?.StopAsync();
+
+        foreach (var store in _createdStores)
+        {
+            store.Dispose();
+        }
+
+        _createdStores.Clear();
+
         _host?.Dispose();
         _host = null;
 
         await base.DisposeAsync();
+        GC.Collect();
     }
 
     public string RootUrl { get; private set; }

From 3aa72e250782728f744c68224ed5a572f0c6c235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 20 Jul 2022 07:58:39 +0200
Subject: [PATCH 04/53] Clearing SQLite connection pool

---
 .../Services/OrchardCoreHosting/OrchardApplicationFactory.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index d2dd11ba9..41b094235 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
+using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
@@ -98,7 +99,7 @@ public override async ValueTask DisposeAsync()
         _host = null;
 
         await base.DisposeAsync();
-        GC.Collect();
+        SqliteConnection.ClearAllPools();
     }
 
     public string RootUrl { get; private set; }

From 969e178810c1216e0d53e7acdc9ae42afa5a3e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 24 Jul 2022 22:36:06 +0200
Subject: [PATCH 05/53] Fixing ObjectDisposedException in case of restarting
 Orchard application

---
 .../Lombiq.Tests.UI.Samples.csproj            |  2 +-
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj        |  2 +-
 .../FakeViewCompilerProvider.cs               | 19 +++++++
 .../OrchardApplicationFactory.cs              | 55 +++++++------------
 .../Services/OrchardCoreInstance.cs           | 20 +++++--
 5 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeViewCompilerProvider.cs

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index b0334a654..130a49782 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index ac2726fca..1b018d4d3 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -67,10 +67,10 @@
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="WebDriverManager" Version="2.13.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.7" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Lombiq.Tests\Lombiq.Tests.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI.Shortcuts\Lombiq.Tests.UI.Shortcuts.csproj" />
   </ItemGroup>
 
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeViewCompilerProvider.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeViewCompilerProvider.cs
new file mode 100644
index 000000000..3b2dccb9b
--- /dev/null
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeViewCompilerProvider.cs
@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Linq;
+
+namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
+
+public class FakeViewCompilerProvider : IViewCompilerProvider
+{
+    private readonly IServiceProvider _services;
+
+    public FakeViewCompilerProvider(IServiceProvider services) => _services = services;
+
+    public IViewCompiler GetCompiler() =>
+        _services
+            .GetServices<IViewCompilerProvider>()
+            .FirstOrDefault()
+            .GetCompiler();
+}
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 41b094235..5d41672f0 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -1,10 +1,11 @@
+using Lombiq.Tests.Integration.Services;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,19 +14,16 @@
 
 namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
 
-// Taken from: https://github.com/benday-inc/SeleniumDemo.
-public class OrchardApplicationFactory<TStartup> : WebApplicationFactory<TStartup>
+public class OrchardApplicationFactory<TStartup> : WebApplicationFactory<TStartup>, IProxyConnectionProvider
    where TStartup : class
 {
     private readonly Action<IWebHostBuilder> _configuration;
     private readonly List<IStore> _createdStores = new();
-    private IHost _host;
 
-    public OrchardApplicationFactory(string rootUrl, Action<IWebHostBuilder> configuration = null)
-    {
-        RootUrl = rootUrl;
+    public OrchardApplicationFactory(Action<IWebHostBuilder> configuration = null) =>
         _configuration = configuration;
-    }
+
+    public string BaseAddress => ClientOptions.BaseAddress.ToString();
 
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
@@ -33,33 +31,22 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         _configuration?.Invoke(builder);
     }
 
-    protected override IHost CreateHost(IHostBuilder builder)
-    {
-        var host = builder.Build();
-
-        // configure and start the actual host.
-        builder.ConfigureWebHost(webHostBuilder =>
-            webHostBuilder.UseKestrel()
-                .UseUrls(RootUrl)
-                .ConfigureTestServices(ConfigureTestServices));
-
-        _host = builder.Build();
-        _host.Start();
-
-        return host;
-    }
-
     private void ConfigureTestServices(IServiceCollection services)
     {
         var builder = services
-                .LastOrDefault(d => d.ServiceType == typeof(OrchardCoreBuilder))?
+                .LastOrDefault(descriptor => descriptor.ServiceType == typeof(OrchardCoreBuilder))?
                 .ImplementationInstance as OrchardCoreBuilder;
-        builder.ConfigureServices(builderServices => AddFakeStore(builderServices));
+
+        builder.ConfigureServices(builderServices =>
+        {
+            AddFakeStore(builderServices);
+            AddFakeViewCompilerProvider(builderServices);
+        });
     }
 
     private void AddFakeStore(IServiceCollection services)
     {
-        var storeDescriptor = services.LastOrDefault(d => d.ServiceType == typeof(IStore));
+        var storeDescriptor = services.LastOrDefault(descriptor => descriptor.ServiceType == typeof(IStore));
 
         services.RemoveAll<IStore>();
 
@@ -81,13 +68,18 @@ private void AddFakeStore(IServiceCollection services)
         });
     }
 
+    // This is required because OrchardCore adds OrchardCore.Mvc.SharedViewCompilerProvider as IViewCompilerProvider but it
+    // holds a IViewCompiler(Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.RuntimeViewCompiler) instance reference in
+    // a static member(_compiler) and it not get released on IHost.StopAsync() call, and this cause an ObjectDisposedException
+    // on next run.
+    private static void AddFakeViewCompilerProvider(IServiceCollection services) =>
+        services.AddSingleton<IViewCompilerProvider, FakeViewCompilerProvider>();
+
     // WebApplicationFactory<>.DisposeAsync() calls "GC.SuppressFinalize".
 #pragma warning disable CA1816 // Call GC.SuppressFinalize correctly
     public override async ValueTask DisposeAsync()
 #pragma warning restore CA1816 // Call GC.SuppressFinalize correctly
     {
-        await _host?.StopAsync();
-
         foreach (var store in _createdStores)
         {
             store.Dispose();
@@ -95,12 +87,7 @@ public override async ValueTask DisposeAsync()
 
         _createdStores.Clear();
 
-        _host?.Dispose();
-        _host = null;
-
         await base.DisposeAsync();
         SqliteConnection.ClearAllPools();
     }
-
-    public string RootUrl { get; private set; }
 }
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index 305a3e1e0..bfe66f447 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -1,9 +1,9 @@
+using Lombiq.Tests.Integration.Services;
 using Lombiq.Tests.UI.Constants;
 using Lombiq.Tests.UI.Helpers;
 using Lombiq.Tests.UI.Models;
 using Lombiq.Tests.UI.Services.OrchardCoreHosting;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.VisualBasic.FileIO;
@@ -75,8 +75,9 @@ public sealed class OrchardCoreInstance<TEntryPoint> : IWebApplicationInstance
     private readonly ITestOutputHelper _testOutputHelper;
     private string _contentRootPath;
     private bool _isDisposed;
-    private WebApplicationFactory<TEntryPoint> _orchardApplication;
+    private OrchardApplicationFactory<TEntryPoint> _orchardApplication;
     private string _url;
+    private TestReverseProxy _reverseProxy;
 
     public OrchardCoreInstance(OrchardCoreConfiguration configuration, string contextId, ITestOutputHelper testOutputHelper)
     {
@@ -105,6 +106,10 @@ public async Task<Uri> StartUpAsync()
                 .CopyAppConfigFiles(Path.GetDirectoryName(_configuration.AppAssemblyPath), _contentRootPath);
         }
 
+        _reverseProxy = new TestReverseProxy(_url);
+
+        await _reverseProxy.StartAsync();
+
         await StartOrchardAppAsync();
 
         return new Uri(_url);
@@ -154,6 +159,10 @@ public async ValueTask DisposeAsync()
         _isDisposed = true;
 
         await StopOrchardAppAsync();
+        if (_reverseProxy != null)
+        {
+            await _reverseProxy.DisposeAsync();
+        }
 
         DirectoryHelper.SafelyDeleteDirectoryIfExists(_contentRootPath, 60);
     }
@@ -174,7 +183,7 @@ private async Task StartOrchardAppAsync()
         await _configuration.BeforeAppStart
             .InvokeAsync<BeforeAppStartHandler>(handler => handler(_contentRootPath, arguments));
 
-        _orchardApplication = new OrchardApplicationFactory<TEntryPoint>(_url, builder =>
+        _orchardApplication = new OrchardApplicationFactory<TEntryPoint>(builder =>
         {
             builder.UseContentRoot(_contentRootPath)
                 .UseWebRoot(Path.Combine(_contentRootPath, "wwwroot"))
@@ -182,14 +191,15 @@ await _configuration.BeforeAppStart
 
             builder.ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Args.ToArray()));
         });
-
-        _orchardApplication.CreateClient();
+        _orchardApplication.ClientOptions.AllowAutoRedirect = false;
+        _reverseProxy.AttachConnectionProvider(_orchardApplication);
 
         _testOutputHelper.WriteLineTimestampedAndDebug("The Orchard Core instance was started.");
     }
 
     private async Task StopOrchardAppAsync()
     {
+        _reverseProxy.DetachConnectionProvider();
         if (_orchardApplication == null) return;
 
         _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to stop the Orchard Core instance.");

From b163e42cab19437a1e450b36b3ac205b84ee07f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 24 Jul 2022 23:03:55 +0200
Subject: [PATCH 06/53] Fixing CA1063: Provide an overridable implementation of
 Dispose(bool)

---
 Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs     | 4 +---
 .../Services/OrchardCoreHosting/OrchardApplicationFactory.cs | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
index 926b659df..d920cfbad 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
@@ -6,7 +6,7 @@
 
 namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
 
-public class FakeStore : IStore
+public sealed class FakeStore : IStore
 {
     private readonly List<ISession> _createdSessions = new();
     private readonly IStore _store;
@@ -49,8 +49,6 @@ public void Dispose()
         _createdSessions.Clear();
 
         _store?.Dispose();
-
-        GC.Collect();
     }
 
     public Task InitializeAsync() => _store.InitializeAsync();
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 5d41672f0..198db00a7 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -14,7 +14,7 @@
 
 namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
 
-public class OrchardApplicationFactory<TStartup> : WebApplicationFactory<TStartup>, IProxyConnectionProvider
+public sealed class OrchardApplicationFactory<TStartup> : WebApplicationFactory<TStartup>, IProxyConnectionProvider
    where TStartup : class
 {
     private readonly Action<IWebHostBuilder> _configuration;
@@ -75,10 +75,7 @@ private void AddFakeStore(IServiceCollection services)
     private static void AddFakeViewCompilerProvider(IServiceCollection services) =>
         services.AddSingleton<IViewCompilerProvider, FakeViewCompilerProvider>();
 
-    // WebApplicationFactory<>.DisposeAsync() calls "GC.SuppressFinalize".
-#pragma warning disable CA1816 // Call GC.SuppressFinalize correctly
     public override async ValueTask DisposeAsync()
-#pragma warning restore CA1816 // Call GC.SuppressFinalize correctly
     {
         foreach (var store in _createdStores)
         {

From de828edf2d45b79f39506f39edb4ba208e318dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 25 Jul 2022 16:49:09 +0200
Subject: [PATCH 07/53] Fixing the cause of failing tests:  -
 BehaviorVueTests.RecipeDataShouldBeDisplayedCorrectly(browser: Chrome)  -
 EmailTests.SendingTestEmailShouldWork(browser: Chrome)

---
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj        |  1 +
 .../Models/InstanceCommandLineArgs.cs         | 13 ++++++++----
 .../OrchardApplicationFactory.cs              | 20 +++++++++++++++++--
 .../Services/OrchardCoreInstance.cs           | 17 +++++++++-------
 .../Services/UITestExecutionSession.cs        | 18 ++++++++---------
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index 1b018d4d3..04b0bb6dd 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -71,6 +71,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Lombiq.Tests\Lombiq.Tests.csproj" />
+    <ProjectReference Include="..\Lombiq.Tests.UI.AppExtensions\Lombiq.Tests.UI.AppExtensions.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI.Shortcuts\Lombiq.Tests.UI.Shortcuts.csproj" />
   </ItemGroup>
 
diff --git a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
index ebe903a31..7ca83a2d1 100644
--- a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
+++ b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
@@ -6,14 +6,19 @@ public class InstanceCommandLineArgs
 {
     private readonly List<string> _args = new();
 
-    public InstanceCommandLineArgs AddArg(string arg)
+    public InstanceCommandLineArgs AddSwitch(string arg)
     {
-        _args.Add(arg);
+        _args.Add($"--{arg}");
+
         return this;
     }
 
-    public InstanceCommandLineArgs AddArgValue<T>(string arg, T value) =>
-        AddArg($"{arg}={value}");
+    public InstanceCommandLineArgs AddValue<T>(string arg, T value)
+    {
+        _args.Add($"--{arg}={value}");
+
+        return this;
+    }
 
     public IEnumerable<string> Args => _args;
 }
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 198db00a7..8edac29ce 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
@@ -18,10 +19,16 @@ public sealed class OrchardApplicationFactory<TStartup> : WebApplicationFactory<
    where TStartup : class
 {
     private readonly Action<IWebHostBuilder> _configuration;
+    private readonly Action<ConfigurationManager, OrchardCoreBuilder> _configureOrchard;
     private readonly List<IStore> _createdStores = new();
 
-    public OrchardApplicationFactory(Action<IWebHostBuilder> configuration = null) =>
+    public OrchardApplicationFactory(
+        Action<IWebHostBuilder> configuration = null,
+        Action<ConfigurationManager, OrchardCoreBuilder> configureOrchard = null)
+    {
         _configuration = configuration;
+        _configureOrchard = configureOrchard;
+    }
 
     public string BaseAddress => ClientOptions.BaseAddress.ToString();
 
@@ -35,7 +42,16 @@ private void ConfigureTestServices(IServiceCollection services)
     {
         var builder = services
                 .LastOrDefault(descriptor => descriptor.ServiceType == typeof(OrchardCoreBuilder))?
-                .ImplementationInstance as OrchardCoreBuilder;
+                .ImplementationInstance as OrchardCoreBuilder
+                ?? throw new InvalidOperationException(
+                    "Pease call WebApplicationBuilder.Services.AddOrchardCms() in your Program.cs!");
+        var configuration = services
+                .LastOrDefault(descriptor => descriptor.ServiceType == typeof(ConfigurationManager))?
+                .ImplementationInstance as ConfigurationManager
+                ?? throw new InvalidOperationException(
+                    "Pease add ConfigurationManager instance to WebApplicationBuilder.Services in your Program.cs!");
+
+        _configureOrchard?.Invoke(configuration, builder);
 
         builder.ConfigureServices(builderServices =>
         {
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index bfe66f447..735ab85d8 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -5,6 +5,7 @@
 using Lombiq.Tests.UI.Services.OrchardCoreHosting;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.VisualBasic.FileIO;
 using OrchardCore.Modules;
@@ -39,7 +40,7 @@ public void EnableApplicationInsightsOfflineOperation() =>
             (_, argumentsBuilder) =>
             {
                 argumentsBuilder
-                    .AddArgValue("OrchardCore:Lombiq_Hosting_Azure_ApplicationInsights:EnableOfflineOperation", value: true);
+                    .AddValue("OrchardCore:Lombiq_Hosting_Azure_ApplicationInsights:EnableOfflineOperation", value: true);
 
                 return Task.CompletedTask;
             };
@@ -183,15 +184,17 @@ private async Task StartOrchardAppAsync()
         await _configuration.BeforeAppStart
             .InvokeAsync<BeforeAppStartHandler>(handler => handler(_contentRootPath, arguments));
 
-        _orchardApplication = new OrchardApplicationFactory<TEntryPoint>(builder =>
-        {
-            builder.UseContentRoot(_contentRootPath)
+        _orchardApplication = new OrchardApplicationFactory<TEntryPoint>(
+            builder => builder
+                .UseContentRoot(_contentRootPath)
                 .UseWebRoot(Path.Combine(_contentRootPath, "wwwroot"))
-                .UseEnvironment("Development");
+                .UseEnvironment("Development")
+                .ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Args.ToArray())),
+            (configuration, orchardBuilder) => orchardBuilder
+                .ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true));
 
-            builder.ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Args.ToArray()));
-        });
         _orchardApplication.ClientOptions.AllowAutoRedirect = false;
+        _orchardApplication.ClientOptions.BaseAddress = new Uri(_reverseProxy.RootUrl);
         _reverseProxy.AttachConnectionProvider(_orchardApplication);
 
         _testOutputHelper.WriteLineTimestampedAndDebug("The Orchard Core instance was started.");
diff --git a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
index ddd2fc62e..7cf164b3f 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
@@ -556,11 +556,11 @@ Task UITestingBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommand
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= UITestingBeforeAppStartHandlerAsync;
 
-            arguments.AddArgValue("Lombiq_Tests_UI:IsUITesting", value: true);
+            arguments.AddValue("Lombiq_Tests_UI:IsUITesting", value: true);
 
             if (_configuration.ShortcutsConfiguration.InjectApplicationInfo)
             {
-                arguments.AddArgValue("Lombiq_Tests_UI:InjectApplicationInfo", value: true);
+                arguments.AddValue("Lombiq_Tests_UI:InjectApplicationInfo", value: true);
             }
 
             return Task.CompletedTask;
@@ -671,15 +671,15 @@ async Task AzureBlobStorageManagerBeforeAppStartHandlerAsync(string contentRootP
             // These need to be configured directly, since that module reads the configuration directly instead of
             // allowing post-configuration.
             arguments
-                .AddArgValue("OrchardCore:OrchardCore_Media_Azure:BasePath", value: azureBlobStorageContext.BasePath)
-                .AddArgValue(
+                .AddValue("OrchardCore:OrchardCore_Media_Azure:BasePath", value: azureBlobStorageContext.BasePath)
+                .AddValue(
                     "OrchardCore:OrchardCore_Media_Azure:ConnectionString",
                     value: _configuration.AzureBlobStorageConfiguration.ConnectionString)
-                .AddArgValue(
+                .AddValue(
                     "OrchardCore:OrchardCore_Media_Azure:ContainerName",
                     value: _configuration.AzureBlobStorageConfiguration.ContainerName)
-                .AddArgValue("OrchardCore:OrchardCore_Media_Azure:CreateContainer", value: true)
-                .AddArgValue("Lombiq_Tests_UI:UseAzureBlobStorage", value: true);
+                .AddValue("OrchardCore:OrchardCore_Media_Azure:CreateContainer", value: true)
+                .AddValue("Lombiq_Tests_UI:UseAzureBlobStorage", value: true);
 
             if (!_hasSetupOperation || !Directory.Exists(_snapshotDirectoryPath)) return;
 
@@ -702,8 +702,8 @@ Task SmtpServiceBeforeAppStartHandlerAsync(string contentRootPath, InstanceComma
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= SmtpServiceBeforeAppStartHandlerAsync;
             arguments
-                .AddArgValue("Lombiq_Tests_UI:SmtpSettings:Port", value: smtpContext.Port)
-                .AddArgValue("Lombiq_Tests_UI:SmtpSettings:Host", value: "localhost");
+                .AddValue("Lombiq_Tests_UI:SmtpSettings:Port", value: smtpContext.Port)
+                .AddValue("Lombiq_Tests_UI:SmtpSettings:Host", value: "localhost");
             return Task.CompletedTask;
         }
 

From b1f0054a92f998ec4b02df97eb1fb61fd800b88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 25 Jul 2022 17:23:20 +0200
Subject: [PATCH 08/53] Maybe fixing failing test:  -
 Lombiq.Tests.UI.Samples.Tests.ErrorHandlingTests.ErrorDuringSetupShouldHaltTest(browser:
 Chrome)

---
 Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs b/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
index 405167293..fad4d6d9a 100644
--- a/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
@@ -4,7 +4,6 @@
 using Lombiq.Tests.UI.Pages;
 using Lombiq.Tests.UI.Samples.Helpers;
 using Lombiq.Tests.UI.Services;
-using Microsoft.SqlServer.Management.Dmf;
 using Shouldly;
 using System;
 using System.Linq;
@@ -108,7 +107,7 @@ public Task BrowserLogsShouldPersist(Browser browser) =>
     public Task ErrorDuringSetupShouldHaltTest(Browser browser) =>
         Should.ThrowAsync<PageChangeAssertionException>(() =>
             ExecuteTestAfterSetupAsync(
-                _ => throw new InvalidOperandException("This point shouldn't be reachable because setup fails."),
+                _ => throw new InvalidOperationException("This point shouldn't be reachable because setup fails."),
                 browser,
                 configuration =>
                 {
@@ -127,7 +126,7 @@ await context.GoToSetupPageAndSetupOrchardCoreAsync(
                                 ConnectionString = "An invalid connection string which causes an error during setup.",
                             });
 
-                        throw new InvalidOperandException(
+                        throw new InvalidOperationException(
                             "This point shouldn't be reachable if the logs are properly kept.");
                     };
                 }));

From 1b182eb198640cd1cf443f57c0de1c88ec54c6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 29 Jul 2022 22:37:43 +0200
Subject: [PATCH 09/53] Adding Migration.md

---
 Lombiq.Tests.UI/Docs/Migration.md | 3 +++
 Readme.md                         | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 Lombiq.Tests.UI/Docs/Migration.md

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
new file mode 100644
index 000000000..9c662d7c3
--- /dev/null
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -0,0 +1,3 @@
+# Migration guide
+
+## Migrating from v3.4.0
diff --git a/Readme.md b/Readme.md
index ec911d3aa..db05e8445 100644
--- a/Readme.md
+++ b/Readme.md
@@ -50,6 +50,7 @@ Do you want to quickly try out this project and see it in action? Check it out i
 - [Limits](Lombiq.Tests.UI/Docs/Limits.md)
 - [Tools we use](Lombiq.Tests.UI/Docs/Tools.md)
 - [Linux-specific considerations](Lombiq.Tests.UI/Docs/Linux.md)
+- [Migration guide](Lombiq.Tests.UI/Docs/Migration.md)
 
 
 ## Contributing and support

From cdbb3c1a298c4bb329f1051a47a18f2f41bb266d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 28 Aug 2022 17:25:58 +0200
Subject: [PATCH 10/53] Fixing after merge

---
 Lombiq.Tests.UI.Samples/UITestBase.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index 5a86a00c1..9cd810a19 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -76,8 +76,7 @@ protected override Task ExecuteTestAsync(
                     (_, argumentsBuilder) =>
                     {
                         argumentsBuilder
-                            .Add("--OrchardCore:OrchardCore_Admin:AdminUrlPrefix")
-                            .Add("Admin");
+                            .AddValue("--OrchardCore:OrchardCore_Admin:AdminUrlPrefix", "Admin");
 
                         return Task.CompletedTask;
                     };

From eada331c5f3614afcbefdad6e914139c5cd5628e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 28 Aug 2022 19:28:45 +0200
Subject: [PATCH 11/53] Fixing command line arg

---
 Lombiq.Tests.UI.Samples/UITestBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index 9cd810a19..d02d17b95 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -76,7 +76,7 @@ protected override Task ExecuteTestAsync(
                     (_, argumentsBuilder) =>
                     {
                         argumentsBuilder
-                            .AddValue("--OrchardCore:OrchardCore_Admin:AdminUrlPrefix", "Admin");
+                            .AddValue("OrchardCore:OrchardCore_Admin:AdminUrlPrefix", "Admin");
 
                         return Task.CompletedTask;
                     };

From ef656a82436f1436d7ef50d58d326638ca950588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 2 Sep 2022 21:57:44 +0200
Subject: [PATCH 12/53] Renaming AddValue to AddWithValue

---
 Lombiq.Tests.UI.Samples/UITestBase.cs         |  2 +-
 Lombiq.Tests.UI/KillLeftoverProcesses.bat     |  1 -
 .../Models/InstanceCommandLineArgs.cs         | 24 ++++++++++++-----
 .../Services/OrchardCoreInstance.cs           |  6 ++---
 .../Services/UITestExecutionSession.cs        | 26 +++++++++----------
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index d02d17b95..ac47497b4 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -76,7 +76,7 @@ protected override Task ExecuteTestAsync(
                     (_, argumentsBuilder) =>
                     {
                         argumentsBuilder
-                            .AddValue("OrchardCore:OrchardCore_Admin:AdminUrlPrefix", "Admin");
+                            .AddWithValue("OrchardCore:OrchardCore_Admin:AdminUrlPrefix", "Admin");
 
                         return Task.CompletedTask;
                     };
diff --git a/Lombiq.Tests.UI/KillLeftoverProcesses.bat b/Lombiq.Tests.UI/KillLeftoverProcesses.bat
index 320669db2..2f3e5092a 100644
--- a/Lombiq.Tests.UI/KillLeftoverProcesses.bat
+++ b/Lombiq.Tests.UI/KillLeftoverProcesses.bat
@@ -1,4 +1,3 @@
-@rem TODO: 
 taskkill /f /im "dotnet.exe"
 taskkill /f /im "chromedriver.exe"
 taskkill /f /im "geckodriver.exe"
diff --git a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
index 7ca83a2d1..3e05a3431 100644
--- a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
+++ b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
@@ -2,23 +2,33 @@
 
 namespace Lombiq.Tests.UI.Models;
 
-public class InstanceCommandLineArgs
+public class InstanceCommandLineArgumentsBuilder
 {
-    private readonly List<string> _args = new();
+    private readonly List<string> _arguments = new();
 
-    public InstanceCommandLineArgs AddSwitch(string arg)
+    public InstanceCommandLineArgumentsBuilder AddSwitch(string argument)
     {
-        _args.Add($"--{arg}");
+        _arguments.Add($"{PrepareArg(argument)}");
 
         return this;
     }
 
-    public InstanceCommandLineArgs AddValue<T>(string arg, T value)
+    public InstanceCommandLineArgumentsBuilder AddWithValue<T>(string key, T value)
     {
-        _args.Add($"--{arg}={value}");
+        _arguments.Add($"{PrepareArg(key)}={value}");
 
         return this;
     }
 
-    public IEnumerable<string> Args => _args;
+    private static string PrepareArg(string argument)
+    {
+        if (!argument.StartsWith("--", System.StringComparison.InvariantCultureIgnoreCase))
+        {
+            return $"--{argument}";
+        }
+
+        return argument;
+    }
+
+    public IEnumerable<string> Arguments => _arguments;
 }
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index cecdfea12..dd6392dac 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -20,7 +20,7 @@
 
 namespace Lombiq.Tests.UI.Services;
 
-public delegate Task BeforeAppStartHandler(string contentRootPath, InstanceCommandLineArgs arguments);
+public delegate Task BeforeAppStartHandler(string contentRootPath, InstanceCommandLineArgumentsBuilder arguments);
 
 public delegate Task BeforeTakeSnapshotHandler(string contentRootPath, string snapshotDirectoryPath);
 
@@ -165,7 +165,7 @@ private async Task StartOrchardAppAsync()
     {
         _testOutputHelper.WriteLineTimestampedAndDebug("Attempting to start the Orchard Core instance.");
 
-        var arguments = new InstanceCommandLineArgs();
+        var arguments = new InstanceCommandLineArgumentsBuilder();
 
         await _configuration.BeforeAppStart
             .InvokeAsync<BeforeAppStartHandler>(handler => handler(_contentRootPath, arguments));
@@ -175,7 +175,7 @@ await _configuration.BeforeAppStart
                 .UseContentRoot(_contentRootPath)
                 .UseWebRoot(Path.Combine(_contentRootPath, "wwwroot"))
                 .UseEnvironment("Development")
-                .ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Args.ToArray())),
+                .ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Arguments.ToArray())),
             (configuration, orchardBuilder) => orchardBuilder
                 .ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true));
 
diff --git a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
index 7cf164b3f..76b1a5672 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
@@ -552,15 +552,15 @@ private async Task<UITestContext> CreateContextAsync()
         if (_configuration.UseAzureBlobStorage) azureBlobStorageContext = await SetUpAzureBlobStorageAsync();
         if (_configuration.UseSmtpService) smtpContext = await StartSmtpServiceAsync();
 
-        Task UITestingBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
+        Task UITestingBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgumentsBuilder arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= UITestingBeforeAppStartHandlerAsync;
 
-            arguments.AddValue("Lombiq_Tests_UI:IsUITesting", value: true);
+            arguments.AddWithValue("Lombiq_Tests_UI:IsUITesting", value: true);
 
             if (_configuration.ShortcutsConfiguration.InjectApplicationInfo)
             {
-                arguments.AddValue("Lombiq_Tests_UI:InjectApplicationInfo", value: true);
+                arguments.AddWithValue("Lombiq_Tests_UI:InjectApplicationInfo", value: true);
             }
 
             return Task.CompletedTask;
@@ -623,7 +623,7 @@ private SqlServerRunningContext SetUpSqlServer()
         _sqlServerManager = new SqlServerManager(_configuration.SqlServerDatabaseConfiguration);
         var sqlServerContext = _sqlServerManager.CreateDatabase();
 
-        async Task SqlServerManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
+        async Task SqlServerManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgumentsBuilder arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= SqlServerManagerBeforeAppStartHandlerAsync;
 
@@ -664,22 +664,22 @@ private async Task<AzureBlobStorageRunningContext> SetUpAzureBlobStorageAsync()
         _azureBlobStorageManager = new AzureBlobStorageManager(_configuration.AzureBlobStorageConfiguration);
         var azureBlobStorageContext = await _azureBlobStorageManager.SetupBlobStorageAsync();
 
-        async Task AzureBlobStorageManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
+        async Task AzureBlobStorageManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgumentsBuilder arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= AzureBlobStorageManagerBeforeAppStartHandlerAsync;
 
             // These need to be configured directly, since that module reads the configuration directly instead of
             // allowing post-configuration.
             arguments
-                .AddValue("OrchardCore:OrchardCore_Media_Azure:BasePath", value: azureBlobStorageContext.BasePath)
-                .AddValue(
+                .AddWithValue("OrchardCore:OrchardCore_Media_Azure:BasePath", value: azureBlobStorageContext.BasePath)
+                .AddWithValue(
                     "OrchardCore:OrchardCore_Media_Azure:ConnectionString",
                     value: _configuration.AzureBlobStorageConfiguration.ConnectionString)
-                .AddValue(
+                .AddWithValue(
                     "OrchardCore:OrchardCore_Media_Azure:ContainerName",
                     value: _configuration.AzureBlobStorageConfiguration.ContainerName)
-                .AddValue("OrchardCore:OrchardCore_Media_Azure:CreateContainer", value: true)
-                .AddValue("Lombiq_Tests_UI:UseAzureBlobStorage", value: true);
+                .AddWithValue("OrchardCore:OrchardCore_Media_Azure:CreateContainer", value: true)
+                .AddWithValue("Lombiq_Tests_UI:UseAzureBlobStorage", value: true);
 
             if (!_hasSetupOperation || !Directory.Exists(_snapshotDirectoryPath)) return;
 
@@ -698,12 +698,12 @@ private async Task<SmtpServiceRunningContext> StartSmtpServiceAsync()
         _smtpService = new SmtpService(_configuration.SmtpServiceConfiguration);
         var smtpContext = await _smtpService.StartAsync();
 
-        Task SmtpServiceBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgs arguments)
+        Task SmtpServiceBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgumentsBuilder arguments)
         {
             _configuration.OrchardCoreConfiguration.BeforeAppStart -= SmtpServiceBeforeAppStartHandlerAsync;
             arguments
-                .AddValue("Lombiq_Tests_UI:SmtpSettings:Port", value: smtpContext.Port)
-                .AddValue("Lombiq_Tests_UI:SmtpSettings:Host", value: "localhost");
+                .AddWithValue("Lombiq_Tests_UI:SmtpSettings:Port", value: smtpContext.Port)
+                .AddWithValue("Lombiq_Tests_UI:SmtpSettings:Host", value: "localhost");
             return Task.CompletedTask;
         }
 

From cffa7c6e074ad6fe13d15e23f7d42f4e170d70a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sat, 3 Sep 2022 20:33:53 +0200
Subject: [PATCH 13/53] Disabling tests

---
 .../Lombiq.Tests.UI.Samples.csproj            | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index 64f9095a2..dcb04bcb8 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -8,6 +8,20 @@
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Tests\AccessibilityTest.cs" />
+    <Compile Remove="Tests\AzureBlobStorageTests.cs" />
+    <Compile Remove="Tests\BasicOrchardFeaturesTests.cs" />
+    <Compile Remove="Tests\BasicTests.cs" />
+    <Compile Remove="Tests\BasicVisualVerificationTests.cs" />
+    <Compile Remove="Tests\DatabaseSnapshotTests.cs" />
+    <Compile Remove="Tests\EmailTests.cs" />
+    <Compile Remove="Tests\ErrorHandlingTests.cs" />
+    <Compile Remove="Tests\MonkeyTests.cs" />
+    <Compile Remove="Tests\SqlServerTests.cs" />
+    <Compile Remove="Tests\TenantTests.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove=".htmlvalidate.json" />
     <None Remove="xunit.runner.json" />
@@ -33,6 +47,20 @@
     <EmbeddedResource Include="Tests\BasicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Win32NT_chrome.png" />
     <EmbeddedResource Include="Tests\BasicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Win32NT_msedge.png" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="Tests\AccessibilityTest.cs" />
+    <None Include="Tests\AzureBlobStorageTests.cs" />
+    <None Include="Tests\BasicOrchardFeaturesTests.cs" />
+    <None Include="Tests\BasicTests.cs" />
+    <None Include="Tests\BasicVisualVerificationTests.cs" />
+    <None Include="Tests\DatabaseSnapshotTests.cs" />
+    <None Include="Tests\EmailTests.cs" />
+    <None Include="Tests\ErrorHandlingTests.cs" />
+    <None Include="Tests\MonkeyTests.cs" />
+    <None Include="Tests\SqlServerTests.cs" />
+    <None Include="Tests\TenantTests.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />

From 0cbaea698af5b410b1e7ab3b217cc8d5ec82f84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Tue, 6 Sep 2022 23:10:37 +0200
Subject: [PATCH 14/53] Adding logger configuration

---
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj          |  1 +
 .../OrchardApplicationFactory.cs                | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index e9309815f..33cddc6e8 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -63,6 +63,7 @@
     <PackageReference Include="Microsoft.SqlServer.DACFx" Version="160.6161.0" />
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="161.47027.0" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
     <PackageReference Include="Selenium.Axe" Version="4.0.2" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <!-- Can't update to WebDriverManager v2.14.1 or later until an Orchard upgrade: Its AngleSharp dependency is
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 8edac29ce..7d60f2986 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -7,8 +7,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
+using NLog;
+using NLog.Web;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using YesSql;
@@ -34,7 +38,18 @@ public OrchardApplicationFactory(
 
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
-        builder.ConfigureTestServices(ConfigureTestServices);
+        builder.ConfigureTestServices(ConfigureTestServices)
+            .ConfigureLogging((context, loggingBuilder) =>
+            {
+                var environment = context.HostingEnvironment;
+                var nLogConfig = Path.Combine(environment.ContentRootPath, "NLog.config");
+                var factory = new LogFactory()
+                    .LoadConfiguration(nLogConfig);
+
+                factory.Configuration.Variables["configDir"] = environment.ContentRootPath;
+
+                loggingBuilder.AddNLogWeb(factory, new NLogAspNetCoreOptions { ReplaceLoggerFactory = true });
+            });
         _configuration?.Invoke(builder);
     }
 

From 36ceb18b24c252798c0cd86716c4d51bd6cdbe95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Tue, 6 Sep 2022 23:54:20 +0200
Subject: [PATCH 15/53] Enabling Lombiq.Tests.UI.Samples tests

---
 .../Lombiq.Tests.UI.Samples.csproj            | 28 -------------------
 .../OrchardApplicationFactory.cs              |  1 +
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index dcb04bcb8..64f9095a2 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -8,20 +8,6 @@
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Tests\AccessibilityTest.cs" />
-    <Compile Remove="Tests\AzureBlobStorageTests.cs" />
-    <Compile Remove="Tests\BasicOrchardFeaturesTests.cs" />
-    <Compile Remove="Tests\BasicTests.cs" />
-    <Compile Remove="Tests\BasicVisualVerificationTests.cs" />
-    <Compile Remove="Tests\DatabaseSnapshotTests.cs" />
-    <Compile Remove="Tests\EmailTests.cs" />
-    <Compile Remove="Tests\ErrorHandlingTests.cs" />
-    <Compile Remove="Tests\MonkeyTests.cs" />
-    <Compile Remove="Tests\SqlServerTests.cs" />
-    <Compile Remove="Tests\TenantTests.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove=".htmlvalidate.json" />
     <None Remove="xunit.runner.json" />
@@ -47,20 +33,6 @@
     <EmbeddedResource Include="Tests\BasicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Win32NT_chrome.png" />
     <EmbeddedResource Include="Tests\BasicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Win32NT_msedge.png" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <None Include="Tests\AccessibilityTest.cs" />
-    <None Include="Tests\AzureBlobStorageTests.cs" />
-    <None Include="Tests\BasicOrchardFeaturesTests.cs" />
-    <None Include="Tests\BasicTests.cs" />
-    <None Include="Tests\BasicVisualVerificationTests.cs" />
-    <None Include="Tests\DatabaseSnapshotTests.cs" />
-    <None Include="Tests\EmailTests.cs" />
-    <None Include="Tests\ErrorHandlingTests.cs" />
-    <None Include="Tests\MonkeyTests.cs" />
-    <None Include="Tests\SqlServerTests.cs" />
-    <None Include="Tests\TenantTests.cs" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 7d60f2986..9de778968 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -50,6 +50,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
 
                 loggingBuilder.AddNLogWeb(factory, new NLogAspNetCoreOptions { ReplaceLoggerFactory = true });
             });
+
         _configuration?.Invoke(builder);
     }
 

From 6d5f683b42f50c0e886311ff30e5d6a44be48d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 7 Sep 2022 01:07:22 +0200
Subject: [PATCH 16/53] Fixing MonkeyTests

---
 Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
index 5519a7be6..5e28dbbe7 100644
--- a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
@@ -87,7 +87,19 @@ public Task TestAdminBackgroundTasksAsMonkeyRecursivelyShouldWorkWithAdminUser(B
                 await context.SignInDirectlyAndGoToRelativeUrlAsync("/Admin/BackgroundTasks");
                 await context.TestCurrentPageAsMonkeyRecursivelyAsync(monkeyTestingOptions);
             },
-            browser);
+            browser,
+            configuration => configuration.AssertBrowserLog = (logs) =>
+            {
+                var filteredLogs = logs.Where(message =>
+                    !message
+                        .Message
+                        .Contains("An invalid form control with name='LockTimeout' is not focusable.")
+                    && !message
+                        .Message
+                        .Contains("An invalid form control with name='LockExpiration' is not focusable."));
+
+                filteredLogs.ShouldBeEmpty();
+            });
 
     // Monkey testing has its own configuration too. Check out the docs of the options too.
     private static MonkeyTestingOptions CreateMonkeyTestingOptions() =>

From fc57cbae50c6d83fbefd9121d3624835bf820bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 7 Sep 2022 01:39:28 +0200
Subject: [PATCH 17/53] Fixing MonkeyTests again

---
 Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
index 5e28dbbe7..6964e7ae4 100644
--- a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
@@ -1,3 +1,4 @@
+using Atata;
 using Lombiq.Tests.UI.Attributes;
 using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.MonkeyTesting;
@@ -10,6 +11,7 @@
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
+using LogLevel = OpenQA.Selenium.LogLevel;
 
 namespace Lombiq.Tests.UI.Samples.Tests;
 
@@ -96,7 +98,8 @@ public Task TestAdminBackgroundTasksAsMonkeyRecursivelyShouldWorkWithAdminUser(B
                         .Contains("An invalid form control with name='LockTimeout' is not focusable.")
                     && !message
                         .Message
-                        .Contains("An invalid form control with name='LockExpiration' is not focusable."));
+                        .Contains("An invalid form control with name='LockExpiration' is not focusable.")
+                    && message.Level != LogLevel.Info);
 
                 filteredLogs.ShouldBeEmpty();
             });

From 579c8e121845169dd543f9ce4111656fff0f827c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 8 Sep 2022 22:58:22 +0200
Subject: [PATCH 18/53] Coding style Migration guide

---
 Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs | 11 +--
 Lombiq.Tests.UI/Docs/Migration.md            | 81 +++++++++++++++++++-
 2 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
index 6964e7ae4..814ab7450 100644
--- a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
@@ -90,19 +90,16 @@ public Task TestAdminBackgroundTasksAsMonkeyRecursivelyShouldWorkWithAdminUser(B
                 await context.TestCurrentPageAsMonkeyRecursivelyAsync(monkeyTestingOptions);
             },
             browser,
-            configuration => configuration.AssertBrowserLog = (logs) =>
-            {
-                var filteredLogs = logs.Where(message =>
+            configuration => configuration.AssertBrowserLog = (logs) => logs
+                .Where(message =>
                     !message
                         .Message
                         .Contains("An invalid form control with name='LockTimeout' is not focusable.")
                     && !message
                         .Message
                         .Contains("An invalid form control with name='LockExpiration' is not focusable.")
-                    && message.Level != LogLevel.Info);
-
-                filteredLogs.ShouldBeEmpty();
-            });
+                    && message.Level != LogLevel.Info)
+                .ShouldBeEmpty());
 
     // Monkey testing has its own configuration too. Check out the docs of the options too.
     private static MonkeyTestingOptions CreateMonkeyTestingOptions() =>
diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 9c662d7c3..fc07e8137 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -1,3 +1,82 @@
 # Migration guide
 
-## Migrating from v3.4.0
+## Migrating from v3.*.*
+
+### Preparing WebApplication
+
+1. Prepare WebApplication as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
+2. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
+
+```diff
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Logging;
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Host.UseNLogHost();
+
+var configuration = builder.Configuration;
+
+- builder.Services.AddOrchardCms(orchard => orchard.ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true));
++ builder.Services.Add(new ServiceDescriptor(configuration.GetType(), configuration));
++ builder.Services.AddOrchardCms();
+
+var app = builder.Build();
+
+app.UseStaticFiles();
+app.UseOrchardCore();
+app.Run();
+
++ // As described here(https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?view=aspnetcore-6.0).
++ #pragma warning disable CA1050
++ public partial class Program
++ #pragma warning restore CA1050
++ {
++     protected Program()
++     {
++         // Nothing to do here.
++     }
++ }
+```
+
+### Preparing UI test project
+
+1. Add WebApplication project as a `Project reference` to UI test project.
+
+```diff
+  </ItemGroup>
+
+  <ItemGroup>
++    <ProjectReference Include="..\..\src\Lombiq.OSOCE.Web\Lombiq.OSOCE.Web.csproj" />
+    <ProjectReference Include="..\..\src\Modules\Lombiq.ChartJs\Lombiq.ChartJs.Tests.UI\Lombiq.ChartJs.Tests.UI.csproj" />
+    <ProjectReference Include="..\..\src\Modules\Lombiq.DataTables\Lombiq.DataTables\Tests\Lombiq.DataTables.Tests.UI\Lombiq.DataTables.Tests.UI.csproj" />
+    <ProjectReference Include="..\..\src\Modules\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.Tests.UI\Lombiq.HelpfulExtensions.Tests.UI.csproj" />
+```
+
+2. Change `OrchardCoreUITestBase` implementation like below. `AppAssemblyPath` is not required anymore.
+
+```diff
+namespace Lombiq.OSOCE.Tests.UI;
+
+- public class UITestBase : OrchardCoreUITestBase
++ public class UITestBase : OrchardCoreUITestBase<Program>
+{
+-     protected override string AppAssemblyPath => WebAppConfigHelper
+-         .GetAbsoluteApplicationAssemblyPath("Lombiq.OSOCE.Web", "net6.0");
+```
+
+3. There is a breaking change in adding command line arguments to the WebApplication.
+
+    To add command line argument with value, use `InstanceCommandLineArgumentsBuilder.AddWithValue` instead of double call `ArgumentsBuilder.Add`.
+    To add command line switch, use `InstanceCommandLineArgumentsBuilder.AddSwitch`.
+
+```diff
+                configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false;
+                configuration.OrchardCoreConfiguration.BeforeAppStart += (_, argsBuilder) =>
+                {
+-                     argsBuilder.Add("--OrchardCore:OrchardCore_Admin:AdminUrlPrefix").Add("custom-admin");
++                     argsBuilder.AddWithValue("OrchardCore:OrchardCore_Admin:AdminUrlPrefix", "custom-admin");
+
+                    return Task.CompletedTask;
+                };
+```

From 8c6fdc9632c768ce382d6dbdf9203f21fb1dd081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 8 Sep 2022 23:17:04 +0200
Subject: [PATCH 19/53] Removing OrchardCoreUITestBase.AppAssemblyPath

---
 Lombiq.Tests.UI.Samples/UITestBase.cs           | 6 ------
 Lombiq.Tests.UI/Docs/Migration.md               | 1 +
 Lombiq.Tests.UI/OrchardCoreUITestBase.cs        | 7 +++----
 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs | 5 +++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index ac47497b4..e8293acaf 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -1,6 +1,5 @@
 using Lombiq.Tests.UI.Constants;
 using Lombiq.Tests.UI.Extensions;
-using Lombiq.Tests.UI.Helpers;
 using Lombiq.Tests.UI.Samples.Helpers;
 using Lombiq.Tests.UI.Services;
 using Shouldly;
@@ -14,11 +13,6 @@ namespace Lombiq.Tests.UI.Samples;
 // classes is not mandatory but the approach is simple and effective.
 public class UITestBase : OrchardCoreUITestBase<Program>
 {
-    // We somehow need to tell the UI Testing Toolbox where the assemblies of the app under test is (since it'll run the
-    // app from the command line). We use a helper for that.
-    protected override string AppAssemblyPath => WebAppConfigHelper
-        .GetAbsoluteApplicationAssemblyPath("Lombiq.OSOCE.Web", "net6.0");
-
     protected UITestBase(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index fc07e8137..725ad25cb 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -68,6 +68,7 @@ namespace Lombiq.OSOCE.Tests.UI;
 3. There is a breaking change in adding command line arguments to the WebApplication.
 
     To add command line argument with value, use `InstanceCommandLineArgumentsBuilder.AddWithValue` instead of double call `ArgumentsBuilder.Add`.
+
     To add command line switch, use `InstanceCommandLineArgumentsBuilder.AddSwitch`.
 
 ```diff
diff --git a/Lombiq.Tests.UI/OrchardCoreUITestBase.cs b/Lombiq.Tests.UI/OrchardCoreUITestBase.cs
index 28cc4be6e..362f1c6ed 100644
--- a/Lombiq.Tests.UI/OrchardCoreUITestBase.cs
+++ b/Lombiq.Tests.UI/OrchardCoreUITestBase.cs
@@ -24,8 +24,6 @@ public abstract class OrchardCoreUITestBase<TEntryPoint>
 
     protected ITestOutputHelper _testOutputHelper;
 
-    protected abstract string AppAssemblyPath { get; }
-
     protected virtual Size StandardBrowserSize => CommonDisplayResolutions.Standard;
     protected virtual Size MobileBrowserSize => CommonDisplayResolutions.NhdPortrait;
 
@@ -153,7 +151,8 @@ protected virtual Task ExecuteTestFromExistingDBAsync(
                 DirectoryHelper.SafelyDeleteDirectoryIfExists(AppFolder);
 
                 OrchardCoreDirectoryHelper.CopyAppFolder(
-                    customSnapshotFolderPath ?? OrchardCoreDirectoryHelper.GetAppRootPath(AppAssemblyPath),
+                    customSnapshotFolderPath
+                        ?? OrchardCoreDirectoryHelper.GetAppRootPath(typeof(TEntryPoint).Assembly.Location),
                     AppFolder);
 
                 OrchardCoreUITestBaseCounter.AppFolderCreated = true;
@@ -227,7 +226,7 @@ protected virtual async Task ExecuteTestAsync(
 
         var configuration = new OrchardCoreUITestExecutorConfiguration
         {
-            OrchardCoreConfiguration = new OrchardCoreConfiguration { AppAssemblyPath = AppAssemblyPath },
+            OrchardCoreConfiguration = new OrchardCoreConfiguration(),
             TestOutputHelper = _testOutputHelper,
             BrowserConfiguration = { Browser = browser },
             SetupConfiguration = { SetupOperation = setupOperation },
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index dd6392dac..03fbee014 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -26,7 +26,6 @@ namespace Lombiq.Tests.UI.Services;
 
 public class OrchardCoreConfiguration
 {
-    public string AppAssemblyPath { get; set; }
     public string SnapshotDirectoryPath { get; set; }
     public BeforeAppStartHandler BeforeAppStart { get; set; }
     public BeforeTakeSnapshotHandler BeforeTakeSnapshot { get; set; }
@@ -90,7 +89,9 @@ public async Task<Uri> StartUpAsync()
             // Copying the config files from the assembly path, i.e. the build output path so only those are included
             // that actually matter.
             OrchardCoreDirectoryHelper
-                .CopyAppConfigFiles(Path.GetDirectoryName(_configuration.AppAssemblyPath), _contentRootPath);
+                .CopyAppConfigFiles(
+                    Path.GetDirectoryName(typeof(TEntryPoint).Assembly.Location),
+                    _contentRootPath);
         }
 
         _reverseProxy = new TestReverseProxy(_url);

From d90c1d9f451ddb6ba6405cf9f10e446d47babb8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 9 Sep 2022 17:00:11 +0200
Subject: [PATCH 20/53] Using OC services directly instead of Shortcut
 Controllers where possible

---
 .../Controllers/AccountController.cs          |  24 +---
 .../Controllers/ShellFeaturesController.cs    |  50 --------
 .../Controllers/ThemeController.cs            |  66 ----------
 .../Extensions/IExtensionManagerExtensions.cs |  16 +++
 .../IWebApplicationInstanceExtensions.cs      |  25 ++++
 .../ShortcutsUITestContextExtensions.cs       | 121 ++++++++++++++++--
 .../Services/IWebApplicationInstance.cs       |   7 +
 .../Services/OrchardCoreInstance.cs           |   3 +
 8 files changed, 160 insertions(+), 152 deletions(-)
 delete mode 100644 Lombiq.Tests.UI.Shortcuts/Controllers/ShellFeaturesController.cs
 delete mode 100644 Lombiq.Tests.UI.Shortcuts/Controllers/ThemeController.cs
 create mode 100644 Lombiq.Tests.UI/Extensions/IExtensionManagerExtensions.cs
 create mode 100644 Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs

diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
index d4eaafb84..03c1632dd 100644
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
+++ b/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
@@ -2,10 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using OrchardCore.Entities;
-using OrchardCore.Settings;
 using OrchardCore.Users;
-using OrchardCore.Users.Models;
 using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Shortcuts.Controllers;
@@ -15,16 +12,11 @@ public class AccountController : Controller
 {
     private readonly UserManager<IUser> _userManager;
     private readonly SignInManager<IUser> _userSignInManager;
-    private readonly ISiteService _siteService;
 
-    public AccountController(
-        UserManager<IUser> userManager,
-        SignInManager<IUser> userSignInManager,
-        ISiteService siteService)
+    public AccountController(UserManager<IUser> userManager, SignInManager<IUser> userSignInManager)
     {
         _userManager = userManager;
         _userSignInManager = userSignInManager;
-        _siteService = siteService;
     }
 
     [AllowAnonymous]
@@ -45,18 +37,4 @@ public async Task<IActionResult> SignOutDirectly()
 
         return Ok();
     }
-
-    [AllowAnonymous]
-    public async Task<ActionResult> SetUserRegistrationType(UserRegistrationType type)
-    {
-        var settings = await _siteService.LoadSiteSettingsAsync();
-
-        settings.Alter<RegistrationSettings>(
-            nameof(RegistrationSettings),
-            registrationSettings => registrationSettings.UsersCanRegister = type);
-
-        await _siteService.UpdateSiteSettingsAsync(settings);
-
-        return Ok();
-    }
 }
diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/ShellFeaturesController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/ShellFeaturesController.cs
deleted file mode 100644
index 8d4f558a7..000000000
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/ShellFeaturesController.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using OrchardCore.Environment.Extensions;
-using OrchardCore.Environment.Extensions.Features;
-using OrchardCore.Environment.Shell;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Lombiq.Tests.UI.Shortcuts.Controllers;
-
-[DevelopmentAndLocalhostOnly]
-[AllowAnonymous]
-public class ShellFeaturesController : Controller
-{
-    private readonly IShellFeaturesManager _shellFeatureManager;
-    private readonly IExtensionManager _extensionManager;
-
-    public ShellFeaturesController(IShellFeaturesManager shellFeatureManager, IExtensionManager extensionManager)
-    {
-        _shellFeatureManager = shellFeatureManager;
-        _extensionManager = extensionManager;
-    }
-
-    public async Task<IActionResult> EnableFeatureDirectly(string featureId)
-    {
-        var feature = GetFeature(featureId);
-
-        if (feature == null) return NotFound();
-
-        await _shellFeatureManager.EnableFeaturesAsync(new[] { feature }, force: true);
-
-        return Ok();
-    }
-
-    public async Task<IActionResult> DisableFeatureDirectly(string featureId)
-    {
-        var feature = GetFeature(featureId);
-
-        if (feature == null) return NotFound();
-
-        await _shellFeatureManager.DisableFeaturesAsync(new[] { feature }, force: true);
-
-        return Ok();
-    }
-
-    private IFeatureInfo GetFeature(string featureId) =>
-        _extensionManager.GetFeatures().FirstOrDefault(feature => feature.Id.Equals(featureId, StringComparison.Ordinal));
-}
diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/ThemeController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/ThemeController.cs
deleted file mode 100644
index 545e5d22f..000000000
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/ThemeController.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using OrchardCore.Admin;
-using OrchardCore.DisplayManagement.Extensions;
-using OrchardCore.Environment.Extensions;
-using OrchardCore.Environment.Shell;
-using OrchardCore.Modules.Manifest;
-using OrchardCore.Themes.Services;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Lombiq.Tests.UI.Shortcuts.Controllers;
-
-[DevelopmentAndLocalhostOnly]
-public class ThemeController : Controller
-{
-    private readonly IShellFeaturesManager _shellFeaturesManager;
-    private readonly ISiteThemeService _siteThemeService;
-    private readonly IAdminThemeService _adminThemeService;
-
-    public ThemeController(
-        IShellFeaturesManager shellFeaturesManager,
-        ISiteThemeService siteThemeService,
-        IAdminThemeService adminThemeService)
-    {
-        _shellFeaturesManager = shellFeaturesManager;
-        _siteThemeService = siteThemeService;
-        _adminThemeService = adminThemeService;
-    }
-
-    [AllowAnonymous]
-    public async Task<IActionResult> SelectTheme(string id)
-    {
-        var themeFeature = (await _shellFeaturesManager.GetAvailableFeaturesAsync())
-            .FirstOrDefault(feature => feature.IsTheme() && feature.Id == id);
-
-        if (themeFeature == null)
-        {
-            return NotFound();
-        }
-
-        if (IsAdminTheme(themeFeature.Extension.Manifest))
-        {
-            await _adminThemeService.SetAdminThemeAsync(id);
-        }
-        else
-        {
-            await _siteThemeService.SetSiteThemeAsync(id);
-        }
-
-        var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
-        var isEnabled = enabledFeatures.Any(feature => feature.Extension.Id == themeFeature.Id);
-
-        if (!isEnabled)
-        {
-            await _shellFeaturesManager.EnableFeaturesAsync(new[] { themeFeature }, force: true);
-        }
-
-        return Ok();
-    }
-
-    private static bool IsAdminTheme(IManifestInfo manifest) =>
-        manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(ManifestConstants.AdminTag));
-}
diff --git a/Lombiq.Tests.UI/Extensions/IExtensionManagerExtensions.cs b/Lombiq.Tests.UI/Extensions/IExtensionManagerExtensions.cs
new file mode 100644
index 000000000..c10cc3acb
--- /dev/null
+++ b/Lombiq.Tests.UI/Extensions/IExtensionManagerExtensions.cs
@@ -0,0 +1,16 @@
+using OrchardCore.Environment.Extensions;
+using OrchardCore.Environment.Extensions.Features;
+using System;
+using System.Linq;
+
+namespace Lombiq.Tests.UI.Extensions;
+
+public static class IExtensionManagerExtensions
+{
+    /// <summary>
+    /// Gets <see cref="IFeatureInfo"/> by <paramref name="featureId"/>.
+    /// </summary>
+    /// <returns><see cref="IFeatureInfo"/> instance or null if not exists.</returns>
+    public static IFeatureInfo GetFeature(this IExtensionManager extensionManager, string featureId) =>
+        extensionManager.GetFeatures().FirstOrDefault(feature => feature.Id.Equals(featureId, StringComparison.Ordinal));
+}
diff --git a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
new file mode 100644
index 000000000..72e1581a2
--- /dev/null
+++ b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
@@ -0,0 +1,25 @@
+using Lombiq.Tests.UI.Services;
+using OrchardCore.Environment.Shell;
+using OrchardCore.Environment.Shell.Scope;
+using System;
+using System.Threading.Tasks;
+
+namespace Lombiq.Tests.UI.Extensions;
+
+public static class IWebApplicationInstanceExtensions
+{
+    /// <summary>
+    /// Executes a delegate using the shell scope given by <paramref name="tenant"/> in an isolated async flow, while
+    /// managing the shell state and invoking tenant events.
+    /// </summary>
+    public static async Task UsingScopeAsync(
+        this IWebApplicationInstance instance,
+        Func<ShellScope, Task> execute,
+        string tenant = "Default",
+        bool activateShell = true)
+    {
+        var shellHost = instance.GetService<IShellHost>();
+        await (await shellHost.GetScopeAsync(tenant))
+            .UsingAsync(execute, activateShell);
+    }
+}
diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
index ff47365ad..e3d221e08 100644
--- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
@@ -4,13 +4,23 @@
 using Lombiq.Tests.UI.Services;
 using Lombiq.Tests.UI.Shortcuts.Controllers;
 using Lombiq.Tests.UI.Shortcuts.Models;
+using Microsoft.Extensions.DependencyInjection;
 using OpenQA.Selenium;
+using OrchardCore.Admin;
+using OrchardCore.DisplayManagement.Extensions;
+using OrchardCore.Entities;
+using OrchardCore.Environment.Extensions;
+using OrchardCore.Environment.Shell;
+using OrchardCore.Modules.Manifest;
+using OrchardCore.Settings;
+using OrchardCore.Themes.Services;
 using OrchardCore.Users.Models;
 using RestEase;
 using Shouldly;
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -82,22 +92,67 @@ public static async Task<string> GetCurrentUserNameAsync(this UITestContext cont
     /// <summary>
     /// Sets the registration type in site settings.
     /// </summary>
-    public static Task SetUserRegistrationTypeAsync(this UITestContext context, UserRegistrationType type) =>
-        context.GoToAsync<AccountController>(controller => controller.SetUserRegistrationType(type));
+    public static Task SetUserRegistrationTypeAsync(
+        this UITestContext context,
+        UserRegistrationType type,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+        .UsingScopeAsync(
+            async shellScope =>
+            {
+                var siteService = shellScope.ServiceProvider.GetService<ISiteService>();
+                var settings = await siteService.LoadSiteSettingsAsync();
+
+                settings.Alter<RegistrationSettings>(
+                    nameof(RegistrationSettings),
+                    registrationSettings => registrationSettings.UsersCanRegister = type);
+
+                await siteService.UpdateSiteSettingsAsync(settings);
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
-    /// Enables the feature with the given ID directly, without anything else happening on the admin Features page. The
-    /// target app needs to have <c>Lombiq.Tests.UI.Shortcuts</c> enabled.
+    /// Enables the feature with the given <paramref name="featureId"/> directly.
     /// </summary>
-    public static Task EnableFeatureDirectlyAsync(this UITestContext context, string featureId) =>
-        context.GoToAsync<ShellFeaturesController>(controller => controller.EnableFeatureDirectly(featureId));
+    public static Task EnableFeatureDirectlyAsync(
+        this UITestContext context,
+        string featureId,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+            .UsingScopeAsync(
+                shellScope =>
+                {
+                    var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
+                    var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
+
+                    var feature = extensionManager.GetFeature(featureId);
+
+                    return shellFeatureManager.EnableFeaturesAsync(new[] { feature }, force: true);
+                },
+                tenant,
+                activateShell);
 
     /// <summary>
-    /// Disables the feature with the given ID directly, without anything else happening on the admin Features page. The
-    /// target app needs to have <c>Lombiq.Tests.UI.Shortcuts</c> enabled.
+    /// Disables the feature with the given <paramref name="featureId"/> directly.
     /// </summary>
-    public static Task DisableFeatureDirectlyAsync(this UITestContext context, string featureId) =>
-        context.GoToAsync<ShellFeaturesController>(controller => controller.DisableFeatureDirectly(featureId));
+    public static Task DisableFeatureDirectlyAsync(
+        this UITestContext context,
+        string featureId,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+            .UsingScopeAsync(
+                shellScope =>
+                {
+                    var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
+                    var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
+
+                    var feature = extensionManager.GetFeature(featureId);
+
+                    return shellFeatureManager.DisableFeaturesAsync(new[] { feature }, force: true);
+                },
+                tenant,
+                activateShell);
 
     /// <summary>
     /// Turns the <c>Lombiq.Tests.UI.Shortcuts.FeatureToggleTestBench</c> feature on, then off, and checks if the
@@ -192,10 +247,47 @@ public interface IShortcutsApi
     }
 
     /// <summary>
-    /// Selects theme by id.
+    /// Selects theme by <paramref name="id"/>.
     /// </summary>
-    public static Task SelectThemeAsync(this UITestContext context, string id) =>
-        context.GoToAsync<ThemeController>(controller => controller.SelectTheme(id));
+    /// <exception cref="InvalidOperationException">If no theme found with the given <paramref name="id"/>.</exception>
+    public static Task SelectThemeAsync(
+        this UITestContext context,
+        string id,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+        .UsingScopeAsync(
+            async shellScope =>
+            {
+                var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
+                var themeFeature = (await shellFeatureManager.GetAvailableFeaturesAsync())
+                    .FirstOrDefault(feature => feature.IsTheme() && feature.Id == id);
+
+                if (themeFeature == null)
+                {
+                    throw new InvalidOperationException($"{id} theme not found.");
+                }
+
+                if (IsAdminTheme(themeFeature.Extension.Manifest))
+                {
+                    var adminThemeService = shellScope.ServiceProvider.GetService<IAdminThemeService>();
+                    await adminThemeService.SetAdminThemeAsync(id);
+                }
+                else
+                {
+                    var siteThemeService = shellScope.ServiceProvider.GetService<ISiteThemeService>();
+                    await siteThemeService.SetSiteThemeAsync(id);
+                }
+
+                var enabledFeatures = await shellFeatureManager.GetEnabledFeaturesAsync();
+                var isEnabled = enabledFeatures.Any(feature => feature.Extension.Id == themeFeature.Id);
+
+                if (!isEnabled)
+                {
+                    await shellFeatureManager.EnableFeaturesAsync(new[] { themeFeature }, force: true);
+                }
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Creates, sets up and navigates to a new URL prefixed tenant. Also changes <see cref="UITestContext.TenantName"/>.
@@ -224,4 +316,7 @@ await context.GoToAsync<TenantsController>(controller =>
 
         context.TenantName = urlPrefix;
     }
+
+    private static bool IsAdminTheme(IManifestInfo manifest) =>
+        manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(ManifestConstants.AdminTag));
 }
diff --git a/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs b/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
index 99fffd300..02b078243 100644
--- a/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
+++ b/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
@@ -38,6 +38,13 @@ public interface IWebApplicationInstance : IAsyncDisposable
     /// </summary>
     /// <returns>The collection of log names and their contents.</returns>
     IEnumerable<IApplicationLog> GetLogs(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get service of type <typeparamref name="TService"/>.
+    /// </summary>
+    /// <typeparam name="TService">The type of service object to get.</typeparam>
+    /// <returns>A service object of type <typeparamref name="TService"/> or null if there is no such service.</returns>
+    TService GetService<TService>();
 }
 
 /// <summary>
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index 03fbee014..fec34e3e9 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -140,6 +140,9 @@ public IEnumerable<IApplicationLog> GetLogs(CancellationToken cancellationToken
             : Enumerable.Empty<IApplicationLog>();
     }
 
+    public TService GetService<TService>() =>
+        _orchardApplication.Services.GetService<TService>();
+
     public async ValueTask DisposeAsync()
     {
         if (_isDisposed) return;

From eb7852792bc47cdb51ff6bea118eaa4ecb552012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 9 Sep 2022 19:16:24 +0200
Subject: [PATCH 21/53] Using OC services directly instead of Shortcut
 Controllers where possible, the rest

---
 .../Controllers/AccountController.cs          |  24 --
 .../Controllers/SecurityController.cs         |  79 -------
 .../Controllers/WorkflowsController.cs        |  45 ----
 .../Models/CreateUserRequest.cs               |   8 -
 .../Exceptions/CreateUserFailedException.cs   |  20 ++
 .../Exceptions/PermissionNotFoundException.cs |  20 ++
 .../Exceptions/RoleNotFoundException.cs       |  20 ++
 .../Exceptions/ThemeNotFoundException.cs      |  20 ++
 .../Exceptions/UserNotFoundException.cs       |  20 ++
 .../WorkflowTypeNotFoundException.cs          |  20 ++
 .../ShortcutsUITestContextExtensions.cs       | 214 ++++++++++++++----
 11 files changed, 294 insertions(+), 196 deletions(-)
 delete mode 100644 Lombiq.Tests.UI.Shortcuts/Controllers/SecurityController.cs
 delete mode 100644 Lombiq.Tests.UI.Shortcuts/Controllers/WorkflowsController.cs
 delete mode 100644 Lombiq.Tests.UI.Shortcuts/Models/CreateUserRequest.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/CreateUserFailedException.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/PermissionNotFoundException.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/RoleNotFoundException.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/ThemeNotFoundException.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/UserNotFoundException.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/WorkflowTypeNotFoundException.cs

diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
index 686fa2caa..dc914e2da 100644
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
+++ b/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
@@ -1,10 +1,8 @@
 using Lombiq.HelpfulLibraries.AspNetCore.Mvc;
-using Lombiq.Tests.UI.Shortcuts.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.Users;
-using OrchardCore.Users.Models;
 using OrchardCore.Users.Services;
 using System.Threading.Tasks;
 
@@ -42,26 +40,4 @@ public async Task<IActionResult> SignOutDirectly()
 
         return Ok();
     }
-
-    [AllowAnonymous]
-    public async Task<ActionResult> CreateUser([FromJsonQueryString] CreateUserRequest userData)
-    {
-        var user = await _userService.CreateUserAsync(
-            new User
-            {
-                UserName = userData.UserName,
-                Email = userData.Email,
-                EmailConfirmed = true,
-                IsEnabled = true,
-            },
-            userData.Password,
-            (key, error) => ModelState.AddModelError(key, error));
-
-        if (user == null)
-        {
-            return BadRequest(ModelState);
-        }
-
-        return Ok("Success");
-    }
 }
diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/SecurityController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/SecurityController.cs
deleted file mode 100644
index 138a79406..000000000
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/SecurityController.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using OrchardCore.Security;
-using OrchardCore.Security.Permissions;
-using OrchardCore.Users;
-using OrchardCore.Users.Models;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Lombiq.Tests.UI.Shortcuts.Controllers;
-
-[DevelopmentAndLocalhostOnly]
-[AllowAnonymous]
-public class SecurityController : Controller
-{
-    private readonly RoleManager<IRole> _roleManager;
-    private readonly UserManager<IUser> _userManager;
-    private readonly IEnumerable<IPermissionProvider> _permissionProviders;
-
-    public SecurityController(
-        RoleManager<IRole> roleManager,
-        UserManager<IUser> userManager,
-        IEnumerable<IPermissionProvider> permissionProviders)
-    {
-        _roleManager = roleManager;
-        _userManager = userManager;
-        _permissionProviders = permissionProviders;
-    }
-
-    public async Task<IActionResult> AddUserToRole(string userName, string roleName)
-    {
-        if ((await _userManager.FindByNameAsync(userName)) is not User user)
-        {
-            return NotFound();
-        }
-
-        if ((await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(roleName))) is not Role role)
-        {
-            return NotFound();
-        }
-
-        await _userManager.AddToRoleAsync(user, role.NormalizedRoleName);
-
-        return Ok("Success");
-    }
-
-    public async Task<IActionResult> AddPermissionToRole(string permissionName, string roleName)
-    {
-        if ((await _roleManager.FindByNameAsync(_roleManager.NormalizeKey(roleName))) is not Role role)
-        {
-            return NotFound();
-        }
-
-        var permissionClaim = role.RoleClaims.FirstOrDefault(roleClaim =>
-            roleClaim.ClaimType == Permission.ClaimType
-            && roleClaim.ClaimValue == permissionName);
-        if (permissionClaim == null)
-        {
-            if (!await PermissionExistsAsync(permissionName))
-            {
-                return NotFound();
-            }
-
-            role.RoleClaims.Add(new() { ClaimType = Permission.ClaimType, ClaimValue = permissionName });
-
-            await _roleManager.UpdateAsync(role);
-        }
-
-        return Ok("Success");
-    }
-
-    private async Task<bool> PermissionExistsAsync(string permissionName) =>
-        (await Task.WhenAll(_permissionProviders.Select(provider => provider.GetPermissionsAsync())))
-            .SelectMany(permissions => permissions)
-            .Any(permission => permission.Name == permissionName);
-}
diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/WorkflowsController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/WorkflowsController.cs
deleted file mode 100644
index 262f9772a..000000000
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/WorkflowsController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using OrchardCore.Modules;
-using OrchardCore.Workflows.Http.Controllers;
-using OrchardCore.Workflows.Http.Models;
-using OrchardCore.Workflows.Services;
-using System;
-using System.Threading.Tasks;
-
-namespace Lombiq.Tests.UI.Shortcuts.Controllers;
-
-[Feature(ShortcutsFeatureIds.Workflows)]
-[DevelopmentAndLocalhostOnly]
-[AllowAnonymous]
-public class WorkflowsController : Controller
-{
-    private readonly ISecurityTokenService _securityTokenService;
-    private readonly IWorkflowTypeStore _workflowTypeStore;
-
-    public WorkflowsController(ISecurityTokenService securityTokenService, IWorkflowTypeStore workflowTypeStore)
-    {
-        _securityTokenService = securityTokenService;
-        _workflowTypeStore = workflowTypeStore;
-    }
-
-    public async Task<IActionResult> GenerateHttpEventUrl(string workflowTypeId, string activityId, int tokenLifeSpan)
-    {
-        var workflowType = await _workflowTypeStore.GetAsync(workflowTypeId);
-        if (workflowType == null)
-        {
-            return NotFound();
-        }
-
-        var token = _securityTokenService.CreateToken(
-            new WorkflowPayload(workflowType.WorkflowTypeId, activityId),
-            TimeSpan.FromDays(
-                tokenLifeSpan == 0 ? HttpWorkflowController.NoExpiryTokenLifespan : tokenLifeSpan));
-
-        // LinkGenerator.GetPathByAction(...) and UrlHelper.Action(...) not resolves url for
-        // HttpWorkflowController.Invoke action.
-        // https://github.com/OrchardCMS/OrchardCore/issues/11764.
-        return Ok($"/workflows/Invoke?token={Uri.EscapeDataString(token)}");
-    }
-}
diff --git a/Lombiq.Tests.UI.Shortcuts/Models/CreateUserRequest.cs b/Lombiq.Tests.UI.Shortcuts/Models/CreateUserRequest.cs
deleted file mode 100644
index 8a66a2759..000000000
--- a/Lombiq.Tests.UI.Shortcuts/Models/CreateUserRequest.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Lombiq.Tests.UI.Shortcuts.Models;
-
-public class CreateUserRequest
-{
-    public string UserName { get; set; }
-    public string Email { get; set; }
-    public string Password { get; set; }
-}
diff --git a/Lombiq.Tests.UI/Exceptions/CreateUserFailedException.cs b/Lombiq.Tests.UI/Exceptions/CreateUserFailedException.cs
new file mode 100644
index 000000000..8eb41a18f
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/CreateUserFailedException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class CreateUserFailedException : Exception
+{
+    public CreateUserFailedException(string message)
+        : base(message)
+    {
+    }
+
+    public CreateUserFailedException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public CreateUserFailedException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Exceptions/PermissionNotFoundException.cs b/Lombiq.Tests.UI/Exceptions/PermissionNotFoundException.cs
new file mode 100644
index 000000000..178987c04
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/PermissionNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class PermissionNotFoundException : Exception
+{
+    public PermissionNotFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public PermissionNotFoundException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public PermissionNotFoundException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Exceptions/RoleNotFoundException.cs b/Lombiq.Tests.UI/Exceptions/RoleNotFoundException.cs
new file mode 100644
index 000000000..c5a09f110
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/RoleNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class RoleNotFoundException : Exception
+{
+    public RoleNotFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public RoleNotFoundException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public RoleNotFoundException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Exceptions/ThemeNotFoundException.cs b/Lombiq.Tests.UI/Exceptions/ThemeNotFoundException.cs
new file mode 100644
index 000000000..d0ab0c717
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/ThemeNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class ThemeNotFoundException : Exception
+{
+    public ThemeNotFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public ThemeNotFoundException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public ThemeNotFoundException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Exceptions/UserNotFoundException.cs b/Lombiq.Tests.UI/Exceptions/UserNotFoundException.cs
new file mode 100644
index 000000000..df45c2b8d
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/UserNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class UserNotFoundException : Exception
+{
+    public UserNotFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public UserNotFoundException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public UserNotFoundException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Exceptions/WorkflowTypeNotFoundException.cs b/Lombiq.Tests.UI/Exceptions/WorkflowTypeNotFoundException.cs
new file mode 100644
index 000000000..e48496387
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/WorkflowTypeNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class WorkflowTypeNotFoundException : Exception
+{
+    public WorkflowTypeNotFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public WorkflowTypeNotFoundException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public WorkflowTypeNotFoundException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
index 7ab0dbe2d..ede130f15 100644
--- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
@@ -1,9 +1,11 @@
 using Lombiq.HelpfulLibraries.OrchardCore.Mvc;
 using Lombiq.Tests.UI.Constants;
+using Lombiq.Tests.UI.Exceptions;
 using Lombiq.Tests.UI.Models;
 using Lombiq.Tests.UI.Services;
 using Lombiq.Tests.UI.Shortcuts.Controllers;
 using Lombiq.Tests.UI.Shortcuts.Models;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using OpenQA.Selenium;
 using OrchardCore.Admin;
@@ -12,16 +14,26 @@
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Modules.Manifest;
+using OrchardCore.Security;
+using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 using OrchardCore.Themes.Services;
+using OrchardCore.Users;
 using OrchardCore.Users.Models;
+using OrchardCore.Users.Services;
+using OrchardCore.Workflows.Http.Controllers;
+using OrchardCore.Workflows.Http.Models;
+using OrchardCore.Workflows.Services;
 using RestEase;
 using Shouldly;
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Extensions;
@@ -115,27 +127,115 @@ public static Task SetUserRegistrationTypeAsync(
     /// <summary>
     /// Creates a user with the given parameters.
     /// </summary>
-    public static Task CreateUserAsync(this UITestContext context, string userName, string password, string email) =>
-        context.GoToAsync<AccountController>(
-            controller => controller.CreateUser(
-                new()
+    /// <exception cref="CreateUserFailedException">
+    /// If creating the user with the given parameters was not successfull.
+    /// </exception>
+    public static Task CreateUserAsync(
+        this UITestContext context,
+        string userName,
+        string password,
+        string email,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+        .UsingScopeAsync(
+            async shellScope =>
+            {
+                var userService = shellScope.ServiceProvider.GetService<IUserService>();
+                var errors = new Dictionary<string, string>();
+                var user = await userService.CreateUserAsync(
+                    new User
+                    {
+                        UserName = userName,
+                        Email = email,
+                        EmailConfirmed = true,
+                        IsEnabled = true,
+                    },
+                    password,
+                    (key, error) => errors.Add(key, error));
+
+                if (user == null)
                 {
-                    UserName = userName,
-                    Email = email,
-                    Password = password,
-                }));
+                    var exceptionLines = new StringBuilder();
+                    exceptionLines.AppendLine("Create user error:");
+                    errors.ForEach(entry =>
+                        exceptionLines.AppendLine(CultureInfo.InvariantCulture, $"{entry.Key}: {entry.Value}"));
+                    throw new CreateUserFailedException(exceptionLines.ToString());
+                }
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Adds a user to a role.
     /// </summary>
-    public static Task AddUserToRoleAsync(this UITestContext context, string userName, string roleName) =>
-        context.GoToAsync<SecurityController>(controller => controller.AddUserToRole(userName, roleName));
+    /// <exception cref="RoleNotFoundException">If no role found with the given <paramref name="roleName"/>.</exception>
+    /// <exception cref="UserNotFoundException">If no user found with the given <paramref name="userName"/>.</exception>
+    public static Task AddUserToRoleAsync(
+        this UITestContext context,
+        string userName,
+        string roleName,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+        .UsingScopeAsync(
+            async shellScope =>
+            {
+                var userManager = shellScope.ServiceProvider.GetService<UserManager<IUser>>();
+                if ((await userManager.FindByNameAsync(userName)) is not User user)
+                {
+                    throw new UserNotFoundException($"{userName} not found!");
+                }
+
+                var roleManager = shellScope.ServiceProvider.GetService<RoleManager<IRole>>();
+                if ((await roleManager.FindByNameAsync(roleManager.NormalizeKey(roleName))) is not Role role)
+                {
+                    throw new RoleNotFoundException($"{roleName} not found!");
+                }
+
+                await userManager.AddToRoleAsync(user, role.NormalizedRoleName);
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Adds a permission to a role.
     /// </summary>
-    public static Task AddPermissionToRoleAsync(this UITestContext context, string permissionName, string roleName) =>
-        context.GoToAsync<SecurityController>(controller => controller.AddPermissionToRole(permissionName, roleName));
+    /// <exception cref="RoleNotFoundException">If no role found with the given <paramref name="roleName"/>.</exception>
+    /// <exception cref="PermissionNotFoundException">
+    /// If no permission found with the given <paramref name="permissionName"/>.
+    /// </exception>
+    public static Task AddPermissionToRoleAsync(
+        this UITestContext context,
+        string permissionName,
+        string roleName,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+        .UsingScopeAsync(
+            async shellScope =>
+            {
+                var roleManager = shellScope.ServiceProvider.GetService<RoleManager<IRole>>();
+                if ((await roleManager.FindByNameAsync(roleManager.NormalizeKey(roleName))) is not Role role)
+                {
+                    throw new RoleNotFoundException($"{roleName} not found!");
+                }
+
+                var permissionClaim = role.RoleClaims.FirstOrDefault(roleClaim =>
+                    roleClaim.ClaimType == Permission.ClaimType
+                    && roleClaim.ClaimValue == permissionName);
+                if (permissionClaim == null)
+                {
+                    var permissionProviders = shellScope.ServiceProvider.GetService<IEnumerable<IPermissionProvider>>();
+                    if (!await PermissionExistsAsync(permissionProviders, permissionName))
+                    {
+                        throw new PermissionNotFoundException($"{permissionName} not found!");
+                    }
+
+                    role.RoleClaims.Add(new() { ClaimType = Permission.ClaimType, ClaimValue = permissionName });
+
+                    await roleManager.UpdateAsync(role);
+                }
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Enables the feature with the given <paramref name="featureId"/> directly.
@@ -145,18 +245,18 @@ public static Task EnableFeatureDirectlyAsync(
         string featureId,
         string tenant = "Default",
         bool activateShell = true) => context.Application
-            .UsingScopeAsync(
-                shellScope =>
-                {
-                    var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
-                    var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
+        .UsingScopeAsync(
+            shellScope =>
+            {
+                var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
+                var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
 
-                    var feature = extensionManager.GetFeature(featureId);
+                var feature = extensionManager.GetFeature(featureId);
 
-                    return shellFeatureManager.EnableFeaturesAsync(new[] { feature }, force: true);
-                },
-                tenant,
-                activateShell);
+                return shellFeatureManager.EnableFeaturesAsync(new[] { feature }, force: true);
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Disables the feature with the given <paramref name="featureId"/> directly.
@@ -166,18 +266,18 @@ public static Task DisableFeatureDirectlyAsync(
         string featureId,
         string tenant = "Default",
         bool activateShell = true) => context.Application
-            .UsingScopeAsync(
-                shellScope =>
-                {
-                    var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
-                    var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
+        .UsingScopeAsync(
+            shellScope =>
+            {
+                var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
+                var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
 
-                    var feature = extensionManager.GetFeature(featureId);
+                var feature = extensionManager.GetFeature(featureId);
 
-                    return shellFeatureManager.DisableFeaturesAsync(new[] { feature }, force: true);
-                },
-                tenant,
-                activateShell);
+                return shellFeatureManager.DisableFeaturesAsync(new[] { feature }, force: true);
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Turns the <c>Lombiq.Tests.UI.Shortcuts.FeatureToggleTestBench</c> feature on, then off, and checks if the
@@ -274,7 +374,7 @@ public interface IShortcutsApi
     /// <summary>
     /// Selects theme by <paramref name="id"/>.
     /// </summary>
-    /// <exception cref="InvalidOperationException">If no theme found with the given <paramref name="id"/>.</exception>
+    /// <exception cref="ThemeNotFoundException">If no theme found with the given <paramref name="id"/>.</exception>
     public static Task SelectThemeAsync(
         this UITestContext context,
         string id,
@@ -289,7 +389,7 @@ public static Task SelectThemeAsync(
 
                 if (themeFeature == null)
                 {
-                    throw new InvalidOperationException($"{id} theme not found.");
+                    throw new ThemeNotFoundException($"{id} not found.");
                 }
 
                 if (IsAdminTheme(themeFeature.Extension.Manifest))
@@ -343,21 +443,55 @@ await context.GoToAsync<TenantsController>(controller =>
     }
 
     /// <summary>
-    /// Retrieves URI for a <see cref="OrchardCore.Workflows.Http.Activities.HttpRequestEvent"/> in a workflow. The
-    /// target app needs to have <c>Lombiq.Tests.UI.Shortcuts.Workflows</c> enabled.
+    /// Retrieves URI for a <see cref="OrchardCore.Workflows.Http.Activities.HttpRequestEvent"/> in a workflow.
     /// </summary>
+    /// <exception cref="WorkflowTypeNotFoundException">
+    /// If no <see cref="OrchardCore.Workflows.Models.WorkflowType"/> found with the given <paramref name="workflowTypeId"/>.
+    /// </exception>
     public static async Task<string> GenerateHttpEventUrlAsync(
         this UITestContext context,
         string workflowTypeId,
         string activityId,
-        int tokenLifeSpan = 0)
+        int tokenLifeSpan = 0,
+        string tenant = "Default",
+        bool activateShell = true)
     {
-        await context.GoToAsync<WorkflowsController>(controller =>
-            controller.GenerateHttpEventUrl(workflowTypeId, activityId, tokenLifeSpan));
+        string eventUrl = null;
+        await context.Application
+            .UsingScopeAsync(
+                async shellScope =>
+                {
+                    var workflowTypeStore = shellScope.ServiceProvider.GetService<IWorkflowTypeStore>();
+
+                    var workflowType = await workflowTypeStore.GetAsync(workflowTypeId);
+                    if (workflowType == null)
+                    {
+                        throw new WorkflowTypeNotFoundException($"{workflowTypeId} not found!");
+                    }
+
+                    var securityTokenService = shellScope.ServiceProvider.GetService<ISecurityTokenService>();
+                    var token = securityTokenService.CreateToken(
+                        new WorkflowPayload(workflowType.WorkflowTypeId, activityId),
+                        TimeSpan.FromDays(
+                            tokenLifeSpan == 0 ? HttpWorkflowController.NoExpiryTokenLifespan : tokenLifeSpan));
+
+                    // LinkGenerator.GetPathByAction(...) and UrlHelper.Action(...) not resolves url for
+                    // HttpWorkflowController.Invoke action.
+                    // https://github.com/OrchardCMS/OrchardCore/issues/11764.
+                    eventUrl = $"/workflows/Invoke?token={Uri.EscapeDataString(token)}";
+                },
+                tenant,
+                activateShell);
 
-        return context.Get(By.CssSelector("pre")).Text;
+        return eventUrl;
     }
 
     private static bool IsAdminTheme(IManifestInfo manifest) =>
         manifest.Tags.Any(tag => tag.EqualsOrdinalIgnoreCase(ManifestConstants.AdminTag));
+
+    private static async Task<bool> PermissionExistsAsync(
+        IEnumerable<IPermissionProvider> permissionProviders, string permissionName) =>
+        (await Task.WhenAll(permissionProviders.Select(provider => provider.GetPermissionsAsync())))
+            .SelectMany(permissions => permissions)
+            .Any(permission => permission.Name == permissionName);
 }

From 7a161fd400122718656ea592e780f6ba939105ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 9 Sep 2022 20:07:03 +0200
Subject: [PATCH 22/53] Removing unused variable

---
 Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
index dc914e2da..03c1632dd 100644
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
+++ b/Lombiq.Tests.UI.Shortcuts/Controllers/AccountController.cs
@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.Users;
-using OrchardCore.Users.Services;
 using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Shortcuts.Controllers;
@@ -13,13 +12,11 @@ public class AccountController : Controller
 {
     private readonly UserManager<IUser> _userManager;
     private readonly SignInManager<IUser> _userSignInManager;
-    private readonly IUserService _userService;
 
-    public AccountController(UserManager<IUser> userManager, SignInManager<IUser> userSignInManager, IUserService userService)
+    public AccountController(UserManager<IUser> userManager, SignInManager<IUser> userSignInManager)
     {
         _userManager = userManager;
         _userSignInManager = userSignInManager;
-        _userService = userService;
     }
 
     [AllowAnonymous]

From 475a22403bc4ddd32e664815e9178b60985ef83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 9 Sep 2022 22:57:02 +0200
Subject: [PATCH 23/53] Injecting fake HttpContext before calling OC services
 directly

---
 .../IWebApplicationInstanceExtensions.cs      | 23 +++++++++++++++++--
 .../NavigationUITestContextExtensions.cs      |  3 ++-
 .../ShortcutsUITestContextExtensions.cs       |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
index 72e1581a2..8a98a08f8 100644
--- a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
@@ -1,6 +1,9 @@
 using Lombiq.Tests.UI.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Scope;
+using OrchardCore.Recipes.Models;
 using System;
 using System.Threading.Tasks;
 
@@ -19,7 +22,23 @@ public static async Task UsingScopeAsync(
         bool activateShell = true)
     {
         var shellHost = instance.GetService<IShellHost>();
-        await (await shellHost.GetScopeAsync(tenant))
-            .UsingAsync(execute, activateShell);
+        // Injecting a fake HttpContext is required to avoid NullReferenceException in
+        // OrchardCore.Recipes.Services.RecipeEnvironmentFeatureProvider.PopulateEnvironmentAsync.
+        var httpContextAccessor = instance.GetService<IHttpContextAccessor>();
+        var features = new FeatureCollection();
+        features.Set(new RecipeEnvironmentFeature());
+
+        var httpContext = new DefaultHttpContext(features);
+        httpContextAccessor.HttpContext = httpContext;
+
+        try
+        {
+            await (await shellHost.GetScopeAsync(tenant))
+                .UsingAsync(execute, activateShell);
+        }
+        finally
+        {
+            httpContextAccessor.HttpContext = null;
+        }
     }
 }
diff --git a/Lombiq.Tests.UI/Extensions/NavigationUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/NavigationUITestContextExtensions.cs
index df95497a2..969690bc8 100644
--- a/Lombiq.Tests.UI/Extensions/NavigationUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/NavigationUITestContextExtensions.cs
@@ -12,7 +12,8 @@ namespace Lombiq.Tests.UI.Extensions;
 
 public static class NavigationUITestContextExtensions
 {
-    public static Task GoToHomePageAsync(this UITestContext context) => context.GoToRelativeUrlAsync("/");
+    public static Task GoToHomePageAsync(this UITestContext context, bool onlyIfNotAlreadyThere = true) =>
+        context.GoToRelativeUrlAsync("/", onlyIfNotAlreadyThere);
 
     public static Task GoToRelativeUrlAsync(this UITestContext context, string relativeUrl, bool onlyIfNotAlreadyThere = true) =>
         context.GoToAbsoluteUrlAsync(context.GetAbsoluteUri(relativeUrl), onlyIfNotAlreadyThere);
diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
index ede130f15..2fe1642ce 100644
--- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
@@ -289,7 +289,7 @@ public static async Task ExecuteAndAssertTestFeatureToggleAsync(this UITestConte
         await context.GoToRelativeUrlAsync(FeatureToggleTestBenchUrl);
         context.Scope.Driver.PageSource.ShouldContain("The Feature Toggle Test Bench worked.");
         await context.DisableFeatureDirectlyAsync("Lombiq.Tests.UI.Shortcuts.FeatureToggleTestBench");
-        await context.GoToRelativeUrlAsync(FeatureToggleTestBenchUrl);
+        await context.GoToRelativeUrlAsync(FeatureToggleTestBenchUrl, onlyIfNotAlreadyThere: false);
         context.Scope.Driver.PageSource.ShouldNotContain("The Feature Toggle Test Bench worked.");
     }
 

From b80d70c161853fc5763ea8263ee0cea3b868d83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sat, 10 Sep 2022 00:16:32 +0200
Subject: [PATCH 24/53] Using OC services directly instead of Shortcut
 Controllers where possible, one more

---
 .../Controllers/RecipeController.cs           | 55 -------------
 Lombiq.Tests.UI/Docs/Migration.md             | 34 ++++++++
 .../Exceptions/RecipeNotFoundException.cs     | 20 +++++
 .../IWebApplicationInstanceExtensions.cs      |  4 +-
 .../ShortcutsUITestContextExtensions.cs       | 80 ++++++++++++++-----
 .../Services/IWebApplicationInstance.cs       |  5 +-
 .../Services/OrchardCoreInstance.cs           |  4 +-
 7 files changed, 122 insertions(+), 80 deletions(-)
 delete mode 100644 Lombiq.Tests.UI.Shortcuts/Controllers/RecipeController.cs
 create mode 100644 Lombiq.Tests.UI/Exceptions/RecipeNotFoundException.cs

diff --git a/Lombiq.Tests.UI.Shortcuts/Controllers/RecipeController.cs b/Lombiq.Tests.UI.Shortcuts/Controllers/RecipeController.cs
deleted file mode 100644
index 91ceed10f..000000000
--- a/Lombiq.Tests.UI.Shortcuts/Controllers/RecipeController.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Lombiq.HelpfulLibraries.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using OrchardCore.Modules;
-using OrchardCore.Recipes.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Lombiq.Tests.UI.Shortcuts.Controllers;
-
-[DevelopmentAndLocalhostOnly]
-public class RecipeController : Controller
-{
-    private readonly IRecipeExecutor _recipeExecutor;
-    private readonly IEnumerable<IRecipeHarvester> _recipeHarvesters;
-    private readonly IEnumerable<IRecipeEnvironmentProvider> _recipeEnvironmentProviders;
-    private readonly ILogger _logger;
-
-    public RecipeController(
-        IRecipeExecutor recipeExecutor,
-        IEnumerable<IRecipeHarvester> recipeHarvesters,
-        IEnumerable<IRecipeEnvironmentProvider> recipeEnvironmentProviders,
-        ILogger<RecipeController> logger)
-    {
-        _recipeExecutor = recipeExecutor;
-        _recipeHarvesters = recipeHarvesters;
-        _recipeEnvironmentProviders = recipeEnvironmentProviders;
-        _logger = logger;
-    }
-
-    public async Task<ActionResult> Execute(string recipeName)
-    {
-        var recipeCollections = await _recipeHarvesters
-            .AwaitEachAsync(harvester => harvester.HarvestRecipesAsync());
-        var recipe = recipeCollections
-            .SelectMany(recipeCollection => recipeCollection)
-            .SingleOrDefault(recipeDescriptor => recipeDescriptor.Name == recipeName);
-
-        if (recipe == null) return NotFound();
-
-        // Logic copied from OrchardCore.Recipes.Controllers.AdminController.
-        var executionId = Guid.NewGuid().ToString("n");
-
-        var environment = new Dictionary<string, object>();
-        await _recipeEnvironmentProviders
-            .OrderBy(environmentProvider => environmentProvider.Order)
-            .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
-
-        await _recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
-        return Ok();
-    }
-}
diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 725ad25cb..b35b772ff 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -81,3 +81,37 @@ namespace Lombiq.OSOCE.Tests.UI;
                     return Task.CompletedTask;
                 };
 ```
+
+## Non breaking changes
+
+### `Lombiq.Tests.UI.Extensions.ShortcutsUITestContextExtensions`
+
+The following extension methods result in the same and no breaking change in the signatures, but they behave a bit differently. Using `WebApplicationFactory` opened the possibility to use OC services directly instead of using `Controller Actions` invoked from browser navigation.
+
+This means that the extension methods below no longer result in browser navigation.
+
+- `SetUserRegistrationTypeAsync`
+- `CreateUserAsync`
+- `AddUserToRoleAsync`
+- `AddPermissionToRoleAsync`
+- `EnableFeatureDirectlyAsync`
+- `DisableFeatureDirectlyAsync`
+- `ExecuteRecipeDirectlyAsync`
+- `SelectThemeAsync`
+- `GenerateHttpEventUrlAsync`
+
+Here is a sample for better understanding:
+```diff
+    public static async Task EnablePrivacyConsentBannerFeatureAndAcceptPrivacyConsentAsync(this UITestContext context)
+    {
+        await context.EnablePrivacyConsentBannerFeatureAsync();
+-         await context.GoToHomePageAsync();
++         await context.GoToHomePageAsync(onlyIfNotAlreadyThere: false);
+        await context.AcceptPrivacyConsentAsync();
+        context.Refresh();
+    }
+```
+
+The original code with the new behavior resulted in a failing test, because the browser pointed to the `Home page` before `await context.EnablePrivacyConsentBannerFeatureAsync()(= context.EnableFeatureDirectlyAsync({featureId})`, the `context.EnableFeatureDirectlyAsync` not navigates away, so finaly the `await context.GoToHomePageAsync()` call do nothing and the consent banner din't come up.
+
+The solution, in this case, is to call `await context.GoToHomePageAsync(onlyIfNotAlreadyThere: false)`, this result a reload, and the consent banner come up.
diff --git a/Lombiq.Tests.UI/Exceptions/RecipeNotFoundException.cs b/Lombiq.Tests.UI/Exceptions/RecipeNotFoundException.cs
new file mode 100644
index 000000000..3af926997
--- /dev/null
+++ b/Lombiq.Tests.UI/Exceptions/RecipeNotFoundException.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Lombiq.Tests.UI.Exceptions;
+
+public class RecipeNotFoundException : Exception
+{
+    public RecipeNotFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public RecipeNotFoundException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+
+    public RecipeNotFoundException()
+    {
+    }
+}
diff --git a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
index 8a98a08f8..3c59190fc 100644
--- a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
@@ -21,10 +21,10 @@ public static async Task UsingScopeAsync(
         string tenant = "Default",
         bool activateShell = true)
     {
-        var shellHost = instance.GetService<IShellHost>();
+        var shellHost = instance.GetRequiredService<IShellHost>();
         // Injecting a fake HttpContext is required to avoid NullReferenceException in
         // OrchardCore.Recipes.Services.RecipeEnvironmentFeatureProvider.PopulateEnvironmentAsync.
-        var httpContextAccessor = instance.GetService<IHttpContextAccessor>();
+        var httpContextAccessor = instance.GetRequiredService<IHttpContextAccessor>();
         var features = new FeatureCollection();
         features.Set(new RecipeEnvironmentFeature());
 
diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
index 2fe1642ce..7e53e93d7 100644
--- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
@@ -1,3 +1,4 @@
+using Atata;
 using Lombiq.HelpfulLibraries.OrchardCore.Mvc;
 using Lombiq.Tests.UI.Constants;
 using Lombiq.Tests.UI.Exceptions;
@@ -7,13 +8,16 @@
 using Lombiq.Tests.UI.Shortcuts.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using OpenQA.Selenium;
 using OrchardCore.Admin;
 using OrchardCore.DisplayManagement.Extensions;
 using OrchardCore.Entities;
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Shell;
+using OrchardCore.Modules;
 using OrchardCore.Modules.Manifest;
+using OrchardCore.Recipes.Services;
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
@@ -34,6 +38,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Extensions;
@@ -112,7 +117,7 @@ public static Task SetUserRegistrationTypeAsync(
         .UsingScopeAsync(
             async shellScope =>
             {
-                var siteService = shellScope.ServiceProvider.GetService<ISiteService>();
+                var siteService = shellScope.ServiceProvider.GetRequiredService<ISiteService>();
                 var settings = await siteService.LoadSiteSettingsAsync();
 
                 settings.Alter<RegistrationSettings>(
@@ -140,7 +145,7 @@ public static Task CreateUserAsync(
         .UsingScopeAsync(
             async shellScope =>
             {
-                var userService = shellScope.ServiceProvider.GetService<IUserService>();
+                var userService = shellScope.ServiceProvider.GetRequiredService<IUserService>();
                 var errors = new Dictionary<string, string>();
                 var user = await userService.CreateUserAsync(
                     new User
@@ -179,13 +184,13 @@ public static Task AddUserToRoleAsync(
         .UsingScopeAsync(
             async shellScope =>
             {
-                var userManager = shellScope.ServiceProvider.GetService<UserManager<IUser>>();
+                var userManager = shellScope.ServiceProvider.GetRequiredService<UserManager<IUser>>();
                 if ((await userManager.FindByNameAsync(userName)) is not User user)
                 {
                     throw new UserNotFoundException($"{userName} not found!");
                 }
 
-                var roleManager = shellScope.ServiceProvider.GetService<RoleManager<IRole>>();
+                var roleManager = shellScope.ServiceProvider.GetRequiredService<RoleManager<IRole>>();
                 if ((await roleManager.FindByNameAsync(roleManager.NormalizeKey(roleName))) is not Role role)
                 {
                     throw new RoleNotFoundException($"{roleName} not found!");
@@ -212,7 +217,7 @@ public static Task AddPermissionToRoleAsync(
         .UsingScopeAsync(
             async shellScope =>
             {
-                var roleManager = shellScope.ServiceProvider.GetService<RoleManager<IRole>>();
+                var roleManager = shellScope.ServiceProvider.GetRequiredService<RoleManager<IRole>>();
                 if ((await roleManager.FindByNameAsync(roleManager.NormalizeKey(roleName))) is not Role role)
                 {
                     throw new RoleNotFoundException($"{roleName} not found!");
@@ -223,7 +228,7 @@ public static Task AddPermissionToRoleAsync(
                     && roleClaim.ClaimValue == permissionName);
                 if (permissionClaim == null)
                 {
-                    var permissionProviders = shellScope.ServiceProvider.GetService<IEnumerable<IPermissionProvider>>();
+                    var permissionProviders = shellScope.ServiceProvider.GetRequiredService<IEnumerable<IPermissionProvider>>();
                     if (!await PermissionExistsAsync(permissionProviders, permissionName))
                     {
                         throw new PermissionNotFoundException($"{permissionName} not found!");
@@ -248,8 +253,8 @@ public static Task EnableFeatureDirectlyAsync(
         .UsingScopeAsync(
             shellScope =>
             {
-                var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
-                var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
+                var shellFeatureManager = shellScope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
+                var extensionManager = shellScope.ServiceProvider.GetRequiredService<IExtensionManager>();
 
                 var feature = extensionManager.GetFeature(featureId);
 
@@ -269,8 +274,8 @@ public static Task DisableFeatureDirectlyAsync(
         .UsingScopeAsync(
             shellScope =>
             {
-                var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
-                var extensionManager = shellScope.ServiceProvider.GetService<IExtensionManager>();
+                var shellFeatureManager = shellScope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
+                var extensionManager = shellScope.ServiceProvider.GetRequiredService<IExtensionManager>();
 
                 var feature = extensionManager.GetFeature(featureId);
 
@@ -325,12 +330,49 @@ public static async Task PurgeMediaCacheDirectlyAsync(this UITestContext context
     public static Task<ApplicationInfo> GetApplicationInfoAsync(this UITestContext context) =>
         context.GetApi().GetApplicationInfoAsync();
 
+    // This is required to instantiate ILogger<>.
+    private sealed class ExecuteRecipeShortcut { }
+
     /// <summary>
-    /// Executes a recipe identified by its name directly. The user must be logged in. The target app needs to have
-    /// <c>Lombiq.Tests.UI.Shortcuts</c> enabled.
+    /// Executes a recipe identified by its name directly.
     /// </summary>
-    public static Task ExecuteRecipeDirectlyAsync(this UITestContext context, string recipeName) =>
-        context.GoToAsync<RecipeController>(controller => controller.Execute(recipeName));
+    /// <exception cref="RecipeNotFoundException">If no recipe found with the given <paramref name="recipeName"/>.</exception>
+    public static Task ExecuteRecipeDirectlyAsync(
+        this UITestContext context,
+        string recipeName,
+        string tenant = "Default",
+        bool activateShell = true) => context.Application
+        .UsingScopeAsync(
+            async shellScope =>
+            {
+                var recipeHarvesters = shellScope.ServiceProvider.GetRequiredService<IEnumerable<IRecipeHarvester>>();
+                var recipeCollections = await recipeHarvesters
+                    .AwaitEachAsync(harvester => harvester.HarvestRecipesAsync());
+                var recipe = recipeCollections
+                    .SelectMany(recipeCollection => recipeCollection)
+                    .SingleOrDefault(recipeDescriptor => recipeDescriptor.Name == recipeName);
+
+                if (recipe == null)
+                {
+                    throw new RecipeNotFoundException($"{recipeName} not found!");
+                }
+
+                // Logic copied from OrchardCore.Recipes.Controllers.AdminController.
+                var executionId = Guid.NewGuid().ToString("n");
+
+                var environment = new Dictionary<string, object>();
+                var logger = shellScope.ServiceProvider.GetRequiredService<ILogger<ExecuteRecipeShortcut>>();
+                var recipeEnvironmentProviders = shellScope.ServiceProvider
+                    .GetRequiredService<IEnumerable<IRecipeEnvironmentProvider>>();
+                await recipeEnvironmentProviders
+                    .OrderBy(environmentProvider => environmentProvider.Order)
+                    .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, logger);
+
+                var recipeExecutor = shellScope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
+                await recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
+            },
+            tenant,
+            activateShell);
 
     /// <summary>
     /// Navigates to a page whose action method throws <see cref="InvalidOperationException"/>. This causes ASP.NET Core
@@ -383,7 +425,7 @@ public static Task SelectThemeAsync(
         .UsingScopeAsync(
             async shellScope =>
             {
-                var shellFeatureManager = shellScope.ServiceProvider.GetService<IShellFeaturesManager>();
+                var shellFeatureManager = shellScope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
                 var themeFeature = (await shellFeatureManager.GetAvailableFeaturesAsync())
                     .FirstOrDefault(feature => feature.IsTheme() && feature.Id == id);
 
@@ -394,12 +436,12 @@ public static Task SelectThemeAsync(
 
                 if (IsAdminTheme(themeFeature.Extension.Manifest))
                 {
-                    var adminThemeService = shellScope.ServiceProvider.GetService<IAdminThemeService>();
+                    var adminThemeService = shellScope.ServiceProvider.GetRequiredService<IAdminThemeService>();
                     await adminThemeService.SetAdminThemeAsync(id);
                 }
                 else
                 {
-                    var siteThemeService = shellScope.ServiceProvider.GetService<ISiteThemeService>();
+                    var siteThemeService = shellScope.ServiceProvider.GetRequiredService<ISiteThemeService>();
                     await siteThemeService.SetSiteThemeAsync(id);
                 }
 
@@ -461,7 +503,7 @@ await context.Application
             .UsingScopeAsync(
                 async shellScope =>
                 {
-                    var workflowTypeStore = shellScope.ServiceProvider.GetService<IWorkflowTypeStore>();
+                    var workflowTypeStore = shellScope.ServiceProvider.GetRequiredService<IWorkflowTypeStore>();
 
                     var workflowType = await workflowTypeStore.GetAsync(workflowTypeId);
                     if (workflowType == null)
@@ -469,7 +511,7 @@ await context.Application
                         throw new WorkflowTypeNotFoundException($"{workflowTypeId} not found!");
                     }
 
-                    var securityTokenService = shellScope.ServiceProvider.GetService<ISecurityTokenService>();
+                    var securityTokenService = shellScope.ServiceProvider.GetRequiredService<ISecurityTokenService>();
                     var token = securityTokenService.CreateToken(
                         new WorkflowPayload(workflowType.WorkflowTypeId, activityId),
                         TimeSpan.FromDays(
diff --git a/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs b/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
index 02b078243..369be046d 100644
--- a/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
+++ b/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
@@ -43,8 +43,9 @@ public interface IWebApplicationInstance : IAsyncDisposable
     /// Get service of type <typeparamref name="TService"/>.
     /// </summary>
     /// <typeparam name="TService">The type of service object to get.</typeparam>
-    /// <returns>A service object of type <typeparamref name="TService"/> or null if there is no such service.</returns>
-    TService GetService<TService>();
+    /// <returns>A service object of type <typeparamref name="TService"/>.</returns>
+    /// <exception cref="InvalidOperationException">There is no service of type <typeparamref name="TService"/>.</exception>
+    TService GetRequiredService<TService>();
 }
 
 /// <summary>
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index fec34e3e9..bb96a045b 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -140,8 +140,8 @@ public IEnumerable<IApplicationLog> GetLogs(CancellationToken cancellationToken
             : Enumerable.Empty<IApplicationLog>();
     }
 
-    public TService GetService<TService>() =>
-        _orchardApplication.Services.GetService<TService>();
+    public TService GetRequiredService<TService>() =>
+        _orchardApplication.Services.GetRequiredService<TService>();
 
     public async ValueTask DisposeAsync()
     {

From 447a7ffaf6afba0b2fd50342de014aa902af9e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sat, 10 Sep 2022 00:26:06 +0200
Subject: [PATCH 25/53] Fixing docs

---
 Lombiq.Tests.UI/Docs/Migration.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index b35b772ff..811d9cba4 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -65,7 +65,9 @@ namespace Lombiq.OSOCE.Tests.UI;
 -         .GetAbsoluteApplicationAssemblyPath("Lombiq.OSOCE.Web", "net6.0");
 ```
 
-3. There is a breaking change in adding command line arguments to the WebApplication.
+## Breaking changes
+
+There is a breaking change in adding command line arguments to the WebApplication.
 
     To add command line argument with value, use `InstanceCommandLineArgumentsBuilder.AddWithValue` instead of double call `ArgumentsBuilder.Add`.
 
@@ -86,9 +88,9 @@ namespace Lombiq.OSOCE.Tests.UI;
 
 ### `Lombiq.Tests.UI.Extensions.ShortcutsUITestContextExtensions`
 
-The following extension methods result in the same and no breaking change in the signatures, but they behave a bit differently. Using `WebApplicationFactory` opened the possibility to use OC services directly instead of using `Controller Actions` invoked from browser navigation.
+The following extension methods result in the same and no breaking change in the signatures, but they behave a bit differently. Using `WebApplicationFactory` opened the possibility to use OC services directly instead of using `Controller Actions` invoked by browser navigation.
 
-This means that the extension methods below no longer result in browser navigation.
+This means that calling the extension methods below no longer results in browser navigation.
 
 - `SetUserRegistrationTypeAsync`
 - `CreateUserAsync`

From 8ed64e1eab55c500f53c9e4e7fdfc19b08068d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 11 Sep 2022 14:45:50 +0200
Subject: [PATCH 26/53] Using Lombiq.Tests.UI.Samples test classes from
 Lombiq.OSOCE.Tests.UI as a consumer.

---
 .../Lombiq.Tests.UI.Samples.csproj            |  1 -
 .../Tests/AccessibilityTest.cs                |  5 +-
 .../Tests/AzureBlobStorageTests.cs            |  5 +-
 .../Tests/BasicOrchardFeaturesTests.cs        |  5 +-
 Lombiq.Tests.UI.Samples/Tests/BasicTests.cs   |  5 +-
 .../Tests/BasicVisualVerificationTests.cs     |  5 +-
 .../Tests/DatabaseSnapshotTests.cs            |  5 +-
 Lombiq.Tests.UI.Samples/Tests/EmailTests.cs   |  5 +-
 .../Tests/ErrorHandlingTests.cs               |  5 +-
 Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs  |  5 +-
 .../Tests/SqlServerTests.cs                   |  5 +-
 Lombiq.Tests.UI.Samples/Tests/TenantTests.cs  |  5 +-
 Lombiq.Tests.UI.Samples/UITestBase.cs         |  3 +-
 Lombiq.Tests.UI/Docs/Migration.md             |  6 +--
 ...sualVerificationUITestContextExtensions.cs | 52 ++++++++++++++++---
 15 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index 64f9095a2..4128b5415 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -43,7 +43,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Lombiq.OSOCE.Web\Lombiq.OSOCE.Web.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
   </ItemGroup>
 
diff --git a/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs b/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
index 4abeec96a..357a268bb 100644
--- a/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
@@ -10,9 +10,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // Here we'll see how to check some web accessibility rules. Keeping our app accessible helps people with disabilities
 // consume the content of our website more easily. Do note though that only checking rules that can be automatically
 // checked is not enough for full compliance.
-public class AccessibilityTest : UITestBase
+public abstract class AccessibilityTest<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public AccessibilityTest(ITestOutputHelper testOutputHelper)
+    protected AccessibilityTest(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs b/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
index be3323978..540710e4e 100644
--- a/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
@@ -11,9 +11,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Up until now the Orchard app always used the default local Media storage for managing Media files. However, you may
 // use Azure Blob Storage in production. You can also test your app with it!
-public class AzureBlobStorageTests : UITestBase
+public abstract class AzureBlobStorageTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public AzureBlobStorageTests(ITestOutputHelper testOutputHelper)
+    protected AzureBlobStorageTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs b/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
index 230f00d3e..a090f1594 100644
--- a/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
@@ -12,9 +12,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // writing tests for your app is not really about testing Orchard itself but nevertheless it's useful to check if all
 // the important features like login work - keep in mind that you can break these from your own code. So, here we run
 // the whole test suite.
-public class BasicOrchardFeaturesTests : UITestBase
+public abstract class BasicOrchardFeaturesTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper)
+    protected BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs b/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs
index 3602e4451..6b7de96d1 100644
--- a/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs
@@ -12,9 +12,10 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // We'll see some simpler tests as a start. Each of them will teach us important concepts.
-public class BasicTests : UITestBase
+public abstract class BasicTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public BasicTests(ITestOutputHelper testOutputHelper)
+    protected BasicTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs b/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
index 0b9aa82ee..45a5644b5 100644
--- a/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
@@ -10,9 +10,10 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // In this basic test we will check visually the rendered content.
-public class BasicVisualVerificationTests : UITestBase
+public abstract class BasicVisualVerificationTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public BasicVisualVerificationTests(ITestOutputHelper testOutputHelper)
+    protected BasicVisualVerificationTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs b/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
index 60de0931a..4b2541657 100644
--- a/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
@@ -12,9 +12,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // and use that, because we don't have a pre-beaked database. Normally this feature is used to run tests when there is
 // an already existing database, so you don't need to take a snapshot before using the
 // "ExecuteTestFromExistingDBAsync()" method.
-public class DatabaseSnapshotTests : UITestBase
+public abstract class DatabaseSnapshotTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public DatabaseSnapshotTests(ITestOutputHelper testOutputHelper)
+    protected DatabaseSnapshotTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs b/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
index 70c9e11eb..b7a3f3223 100644
--- a/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
@@ -12,9 +12,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // In this test class we'll work with (wait for it!) e-mails. The UI Testing Toolbox provides services to run an SMTP
 // server locally that the app can use to send out e-mails, which we can then immediately check.
-public class EmailTests : UITestBase
+public abstract class EmailTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public EmailTests(ITestOutputHelper testOutputHelper)
+    protected EmailTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs b/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
index fad4d6d9a..2f7d273fe 100644
--- a/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
@@ -14,9 +14,10 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Sometimes errors are expected. Let's check out what can be done with them!
-public class ErrorHandlingTests : UITestBase
+public abstract class ErrorHandlingTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public ErrorHandlingTests(ITestOutputHelper testOutputHelper)
+    protected ErrorHandlingTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
index 814ab7450..e41f5932b 100644
--- a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
@@ -18,9 +18,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // It's possible to execute monkey tests that walk through site pages and do random interactions with pages, like click,
 // scrolling, form filling, etc. Such random actions can uncover bugs that are otherwise difficult to find. Use such
 // tests plug holes in your test suite which are not covered by explicit tests.
-public class MonkeyTests : UITestBase
+public abstract class MonkeyTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public MonkeyTests(ITestOutputHelper testOutputHelper)
+    protected MonkeyTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs b/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
index f68c48b78..ecfd32245 100644
--- a/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
@@ -14,9 +14,10 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // with it, should there be any incompatibilities). Note that for this, you need an SQL Server instance running; by
 // default, this will be attempted under the default localhost server name. If you're using anything else, check out the
 // settings in SqlServerConfiguration and Docs/Configuration.md, especially if you use Docker.
-public class SqlServerTests : UITestBase
+public abstract class SqlServerTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
-    public SqlServerTests(ITestOutputHelper testOutputHelper)
+    protected SqlServerTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs b/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
index 38e0c2d87..582277a2c 100644
--- a/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
@@ -16,12 +16,13 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // use context.GoToRelativeUrlAsync() but remember to use include the tenant url prefix, or change context.TenantName
 // (context.CreateAndEnterTenantAsync() already does this) and then use context.GoToAsync<TController>() to
 // navigate by MVC actions.
-public class TenantTests : UITestBase
+public abstract class TenantTests<TEntryPoint> : UITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
     private const string TestTenantUrlPrefix = "test";
     private const string TestTenantDisplayName = "Lombiq's OSOCE - Test Tenant";
 
-    public TenantTests(ITestOutputHelper testOutputHelper)
+    protected TenantTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index e8293acaf..05c10b96e 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -11,7 +11,8 @@ namespace Lombiq.Tests.UI.Samples;
 
 // This will be the base class for our UI test classes. Here we'll set up some common configuration. Inheriting test
 // classes is not mandatory but the approach is simple and effective.
-public class UITestBase : OrchardCoreUITestBase<Program>
+public class UITestBase<TEntryPoint> : OrchardCoreUITestBase<TEntryPoint>
+    where TEntryPoint : class
 {
     protected UITestBase(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 811d9cba4..da5e01084 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -65,7 +65,7 @@ namespace Lombiq.OSOCE.Tests.UI;
 -         .GetAbsoluteApplicationAssemblyPath("Lombiq.OSOCE.Web", "net6.0");
 ```
 
-## Breaking changes
+### Breaking changes
 
 There is a breaking change in adding command line arguments to the WebApplication.
 
@@ -84,9 +84,9 @@ There is a breaking change in adding command line arguments to the WebApplicatio
                 };
 ```
 
-## Non breaking changes
+### Non breaking changes
 
-### `Lombiq.Tests.UI.Extensions.ShortcutsUITestContextExtensions`
+#### `Lombiq.Tests.UI.Extensions.ShortcutsUITestContextExtensions`
 
 The following extension methods result in the same and no breaking change in the signatures, but they behave a bit differently. Using `WebApplicationFactory` opened the possibility to use OC services directly instead of using `Controller Actions` invoked by browser navigation.
 
diff --git a/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
index 6a73f9596..2d5959429 100644
--- a/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
@@ -15,8 +15,10 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Lombiq.Tests.UI.Extensions;
 
@@ -269,7 +271,7 @@ private static void AssertVisualVerificationApproved(
         configurator?.Invoke(configuration);
 
         var stackTrace = new EnhancedStackTrace(new StackTrace(fNeedFileInfo: true))
-            .Where(frame => frame.MethodInfo.MethodBase != null && !IsCompilerGenerated(frame));
+            .Where(frame => frame.GetMethodBase() != null && !IsCompilerGenerated(frame));
         var testFrame = stackTrace
             .FirstOrDefault(frame => !IsVisualVerificationMethod(frame));
 
@@ -277,7 +279,7 @@ private static void AssertVisualVerificationApproved(
         {
             testFrame = stackTrace
                 .Reverse()
-                .TakeWhile(frame => frame.MethodInfo.MethodBase != testFrame.MethodInfo.MethodBase)
+                .TakeWhile(frame => frame.GetMethodBase() != testFrame.GetMethodBase())
                 .TakeLast(configuration.StackOffset)
                 .FirstOrDefault();
         }
@@ -289,8 +291,8 @@ private static void AssertVisualVerificationApproved(
 
         var approvedContext = new VisualVerificationMatchApprovedContext
         {
-            ModuleName = testFrame.MethodInfo.DeclaringType.Name,
-            MethodName = testFrame.MethodInfo.Name,
+            ModuleName = testFrame.GetModuleName(),
+            MethodName = testFrame.GetMethodeName(),
             BrowserName = context.Driver.As<IHasCapabilities>().Capabilities.GetCapability("browserName") as string,
         };
 
@@ -637,8 +639,46 @@ private static string FormatAssertionMessage<TValue>(
     }
 
     private static bool IsVisualVerificationMethod(EnhancedStackFrame frame) =>
-        frame.MethodInfo.MethodBase.IsDefined(typeof(VisualVerificationApprovedMethodAttribute), inherit: true);
+        frame.GetMethodBase().IsDefined(typeof(VisualVerificationApprovedMethodAttribute), inherit: true);
 
     private static bool IsCompilerGenerated(EnhancedStackFrame frame) =>
-        frame.MethodInfo.MethodBase.IsDefined(typeof(CompilerGeneratedAttribute), inherit: true);
+        frame.GetMethodBase().IsDefined(typeof(CompilerGeneratedAttribute), inherit: true);
+
+    private static MethodBase GetMethodBase(this EnhancedStackFrame frame) =>
+        frame.MethodInfo.MethodBase ?? frame.MethodInfo.SubMethodBase;
+
+    private static string GetModuleName(this EnhancedStackFrame frame)
+    {
+        var currentMethod = frame.MethodInfo.DeclaringType;
+        string moduleName;
+
+        // This is required to retrieve the class from the inheritance chain where the method was declared but not
+        // overridden.
+        do
+        {
+            moduleName = currentMethod.Name;
+            currentMethod = currentMethod.DeclaringType;
+        }
+        while (currentMethod is not null);
+
+        var depthMark = new Regex("^(?<module>.*)`[0-9]+$", RegexOptions.ExplicitCapture);
+        if (depthMark.IsMatch(moduleName))
+        {
+            moduleName = depthMark.Match(moduleName).Groups["module"].Value;
+        }
+
+        return moduleName;
+    }
+
+    private static string GetMethodeName(this EnhancedStackFrame frame)
+    {
+        var methodName = frame.MethodInfo.Name;
+        var inheriteedMethod = new Regex("^<(?<method>.*)>.*$", RegexOptions.ExplicitCapture);
+        if (inheriteedMethod.IsMatch(methodName))
+        {
+            methodName = inheriteedMethod.Match(methodName).Groups["method"].Value;
+        }
+
+        return methodName;
+    }
 }

From b6b4400f7f1b2ecc450865c522ce9302a010fdde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 11 Sep 2022 15:38:30 +0200
Subject: [PATCH 27/53] Removing test sdk from Lombiq.Tests.UI.Samples.csproj

---
 Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index 4128b5415..4ba30ba31 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -34,14 +34,6 @@
     <EmbeddedResource Include="Tests\BasicVisualVerificationTests_VerifyNavbar_By_ClassName[Contains]_-navbar-brand_Win32NT_msedge.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
   </ItemGroup>

From efef0d7b64b0be159fb66daa42680a4e29a76fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Sun, 11 Sep 2022 16:56:21 +0200
Subject: [PATCH 28/53] Adding Lombiq.Tests as a NuGet package

---
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index abcd11433..2487db644 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -73,12 +73,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Lombiq.Tests\Lombiq.Tests.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI.AppExtensions\Lombiq.Tests.UI.AppExtensions.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI.Shortcuts\Lombiq.Tests.UI.Shortcuts.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
+    <ProjectReference Include="..\..\Lombiq.Tests\Lombiq.Tests.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.Cli\Lombiq.HelpfulLibraries.Cli.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.RestEase\Lombiq.HelpfulLibraries.RestEase.csproj" />
@@ -88,6 +88,7 @@
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\src\Utilities\Lombiq.Npm.Targets\Lombiq.Npm.Targets.targets" />
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
+    <PackageReference Include="Lombiq.Tests" Version="2.0.1-alpha.osoe-46.0" />
     <PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="4.6.1-alpha.walma-15.1" />
     <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.6.1-alpha.walma-15.1" />
     <PackageReference Include="Lombiq.HelpfulLibraries.RestEase" Version="4.6.1-alpha.walma-15.1" />

From a8e5fd13c82e23978ce6ab78cefc66e262c2417d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 12 Sep 2022 20:35:57 +0200
Subject: [PATCH 29/53] Revert "Removing test sdk from
 Lombiq.Tests.UI.Samples.csproj"

---
 Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj   | 9 +++++++++
 Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs       | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs   | 5 ++---
 .../Tests/BasicOrchardFeaturesTests.cs                   | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/BasicTests.cs              | 5 ++---
 .../Tests/BasicVisualVerificationTests.cs                | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs   | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/EmailTests.cs              | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs      | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs             | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs          | 5 ++---
 Lombiq.Tests.UI.Samples/Tests/TenantTests.cs             | 5 ++---
 Lombiq.Tests.UI.Samples/UITestBase.cs                    | 3 +--
 13 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
index 4ba30ba31..64f9095a2 100644
--- a/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+++ b/Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
@@ -35,6 +35,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Lombiq.OSOCE.Web\Lombiq.OSOCE.Web.csproj" />
     <ProjectReference Include="..\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
   </ItemGroup>
 
diff --git a/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs b/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
index 357a268bb..4abeec96a 100644
--- a/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
@@ -10,10 +10,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // Here we'll see how to check some web accessibility rules. Keeping our app accessible helps people with disabilities
 // consume the content of our website more easily. Do note though that only checking rules that can be automatically
 // checked is not enough for full compliance.
-public abstract class AccessibilityTest<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class AccessibilityTest : UITestBase
 {
-    protected AccessibilityTest(ITestOutputHelper testOutputHelper)
+    public AccessibilityTest(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs b/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
index 540710e4e..be3323978 100644
--- a/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
@@ -11,10 +11,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Up until now the Orchard app always used the default local Media storage for managing Media files. However, you may
 // use Azure Blob Storage in production. You can also test your app with it!
-public abstract class AzureBlobStorageTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class AzureBlobStorageTests : UITestBase
 {
-    protected AzureBlobStorageTests(ITestOutputHelper testOutputHelper)
+    public AzureBlobStorageTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs b/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
index a090f1594..230f00d3e 100644
--- a/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
@@ -12,10 +12,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // writing tests for your app is not really about testing Orchard itself but nevertheless it's useful to check if all
 // the important features like login work - keep in mind that you can break these from your own code. So, here we run
 // the whole test suite.
-public abstract class BasicOrchardFeaturesTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class BasicOrchardFeaturesTests : UITestBase
 {
-    protected BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper)
+    public BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs b/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs
index 6b7de96d1..3602e4451 100644
--- a/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/BasicTests.cs
@@ -12,10 +12,9 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // We'll see some simpler tests as a start. Each of them will teach us important concepts.
-public abstract class BasicTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class BasicTests : UITestBase
 {
-    protected BasicTests(ITestOutputHelper testOutputHelper)
+    public BasicTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs b/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
index 45a5644b5..0b9aa82ee 100644
--- a/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
@@ -10,10 +10,9 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // In this basic test we will check visually the rendered content.
-public abstract class BasicVisualVerificationTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class BasicVisualVerificationTests : UITestBase
 {
-    protected BasicVisualVerificationTests(ITestOutputHelper testOutputHelper)
+    public BasicVisualVerificationTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs b/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
index 4b2541657..60de0931a 100644
--- a/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
@@ -12,10 +12,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // and use that, because we don't have a pre-beaked database. Normally this feature is used to run tests when there is
 // an already existing database, so you don't need to take a snapshot before using the
 // "ExecuteTestFromExistingDBAsync()" method.
-public abstract class DatabaseSnapshotTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class DatabaseSnapshotTests : UITestBase
 {
-    protected DatabaseSnapshotTests(ITestOutputHelper testOutputHelper)
+    public DatabaseSnapshotTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs b/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
index b7a3f3223..70c9e11eb 100644
--- a/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
@@ -12,10 +12,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 
 // In this test class we'll work with (wait for it!) e-mails. The UI Testing Toolbox provides services to run an SMTP
 // server locally that the app can use to send out e-mails, which we can then immediately check.
-public abstract class EmailTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class EmailTests : UITestBase
 {
-    protected EmailTests(ITestOutputHelper testOutputHelper)
+    public EmailTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs b/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
index 2f7d273fe..fad4d6d9a 100644
--- a/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
@@ -14,10 +14,9 @@
 namespace Lombiq.Tests.UI.Samples.Tests;
 
 // Sometimes errors are expected. Let's check out what can be done with them!
-public abstract class ErrorHandlingTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class ErrorHandlingTests : UITestBase
 {
-    protected ErrorHandlingTests(ITestOutputHelper testOutputHelper)
+    public ErrorHandlingTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
index e41f5932b..814ab7450 100644
--- a/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
@@ -18,10 +18,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // It's possible to execute monkey tests that walk through site pages and do random interactions with pages, like click,
 // scrolling, form filling, etc. Such random actions can uncover bugs that are otherwise difficult to find. Use such
 // tests plug holes in your test suite which are not covered by explicit tests.
-public abstract class MonkeyTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class MonkeyTests : UITestBase
 {
-    protected MonkeyTests(ITestOutputHelper testOutputHelper)
+    public MonkeyTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs b/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
index ecfd32245..f68c48b78 100644
--- a/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
@@ -14,10 +14,9 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // with it, should there be any incompatibilities). Note that for this, you need an SQL Server instance running; by
 // default, this will be attempted under the default localhost server name. If you're using anything else, check out the
 // settings in SqlServerConfiguration and Docs/Configuration.md, especially if you use Docker.
-public abstract class SqlServerTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class SqlServerTests : UITestBase
 {
-    protected SqlServerTests(ITestOutputHelper testOutputHelper)
+    public SqlServerTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs b/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
index 582277a2c..38e0c2d87 100644
--- a/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
+++ b/Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
@@ -16,13 +16,12 @@ namespace Lombiq.Tests.UI.Samples.Tests;
 // use context.GoToRelativeUrlAsync() but remember to use include the tenant url prefix, or change context.TenantName
 // (context.CreateAndEnterTenantAsync() already does this) and then use context.GoToAsync<TController>() to
 // navigate by MVC actions.
-public abstract class TenantTests<TEntryPoint> : UITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class TenantTests : UITestBase
 {
     private const string TestTenantUrlPrefix = "test";
     private const string TestTenantDisplayName = "Lombiq's OSOCE - Test Tenant";
 
-    protected TenantTests(ITestOutputHelper testOutputHelper)
+    public TenantTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
diff --git a/Lombiq.Tests.UI.Samples/UITestBase.cs b/Lombiq.Tests.UI.Samples/UITestBase.cs
index 05c10b96e..e8293acaf 100644
--- a/Lombiq.Tests.UI.Samples/UITestBase.cs
+++ b/Lombiq.Tests.UI.Samples/UITestBase.cs
@@ -11,8 +11,7 @@ namespace Lombiq.Tests.UI.Samples;
 
 // This will be the base class for our UI test classes. Here we'll set up some common configuration. Inheriting test
 // classes is not mandatory but the approach is simple and effective.
-public class UITestBase<TEntryPoint> : OrchardCoreUITestBase<TEntryPoint>
-    where TEntryPoint : class
+public class UITestBase : OrchardCoreUITestBase<Program>
 {
     protected UITestBase(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)

From 3f4e2543c772ab4db6cfb9fa4340fcef004af8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 14 Sep 2022 21:33:07 +0200
Subject: [PATCH 30/53] Moving OrchardCoreBuilderExtensions to Lombiq.Tests.UI
 Updating docs

---
 Lombiq.Tests.UI.Samples/Readme.md             |  2 +-
 Lombiq.Tests.UI/Docs/Migration.md             | 11 ++++----
 Lombiq.Tests.UI/Docs/Projects.md              |  2 +-
 .../Docs/TestableOrchardCoreApps.md           | 25 +++++++------------
 Lombiq.Tests.UI/Docs/Troubleshooting.md       |  2 +-
 .../OrchardCoreBuilderExtensions.cs           |  0
 6 files changed, 18 insertions(+), 24 deletions(-)
 rename {Lombiq.Tests.UI.AppExtensions => Lombiq.Tests.UI}/Extensions/OrchardCoreBuilderExtensions.cs (100%)

diff --git a/Lombiq.Tests.UI.Samples/Readme.md b/Lombiq.Tests.UI.Samples/Readme.md
index cc224b975..5d2699eb0 100644
--- a/Lombiq.Tests.UI.Samples/Readme.md
+++ b/Lombiq.Tests.UI.Samples/Readme.md
@@ -9,7 +9,7 @@ For general details about and on using the Toolbox see the [root Readme](../Read
 ## Tutorial
 
 1. Be sure to read the [root Readme](../Readme.md) first to understand how the UI Testing Toolbox works and how you can use it with an Orchard Core app.
-2. The web app under test also needs a bit of configuration. For an example of this, check out [the `Program` class of Lombiq's Open-Source Orchard Core Extensions](https://github.com/Lombiq/Open-Source-Orchard-Core-Extensions/blob/dev/src/Lombiq.OSOCE.Web/Program.cs). This project assumes it's running in that solution.
+2. The web app under test also needs a bit of configuration. For an example of this, check out [the `Program` class of Lombiq's Open-Source Orchard Core Extensions](https://github.com/Lombiq/Open-Source-Orchard-Core-Extensions/blob/dev/src/Lombiq.OSOCE.Web/Program.cs). This project assumes it's running in that solution, so it depends on `Lombiq.OSOCE.Web` to be present at the correct path to be able to build it.
 3. Note that the project includes an _xunit.runner.json_ file. This is [xUnit's configuration file](https://xunit.net/docs/configuration-files). You don't necessarily need to include one if you're OK with [the default one](https://github.com/Lombiq/UI-Testing-Toolbox/blob/dev/Lombiq.Tests.UI/xunit.runner.json).
 4. Now that we have the basics out of the way start the tutorial in the [_GlobalSuppressions.cs_](GlobalSuppressions.cs) file.
 
diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index da5e01084..cd2791892 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -1,10 +1,11 @@
 # Migration guide
 
-## Migrating from v3.*.*
+## Migrating from v3.*
 
 ### Preparing WebApplication
 
-1. Prepare WebApplication as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
+1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
+1. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
 2. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
 
 ```diff
@@ -41,7 +42,7 @@ app.Run();
 
 ### Preparing UI test project
 
-1. Add WebApplication project as a `Project reference` to UI test project.
+1. Add the web app project under test as a `Project reference` to UI test project.
 
 ```diff
   </ItemGroup>
@@ -102,7 +103,7 @@ This means that calling the extension methods below no longer results in browser
 - `SelectThemeAsync`
 - `GenerateHttpEventUrlAsync`
 
-Here is a sample for better understanding:
+_Here is a sample for better understanding_:
 ```diff
     public static async Task EnablePrivacyConsentBannerFeatureAndAcceptPrivacyConsentAsync(this UITestContext context)
     {
@@ -114,6 +115,6 @@ Here is a sample for better understanding:
     }
 ```
 
-The original code with the new behavior resulted in a failing test, because the browser pointed to the `Home page` before `await context.EnablePrivacyConsentBannerFeatureAsync()(= context.EnableFeatureDirectlyAsync({featureId})`, the `context.EnableFeatureDirectlyAsync` not navigates away, so finaly the `await context.GoToHomePageAsync()` call do nothing and the consent banner din't come up.
+The original code with the new behavior resulted in a failing test, because the browser pointed to the `Home page` before `await context.EnablePrivacyConsentBannerFeatureAsync()(=> context.EnableFeatureDirectlyAsync({featureId})`, the `context.EnableFeatureDirectlyAsync` not navigates away, so finaly the `await context.GoToHomePageAsync()` call do nothing and the consent banner din't come up.
 
 The solution, in this case, is to call `await context.GoToHomePageAsync(onlyIfNotAlreadyThere: false)`, this result a reload, and the consent banner come up.
diff --git a/Lombiq.Tests.UI/Docs/Projects.md b/Lombiq.Tests.UI/Docs/Projects.md
index 42ff31606..327341a57 100644
--- a/Lombiq.Tests.UI/Docs/Projects.md
+++ b/Lombiq.Tests.UI/Docs/Projects.md
@@ -3,6 +3,6 @@
 The UI Testing Toolbox encompasses the following projects:
 
 - `Lombiq.Tests.UI`: Contains all features used for UI testing. This is the project that your test projects need to reference.
-- [`Lombiq.Tests.UI.AppExtensions`](../../Lombiq.Tests.UI.AppExtensions/Readme.md): UI testing-related configuration extensions for the web app under test. This is the project that your web project needs to reference.
+- [`Lombiq.Tests.UI.AppExtensions`](../../Lombiq.Tests.UI.AppExtensions/Readme.md): UI testing-related extensions for the web app under test.
 - [`Lombiq.Tests.UI.Shortcuts`](../../Lombiq.Tests.UI.Shortcuts/Readme.md): Provides some useful shortcuts for common operations that UI tests might want to do or check, e.g. turning features on or off, or logging in users. If you utilize these shortcuts then your web projects needs to reference this project to load as an Orchard Core module.
 - [`Lombiq.Tests.UI.Samples`](../../Lombiq.Tests.UI.Samples/Readme.md): Example UI testing project.
diff --git a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
index 472f53d5e..b9bf7493a 100644
--- a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
+++ b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
@@ -6,26 +6,19 @@ Tips on making specific features testable are under the ["Creating tests" page](
 
 - Create recipes with test content, and import them by starting with a UI testing-specific setup recipe. While you can run tests from an existing database, using recipes to create a test environment (that almost entirely doubles as a development environment) is more reliable. Keep in mind, that the data you test shouldn't change randomly, you can't assert on data coming from the export of a production app which is updated all the time. Using [Auto Setup](https://docs.orchardcore.net/en/dev/docs/reference/modules/AutoSetup/) works too, just check out the [samples project](../../Lombiq.Tests.UI.Samples/Readme.md).
 - In your web project do the following:
-  1. Add a reference to `Lombiq.Tests.UI.AppExtensions` (either from NuGet or as a Git submodule).
-  2. Allow configuration of the app when launched for testing with the following piece of code in the app's `Startup` class:
+  1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
+  2. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
 
         ```csharp
-        public void ConfigureServices(IServiceCollection services)
-        {
-            // _configuration is a constructor-injected IConfiguration instance.
-            services.AddOrchardCms(builder => builder.ConfigureUITesting(_configuration));
-        }
-        ```
+        ...
 
-- If you make use of shortcuts then add the `Lombiq.Tests.UI.Shortcuts` project (either from NuGet or as a Git submodule) as a reference to the root app project and enable it during UI testing by modifying the startup code as below (note the second `true` parameter):
+        var configuration = builder.Configuration;
 
-    ```csharp
-    public void ConfigureServices(IServiceCollection services)
-    {
-        // _configuration is a constructor-injected IConfiguration instance.
-        services.AddOrchardCms(builder => builder.ConfigureUITesting(_configuration, true));
-    }
-    ```
+        builder.Services.Add(new ServiceDescriptor(configuration.GetType(), configuration));
+        builder.Services.AddOrchardCms();
+        ```
+
+- If you make use of shortcuts then add the `Lombiq.Tests.UI.Shortcuts` project (either from NuGet or as a Git submodule) as a reference to the root app project. The module will be enabled in case of UI testing.
 
   Note that since authentication-related shortcuts need an implementation available for `Microsoft.AspNetCore.Identity.IRoleStore<OrchardCore.Security.IRole>` the `OrchardCore.Roles` feature will also be enabled. If you want to use a different implementation then enable the Shortcuts module from the test recipe, as well as the alternative Roles implementation, as below:
 
diff --git a/Lombiq.Tests.UI/Docs/Troubleshooting.md b/Lombiq.Tests.UI/Docs/Troubleshooting.md
index 0f295d383..2812c4dff 100644
--- a/Lombiq.Tests.UI/Docs/Troubleshooting.md
+++ b/Lombiq.Tests.UI/Docs/Troubleshooting.md
@@ -10,7 +10,7 @@
   - Any direct output of the test (like the exception thrown) as well as a log of the operations it completed.
   - If accessibility was checked and asserting it failed then an accessibility report will be included too.
   - If HTML validation was done and asserting it failed then an HTML validation report will be included too.
-- Run tests with the debugger attached to stop where the test fails. This way you can take a good look at what's in the driven browser window so you can examine the web page. Alternatively, if you want to debug the web app then you can run the test without debugging and attach the debugger to the _dotnet.exe_ process running the app.
+- Run tests with the debugger attached to stop where the test fails. This way you can take a good look at what's in the driven browser window so you can examine the web page.
 - An aborted test can leave processes open (a failed test should clean up after itself nevertheless). Look for _dotnet.exe_ and _chromedriver.exe_ processes (and also for _geckodriver.exe_, _IEDriverServer.exe_ and _msedgedriver.exe_ if you use other browsers) with [Process Explorer](https://docs.microsoft.com/en-us/sysinternals/downloads/process-explorer) and kill them. You can also use the included _KillLeftoverProcesses.bat_ script to kill these (optionally install the [Command Task Runner](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.CommandTaskRunner) Visual Studio Extension so you can run this script from Task Runner Explorer directly). If you see build warnings or errors with files being locked then most possibly a _dotnet.exe_ process is locking them (or an IIS Express one if you have run the app from VS too). If you get an `IOException` with the message along the lines of "Starting the Orchard Core application via dotnet.exe failed with the following output: Unhandled exception. System.IO.IOException: Failed to bind to address <https://127.0.0.1:5122>: address already in use." then that's also because there's a leftover _dotnet.exe_ using that port.
 - All tests failing is a telltale sign of the setup failing (if your tests run with a fresh setup), check out the failure dumps.
 - If tests fail to start the Orchard Core app with an "Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found or is out of date." error then you have to install a new development certificate. Do the following under the user executing the tests:
diff --git a/Lombiq.Tests.UI.AppExtensions/Extensions/OrchardCoreBuilderExtensions.cs b/Lombiq.Tests.UI/Extensions/OrchardCoreBuilderExtensions.cs
similarity index 100%
rename from Lombiq.Tests.UI.AppExtensions/Extensions/OrchardCoreBuilderExtensions.cs
rename to Lombiq.Tests.UI/Extensions/OrchardCoreBuilderExtensions.cs

From ec382390026f5841bdff9030a8bea20f3a455223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 14 Sep 2022 21:39:46 +0200
Subject: [PATCH 31/53] Fixing docs

---
 Lombiq.Tests.UI/Docs/Troubleshooting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/Troubleshooting.md b/Lombiq.Tests.UI/Docs/Troubleshooting.md
index 2812c4dff..adbf949ca 100644
--- a/Lombiq.Tests.UI/Docs/Troubleshooting.md
+++ b/Lombiq.Tests.UI/Docs/Troubleshooting.md
@@ -10,7 +10,7 @@
   - Any direct output of the test (like the exception thrown) as well as a log of the operations it completed.
   - If accessibility was checked and asserting it failed then an accessibility report will be included too.
   - If HTML validation was done and asserting it failed then an HTML validation report will be included too.
-- Run tests with the debugger attached to stop where the test fails. This way you can take a good look at what's in the driven browser window so you can examine the web page.
+- Run tests with the debugger attached to stop where the test fails. This way you can take a good look at what's in the driven browser window so you can examine the web page and you can debug the web app under test at the same time.
 - An aborted test can leave processes open (a failed test should clean up after itself nevertheless). Look for _dotnet.exe_ and _chromedriver.exe_ processes (and also for _geckodriver.exe_, _IEDriverServer.exe_ and _msedgedriver.exe_ if you use other browsers) with [Process Explorer](https://docs.microsoft.com/en-us/sysinternals/downloads/process-explorer) and kill them. You can also use the included _KillLeftoverProcesses.bat_ script to kill these (optionally install the [Command Task Runner](https://marketplace.visualstudio.com/items?itemName=MadsKristensen.CommandTaskRunner) Visual Studio Extension so you can run this script from Task Runner Explorer directly). If you see build warnings or errors with files being locked then most possibly a _dotnet.exe_ process is locking them (or an IIS Express one if you have run the app from VS too). If you get an `IOException` with the message along the lines of "Starting the Orchard Core application via dotnet.exe failed with the following output: Unhandled exception. System.IO.IOException: Failed to bind to address <https://127.0.0.1:5122>: address already in use." then that's also because there's a leftover _dotnet.exe_ using that port.
 - All tests failing is a telltale sign of the setup failing (if your tests run with a fresh setup), check out the failure dumps.
 - If tests fail to start the Orchard Core app with an "Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found or is out of date." error then you have to install a new development certificate. Do the following under the user executing the tests:

From 2f8adc024aba17eb7cc966d6007d4c6d4e33c169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 14 Sep 2022 22:00:44 +0200
Subject: [PATCH 32/53] Fixing docs

---
 Lombiq.Tests.UI/Docs/Migration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index cd2791892..177afde14 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -5,8 +5,8 @@
 ### Preparing WebApplication
 
 1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
-1. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
-2. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
+2. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
+3. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
 
 ```diff
 using Microsoft.AspNetCore.Builder;

From 53fcbab4cd4603439807e72e667e5491f2c36e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 15 Sep 2022 10:48:07 +0200
Subject: [PATCH 33/53] Removing possible dead-lock

---
 .../Services/AzureBlobStorageManager.cs       |  4 +--
 .../Services/OrchardCoreInstance.cs           |  2 +-
 Lombiq.Tests.UI/Services/PortLeaseManager.cs  | 33 +++++++++++++------
 Lombiq.Tests.UI/Services/SmtpService.cs       | 12 +++----
 Lombiq.Tests.UI/Services/SqlServerManager.cs  | 10 +++---
 .../Services/UITestExecutionSession.cs        | 11 ++++---
 6 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs b/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs
index 2e1162202..3e0b31608 100644
--- a/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs
+++ b/Lombiq.Tests.UI/Services/AzureBlobStorageManager.cs
@@ -62,7 +62,7 @@ public async Task<AzureBlobStorageRunningContext> SetupBlobStorageAsync()
         _blobContainer = new BlobContainerClient(_configuration.ConnectionString, _configuration.ContainerName);
         await CreateContainerIfNotExistsAsync();
 
-        _folderId = _portLeaseManager.LeaseAvailableRandomPort();
+        _folderId = await _portLeaseManager.LeaseAvailableRandomPortAsync();
         _basePath = _folderId.ToTechnicalString();
 
         await DropFolderIfExistsAsync();
@@ -107,7 +107,7 @@ public async ValueTask DisposeAsync()
 
         await DropFolderIfExistsAsync();
 
-        _portLeaseManager.StopLease(_folderId);
+        await _portLeaseManager.StopLeaseAsync(_folderId);
     }
 
     private Task CreateContainerIfNotExistsAsync() => _blobContainer.CreateIfNotExistsAsync(PublicAccessType.None);
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index bb96a045b..d4af43aaa 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -74,7 +74,7 @@ public OrchardCoreInstance(OrchardCoreConfiguration configuration, string contex
 
     public async Task<Uri> StartUpAsync()
     {
-        var port = OrchardCoreInstanceCounter.PortLeases.LeaseAvailableRandomPort();
+        var port = await OrchardCoreInstanceCounter.PortLeases.LeaseAvailableRandomPortAsync();
         _url = OrchardCoreInstanceCounter.UrlPrefix + port.ToTechnicalString();
         _testOutputHelper.WriteLineTimestampedAndDebug("The generated URL for the Orchard Core instance is \"{0}\".", _url);
 
diff --git a/Lombiq.Tests.UI/Services/PortLeaseManager.cs b/Lombiq.Tests.UI/Services/PortLeaseManager.cs
index 66b881b51..744c08ed4 100644
--- a/Lombiq.Tests.UI/Services/PortLeaseManager.cs
+++ b/Lombiq.Tests.UI/Services/PortLeaseManager.cs
@@ -1,6 +1,8 @@
 using Lombiq.HelpfulLibraries.Common.Utilities;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Lombiq.Tests.UI.Services;
 
@@ -14,27 +16,38 @@ public class PortLeaseManager
 {
     private readonly IEnumerable<int> _availablePortsRange;
     private readonly HashSet<int> _usedPorts = new();
-    private readonly object _portAcquisitionLock = new();
+    private readonly SemaphoreSlim _portAcquisitionLock = new(1, 1);
 
     public PortLeaseManager(int lowerBound, int upperBound) =>
         _availablePortsRange = Enumerable.Range(lowerBound, upperBound - lowerBound);
 
-    public int LeaseAvailableRandomPort()
+    public async Task<int> LeaseAvailableRandomPortAsync()
     {
-        lock (_portAcquisitionLock)
+        await _portAcquisitionLock.WaitAsync();
+
+        int port;
+
+        try
         {
             var availablePorts = _availablePortsRange.Except(_usedPorts).ToList();
-            var port = availablePorts[new NonSecurityRandomizer().GetFromRange(availablePorts.Count)];
+
+            port = availablePorts[new NonSecurityRandomizer().GetFromRange(availablePorts.Count)];
             _usedPorts.Add(port);
-            return port;
         }
+        finally
+        {
+            _portAcquisitionLock.Release();
+        }
+
+        return port;
     }
 
-    public void StopLease(int port)
+    public async Task StopLeaseAsync(int port)
     {
-        lock (_portAcquisitionLock)
-        {
-            _usedPorts.Remove(port);
-        }
+        await _portAcquisitionLock.WaitAsync();
+
+        _usedPorts.Remove(port);
+
+        _portAcquisitionLock.Release();
     }
 }
diff --git a/Lombiq.Tests.UI/Services/SmtpService.cs b/Lombiq.Tests.UI/Services/SmtpService.cs
index 557b04153..37f6745c1 100644
--- a/Lombiq.Tests.UI/Services/SmtpService.cs
+++ b/Lombiq.Tests.UI/Services/SmtpService.cs
@@ -80,8 +80,8 @@ public async Task<SmtpServiceRunningContext> StartAsync()
             throw new InvalidOperationException("There was no smtp4dev configuration in the .NET CLI local tool manifest file.");
         }
 
-        _smtpPort = _smtpPortLeaseManager.LeaseAvailableRandomPort();
-        _webUIPort = _webUIPortLeaseManager.LeaseAvailableRandomPort();
+        _smtpPort = await _smtpPortLeaseManager.LeaseAvailableRandomPortAsync();
+        _webUIPort = await _webUIPortLeaseManager.LeaseAvailableRandomPortAsync();
 
         var webUIPortString = _webUIPort.ToTechnicalString();
         var smtpPortString = _smtpPort.ToTechnicalString();
@@ -121,17 +121,15 @@ await CliProgram.DotNet.GetCommand(
         return new SmtpServiceRunningContext(_smtpPort, webUIUri);
     }
 
-    public ValueTask DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
-        _smtpPortLeaseManager.StopLease(_smtpPort);
-        _webUIPortLeaseManager.StopLease(_webUIPort);
+        await _smtpPortLeaseManager.StopLeaseAsync(_smtpPort);
+        await _webUIPortLeaseManager.StopLeaseAsync(_webUIPort);
 
         if (_cancellationTokenSource != null && !_cancellationTokenSource.IsCancellationRequested)
         {
             _cancellationTokenSource.Cancel();
             _cancellationTokenSource.Dispose();
         }
-
-        return new ValueTask(Task.CompletedTask);
     }
 }
diff --git a/Lombiq.Tests.UI/Services/SqlServerManager.cs b/Lombiq.Tests.UI/Services/SqlServerManager.cs
index 527499933..33cd41978 100644
--- a/Lombiq.Tests.UI/Services/SqlServerManager.cs
+++ b/Lombiq.Tests.UI/Services/SqlServerManager.cs
@@ -35,7 +35,7 @@ public class SqlServerRunningContext
     public SqlServerRunningContext(string connectionString) => ConnectionString = connectionString;
 }
 
-public sealed class SqlServerManager : IDisposable
+public sealed class SqlServerManager : IAsyncDisposable
 {
     private const string DbSnapshotName = "Database.bak";
 
@@ -65,9 +65,9 @@ static SqlServerManager()
 
     public SqlServerManager(SqlServerConfiguration configuration) => _configuration = configuration;
 
-    public SqlServerRunningContext CreateDatabase()
+    public async Task<SqlServerRunningContext> CreateDatabaseAsync()
     {
-        _databaseId = _portLeaseManager.LeaseAvailableRandomPort();
+        _databaseId = await _portLeaseManager.LeaseAvailableRandomPortAsync();
 
         var connectionString = _configuration.ConnectionStringTemplate
             .Replace(SqlServerConfiguration.DatabaseIdPlaceholder, _databaseId.ToTechnicalString(), StringComparison.Ordinal);
@@ -243,7 +243,7 @@ private Task DockerExecuteAsync(string containerName, params object[] command)
         return _docker.ExecuteAsync(arguments, additionalExceptionText: null, CancellationToken.None);
     }
 
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
         if (_isDisposed) return;
 
@@ -251,7 +251,7 @@ public void Dispose()
 
         DropDatabaseIfExists(CreateServer());
 
-        _portLeaseManager.StopLease(_databaseId);
+        await _portLeaseManager.StopLeaseAsync(_databaseId);
     }
 
     // It's easier to use the server name directly instead of the connection string as that also requires the referenced
diff --git a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
index 76b1a5672..5a17e0307 100644
--- a/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+++ b/Lombiq.Tests.UI/Services/UITestExecutionSession.cs
@@ -174,7 +174,10 @@ private async ValueTask ShutdownAsync()
             _context.FailureDumpContainer.Clear();
         }
 
-        _sqlServerManager?.Dispose();
+        if (_sqlServerManager is not null)
+        {
+            await _sqlServerManager.DisposeAsync();
+        }
 
         if (_smtpService != null) await _smtpService.DisposeAsync();
         if (_azureBlobStorageManager != null) await _azureBlobStorageManager.DisposeAsync();
@@ -548,7 +551,7 @@ private async Task<UITestContext> CreateContextAsync()
         AzureBlobStorageRunningContext azureBlobStorageContext = null;
         SmtpServiceRunningContext smtpContext = null;
 
-        if (_configuration.UseSqlServer) sqlServerContext = SetUpSqlServer();
+        if (_configuration.UseSqlServer) sqlServerContext = await SetUpSqlServerAsync();
         if (_configuration.UseAzureBlobStorage) azureBlobStorageContext = await SetUpAzureBlobStorageAsync();
         if (_configuration.UseSmtpService) smtpContext = await StartSmtpServiceAsync();
 
@@ -618,10 +621,10 @@ private string GetSetupHashCode() =>
 
     private Task OnAssertLogsAsync(UITestContext context) => context.AssertLogsAsync();
 
-    private SqlServerRunningContext SetUpSqlServer()
+    private async Task<SqlServerRunningContext> SetUpSqlServerAsync()
     {
         _sqlServerManager = new SqlServerManager(_configuration.SqlServerDatabaseConfiguration);
-        var sqlServerContext = _sqlServerManager.CreateDatabase();
+        var sqlServerContext = await _sqlServerManager.CreateDatabaseAsync();
 
         async Task SqlServerManagerBeforeAppStartHandlerAsync(string contentRootPath, InstanceCommandLineArgumentsBuilder arguments)
         {

From 6c4a662b62592e878f54a094c9a45f7c648af801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 15 Sep 2022 19:17:10 +0200
Subject: [PATCH 34/53] Fixing razor runtime compilation related issue

---
 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index d4af43aaa..6a9e3f760 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -80,6 +80,9 @@ public async Task<Uri> StartUpAsync()
 
         CreateContentRootFolder();
 
+        // This is to avoid Orchard add Razor runtime compilation.
+        DirectoryHelper.SafelyDeleteDirectoryIfExists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
+
         if (!string.IsNullOrEmpty(_configuration.SnapshotDirectoryPath) && Directory.Exists(_configuration.SnapshotDirectoryPath))
         {
             FileSystem.CopyDirectory(_configuration.SnapshotDirectoryPath, _contentRootPath, overwrite: true);
@@ -178,7 +181,7 @@ await _configuration.BeforeAppStart
             builder => builder
                 .UseContentRoot(_contentRootPath)
                 .UseWebRoot(Path.Combine(_contentRootPath, "wwwroot"))
-                .UseEnvironment("Development")
+                .UseEnvironment(Environments.Development)
                 .ConfigureAppConfiguration(configuration => configuration.AddCommandLine(arguments.Arguments.ToArray())),
             (configuration, orchardBuilder) => orchardBuilder
                 .ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true));

From 2120dda3e3a003b996fbffb44c0011ba3c15e2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Fri, 16 Sep 2022 00:11:55 +0200
Subject: [PATCH 35/53] Just for a test

---
 .../Services/OrchardCoreHosting/OrchardApplicationFactory.cs   | 2 ++
 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs                | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 9de778968..3de05d06e 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -39,6 +39,8 @@ public OrchardApplicationFactory(
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         builder.ConfigureTestServices(ConfigureTestServices)
+            .ConfigureServices((context, _) =>
+                context.HostingEnvironment.ApplicationName = typeof(OrchardApplicationFactory<TStartup>).Assembly.GetName().Name)
             .ConfigureLogging((context, loggingBuilder) =>
             {
                 var environment = context.HostingEnvironment;
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index 6a9e3f760..cff79c35e 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -80,9 +80,6 @@ public async Task<Uri> StartUpAsync()
 
         CreateContentRootFolder();
 
-        // This is to avoid Orchard add Razor runtime compilation.
-        DirectoryHelper.SafelyDeleteDirectoryIfExists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "refs"));
-
         if (!string.IsNullOrEmpty(_configuration.SnapshotDirectoryPath) && Directory.Exists(_configuration.SnapshotDirectoryPath))
         {
             FileSystem.CopyDirectory(_configuration.SnapshotDirectoryPath, _contentRootPath, overwrite: true);

From 8956d2d5fc05423311fa770966f40f421535397d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 19 Sep 2022 19:29:57 +0200
Subject: [PATCH 36/53] Fixing possible dead lock

---
 .../Services/OrchardCoreHosting/FakeStore.cs         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
index d920cfbad..b375ab845 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/FakeStore.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using YesSql;
@@ -8,7 +9,7 @@ namespace Lombiq.Tests.UI.Services.OrchardCoreHosting;
 
 public sealed class FakeStore : IStore
 {
-    private readonly List<ISession> _createdSessions = new();
+    private readonly ConcurrentBag<ISession> _createdSessions = new();
     private readonly IStore _store;
 
     public FakeStore(IStore store) =>
@@ -20,13 +21,10 @@ public FakeStore(IStore store) =>
 
     public ISession CreateSession()
     {
-        lock (_createdSessions)
-        {
-            var session = _store.CreateSession();
-            _createdSessions.Add(session);
+        var session = _store.CreateSession();
+        _createdSessions.Add(session);
 
-            return session;
-        }
+        return session;
     }
 
     public IEnumerable<IndexDescriptor> Describe(Type target, string collection = null) => _store.Describe(target, collection);

From 48834f8a377ddd4f3fbe58789ffce1d14b5ee454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 19 Sep 2022 20:29:13 +0200
Subject: [PATCH 37/53] Removing unnecessary workaround for razor runtime
 compilation

---
 .../Services/OrchardCoreHosting/OrchardApplicationFactory.cs    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 3de05d06e..9de778968 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -39,8 +39,6 @@ public OrchardApplicationFactory(
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         builder.ConfigureTestServices(ConfigureTestServices)
-            .ConfigureServices((context, _) =>
-                context.HostingEnvironment.ApplicationName = typeof(OrchardApplicationFactory<TStartup>).Assembly.GetName().Name)
             .ConfigureLogging((context, loggingBuilder) =>
             {
                 var environment = context.HostingEnvironment;

From 649f996abc3da7ae4d6136bd63d1c559e1e4acbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Tue, 20 Sep 2022 22:25:06 +0200
Subject: [PATCH 38/53] Updating docs

---
 Lombiq.Tests.UI/Docs/Migration.md               | 12 +++++++++++-
 Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 177afde14..da60dedcb 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -6,7 +6,17 @@
 
 1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
 2. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
-3. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
+3. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test.
+
+```diff
+    <TargetFramework>net6.0</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <RazorRuntimeCompilation>false</RazorRuntimeCompilation>
++     <PreserveCompilationContext>true</PreserveCompilationContext>
+  </PropertyGroup>
+```
+
+4. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
 
 ```diff
 using Microsoft.AspNetCore.Builder;
diff --git a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
index b9bf7493a..ca2a453ab 100644
--- a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
+++ b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
@@ -7,7 +7,8 @@ Tips on making specific features testable are under the ["Creating tests" page](
 - Create recipes with test content, and import them by starting with a UI testing-specific setup recipe. While you can run tests from an existing database, using recipes to create a test environment (that almost entirely doubles as a development environment) is more reliable. Keep in mind, that the data you test shouldn't change randomly, you can't assert on data coming from the export of a production app which is updated all the time. Using [Auto Setup](https://docs.orchardcore.net/en/dev/docs/reference/modules/AutoSetup/) works too, just check out the [samples project](../../Lombiq.Tests.UI.Samples/Readme.md).
 - In your web project do the following:
   1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
-  2. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
+  2. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test.
+  3. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
 
         ```csharp
         ...

From 78886c354a7bcf795911a3f8ffc670b5fd819294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 21 Sep 2022 19:29:03 +0200
Subject: [PATCH 39/53] Possible fix of real deadlock Updating docs

---
 Lombiq.Tests.UI/Docs/Migration.md             |  2 +-
 .../Docs/TestableOrchardCoreApps.md           |  2 +-
 .../ShortcutsUITestContextExtensions.cs       | 52 +++++++++++--------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index da60dedcb..6556b262b 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -6,7 +6,7 @@
 
 1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
 2. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
-3. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test.
+3. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test. See: [PreserveCompilationContext](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#preservecompilationcontext) and [PreserveCompilationContext not configured by default](https://learn.microsoft.com/en-us/dotnet/core/compatibility/aspnet-core/6.0/preservecompilationcontext-not-set-by-default) for more details.
 
 ```diff
     <TargetFramework>net6.0</TargetFramework>
diff --git a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
index ca2a453ab..e4e8779ab 100644
--- a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
+++ b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
@@ -7,7 +7,7 @@ Tips on making specific features testable are under the ["Creating tests" page](
 - Create recipes with test content, and import them by starting with a UI testing-specific setup recipe. While you can run tests from an existing database, using recipes to create a test environment (that almost entirely doubles as a development environment) is more reliable. Keep in mind, that the data you test shouldn't change randomly, you can't assert on data coming from the export of a production app which is updated all the time. Using [Auto Setup](https://docs.orchardcore.net/en/dev/docs/reference/modules/AutoSetup/) works too, just check out the [samples project](../../Lombiq.Tests.UI.Samples/Readme.md).
 - In your web project do the following:
   1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
-  2. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test.
+  2. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test. See: [PreserveCompilationContext](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#preservecompilationcontext) and [PreserveCompilationContext not configured by default](https://learn.microsoft.com/en-us/dotnet/core/compatibility/aspnet-core/6.0/preservecompilationcontext-not-set-by-default) for more details.
   3. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
 
         ```csharp
diff --git a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
index 7e53e93d7..e64a1d080 100644
--- a/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/ShortcutsUITestContextExtensions.cs
@@ -52,6 +52,7 @@ public static class ShortcutsUITestContextExtensions
     public const string FeatureToggleTestBenchUrl = "/Lombiq.Tests.UI.Shortcuts/FeatureToggleTestBench/Index";
 
     private static readonly ConcurrentDictionary<string, IShortcutsApi> _apis = new();
+    private static readonly SemaphoreSlim _recipeHarvesterSemaphore = new(1, 1);
 
     /// <summary>
     /// Authenticates the client with the given user account. Note that this will execute a direct sign in without
@@ -345,31 +346,40 @@ public static Task ExecuteRecipeDirectlyAsync(
         .UsingScopeAsync(
             async shellScope =>
             {
-                var recipeHarvesters = shellScope.ServiceProvider.GetRequiredService<IEnumerable<IRecipeHarvester>>();
-                var recipeCollections = await recipeHarvesters
-                    .AwaitEachAsync(harvester => harvester.HarvestRecipesAsync());
-                var recipe = recipeCollections
-                    .SelectMany(recipeCollection => recipeCollection)
-                    .SingleOrDefault(recipeDescriptor => recipeDescriptor.Name == recipeName);
-
-                if (recipe == null)
+                try
                 {
-                    throw new RecipeNotFoundException($"{recipeName} not found!");
-                }
+                    await _recipeHarvesterSemaphore.WaitAsync();
+
+                    var recipeHarvesters = shellScope.ServiceProvider.GetRequiredService<IEnumerable<IRecipeHarvester>>();
+                    var recipeCollections = await recipeHarvesters
+                        .AwaitEachAsync(harvester => harvester.HarvestRecipesAsync());
+                    var recipe = recipeCollections
+                        .SelectMany(recipeCollection => recipeCollection)
+                        .SingleOrDefault(recipeDescriptor => recipeDescriptor.Name == recipeName);
+
+                    if (recipe == null)
+                    {
+                        throw new RecipeNotFoundException($"{recipeName} not found!");
+                    }
 
-                // Logic copied from OrchardCore.Recipes.Controllers.AdminController.
-                var executionId = Guid.NewGuid().ToString("n");
+                    // Logic copied from OrchardCore.Recipes.Controllers.AdminController.
+                    var executionId = Guid.NewGuid().ToString("n");
 
-                var environment = new Dictionary<string, object>();
-                var logger = shellScope.ServiceProvider.GetRequiredService<ILogger<ExecuteRecipeShortcut>>();
-                var recipeEnvironmentProviders = shellScope.ServiceProvider
-                    .GetRequiredService<IEnumerable<IRecipeEnvironmentProvider>>();
-                await recipeEnvironmentProviders
-                    .OrderBy(environmentProvider => environmentProvider.Order)
-                    .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, logger);
+                    var environment = new Dictionary<string, object>();
+                    var logger = shellScope.ServiceProvider.GetRequiredService<ILogger<ExecuteRecipeShortcut>>();
+                    var recipeEnvironmentProviders = shellScope.ServiceProvider
+                        .GetRequiredService<IEnumerable<IRecipeEnvironmentProvider>>();
+                    await recipeEnvironmentProviders
+                        .OrderBy(environmentProvider => environmentProvider.Order)
+                        .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, logger);
 
-                var recipeExecutor = shellScope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
-                await recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
+                    var recipeExecutor = shellScope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
+                    await recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
+                }
+                finally
+                {
+                    _recipeHarvesterSemaphore.Release();
+                }
             },
             tenant,
             activateShell);

From 91aa9f32570d38d29800b774e5eb59c5df56a907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Wed, 21 Sep 2022 22:29:36 +0200
Subject: [PATCH 40/53] Adding IServiceProviderInstance to fake HttpContext

---
 .../Extensions/IWebApplicationInstanceExtensions.cs         | 6 +++++-
 Lombiq.Tests.UI/Services/IWebApplicationInstance.cs         | 6 ++++++
 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs             | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
index 3c59190fc..b58d006fc 100644
--- a/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/IWebApplicationInstanceExtensions.cs
@@ -28,7 +28,11 @@ public static async Task UsingScopeAsync(
         var features = new FeatureCollection();
         features.Set(new RecipeEnvironmentFeature());
 
-        var httpContext = new DefaultHttpContext(features);
+        var httpContext = new DefaultHttpContext(features)
+        {
+            RequestServices = instance.Services,
+        };
+
         httpContextAccessor.HttpContext = httpContext;
 
         try
diff --git a/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs b/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
index 369be046d..7d980e33f 100644
--- a/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
+++ b/Lombiq.Tests.UI/Services/IWebApplicationInstance.cs
@@ -10,6 +10,12 @@ namespace Lombiq.Tests.UI.Services;
 /// </summary>
 public interface IWebApplicationInstance : IAsyncDisposable
 {
+    /// <summary>
+    /// Gets the <see cref="IServiceProvider"/> created by the server associated with this
+    /// <see cref="IWebApplicationInstance"/>.
+    /// </summary>
+    IServiceProvider Services { get; }
+
     /// <summary>
     /// Launches the web application.
     /// </summary>
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index cff79c35e..d72ef0746 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -72,6 +72,8 @@ public OrchardCoreInstance(OrchardCoreConfiguration configuration, string contex
         _testOutputHelper = testOutputHelper;
     }
 
+    public IServiceProvider Services => _orchardApplication?.Services;
+
     public async Task<Uri> StartUpAsync()
     {
         var port = await OrchardCoreInstanceCounter.PortLeases.LeaseAvailableRandomPortAsync();

From b2571ac6cc2f9eb91a44da733e16fe9b4f0ec5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 26 Sep 2022 22:13:48 +0200
Subject: [PATCH 41/53] Trying to avoid adding razor runtime view compilation

---
 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
index d72ef0746..d2cc957c6 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
@@ -176,6 +176,10 @@ private async Task StartOrchardAppAsync()
         await _configuration.BeforeAppStart
             .InvokeAsync<BeforeAppStartHandler>(handler => handler(_contentRootPath, arguments));
 
+        // This is to avoid adding Razor runtime view compilation.
+        DirectoryHelper.SafelyDeleteDirectoryIfExists(
+            Path.Combine(Path.GetDirectoryName(typeof(OrchardCoreInstance<>).Assembly.Location), "refs"), 60);
+
         _orchardApplication = new OrchardApplicationFactory<TEntryPoint>(
             builder => builder
                 .UseContentRoot(_contentRootPath)

From 25a3aa7cf497f65af39795ea67c6776405571278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Mon, 26 Sep 2022 22:58:46 +0200
Subject: [PATCH 42/53] Updating docs

---
 Lombiq.Tests.UI/Docs/Migration.md               | 12 +-----------
 Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md |  3 +--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 6556b262b..177afde14 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -6,17 +6,7 @@
 
 1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
 2. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
-3. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test. See: [PreserveCompilationContext](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#preservecompilationcontext) and [PreserveCompilationContext not configured by default](https://learn.microsoft.com/en-us/dotnet/core/compatibility/aspnet-core/6.0/preservecompilationcontext-not-set-by-default) for more details.
-
-```diff
-    <TargetFramework>net6.0</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <RazorRuntimeCompilation>false</RazorRuntimeCompilation>
-+     <PreserveCompilationContext>true</PreserveCompilationContext>
-  </PropertyGroup>
-```
-
-4. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
+3. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
 
 ```diff
 using Microsoft.AspNetCore.Builder;
diff --git a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
index e4e8779ab..b9bf7493a 100644
--- a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
+++ b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
@@ -7,8 +7,7 @@ Tips on making specific features testable are under the ["Creating tests" page](
 - Create recipes with test content, and import them by starting with a UI testing-specific setup recipe. While you can run tests from an existing database, using recipes to create a test environment (that almost entirely doubles as a development environment) is more reliable. Keep in mind, that the data you test shouldn't change randomly, you can't assert on data coming from the export of a production app which is updated all the time. Using [Auto Setup](https://docs.orchardcore.net/en/dev/docs/reference/modules/AutoSetup/) works too, just check out the [samples project](../../Lombiq.Tests.UI.Samples/Readme.md).
 - In your web project do the following:
   1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
-  2. Add `<PreserveCompilationContext>true</PreserveCompilationContext>` configuration to web app under test. See: [PreserveCompilationContext](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#preservecompilationcontext) and [PreserveCompilationContext not configured by default](https://learn.microsoft.com/en-us/dotnet/core/compatibility/aspnet-core/6.0/preservecompilationcontext-not-set-by-default) for more details.
-  3. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
+  2. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
 
         ```csharp
         ...

From 0e7fdce99cfb1bbe06c77ec75b5a44c307c1cbc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 09:59:56 +0200
Subject: [PATCH 43/53] Update Lombiq.Tests.UI/Docs/Migration.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/Migration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 177afde14..c6169fd4f 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -4,8 +4,8 @@
 
 ### Preparing WebApplication
 
-1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
-2. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app under test.
+1. Prepare the web app to be tested as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
+2. Remove `Lombiq.Tests.UI.AppExtensions` project reference or NuGet package from the web app.
 3. Add `Microsoft.Extensions.Configuration.ConfigurationManager` instance directly to `WebApplicationBuilder.Services`.
 
 ```diff

From f8ed3d82eb144f87804d11a60f71f15986b98320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 10:00:13 +0200
Subject: [PATCH 44/53] Update Lombiq.Tests.UI/Docs/Migration.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/Migration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index c6169fd4f..37262e06c 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -28,7 +28,7 @@ app.UseStaticFiles();
 app.UseOrchardCore();
 app.Run();
 
-+ // As described here(https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?view=aspnetcore-6.0).
++ // As described here (https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?view=aspnetcore-6.0).
 + #pragma warning disable CA1050
 + public partial class Program
 + #pragma warning restore CA1050

From 7bff85afdcc83954c05a1395d15eb088b4f71049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 10:00:24 +0200
Subject: [PATCH 45/53] Update Lombiq.Tests.UI/Docs/Migration.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/Migration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 37262e06c..949c99cd3 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -42,7 +42,7 @@ app.Run();
 
 ### Preparing UI test project
 
-1. Add the web app project under test as a `Project reference` to UI test project.
+1. Add a _project reference_ of the web app to be tested to the UI test project.
 
 ```diff
   </ItemGroup>

From af768a3c5f9023b7f295af359a64118233bb5b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 10:00:43 +0200
Subject: [PATCH 46/53] Update Lombiq.Tests.UI/Docs/Migration.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/Migration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index 949c99cd3..b2e6559dd 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -89,7 +89,7 @@ There is a breaking change in adding command line arguments to the WebApplicatio
 
 #### `Lombiq.Tests.UI.Extensions.ShortcutsUITestContextExtensions`
 
-The following extension methods result in the same and no breaking change in the signatures, but they behave a bit differently. Using `WebApplicationFactory` opened the possibility to use OC services directly instead of using `Controller Actions` invoked by browser navigation.
+The following extension methods behave largely the same and their signatures didn't change. Using `WebApplicationFactory` made it possible to use OC services directly instead of using _controller actions_ invoked via browser navigation.
 
 This means that calling the extension methods below no longer results in browser navigation.
 

From 5bda8a087f8db9a0a47eb8063d0b0dd6dd6d3ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 10:01:01 +0200
Subject: [PATCH 47/53] Update Lombiq.Tests.UI/Docs/Migration.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/Migration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index b2e6559dd..e72347f63 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -91,7 +91,7 @@ There is a breaking change in adding command line arguments to the WebApplicatio
 
 The following extension methods behave largely the same and their signatures didn't change. Using `WebApplicationFactory` made it possible to use OC services directly instead of using _controller actions_ invoked via browser navigation.
 
-This means that calling the extension methods below no longer results in browser navigation.
+This means that calling the extension methods below don't cause browser navigation any more.
 
 - `SetUserRegistrationTypeAsync`
 - `CreateUserAsync`

From d154b4cc633926af0aa5100ca9420a3309f4670a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 10:01:29 +0200
Subject: [PATCH 48/53] Update Lombiq.Tests.UI/Docs/Migration.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/Migration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index e72347f63..e76739d59 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -115,6 +115,6 @@ _Here is a sample for better understanding_:
     }
 ```
 
-The original code with the new behavior resulted in a failing test, because the browser pointed to the `Home page` before `await context.EnablePrivacyConsentBannerFeatureAsync()(=> context.EnableFeatureDirectlyAsync({featureId})`, the `context.EnableFeatureDirectlyAsync` not navigates away, so finaly the `await context.GoToHomePageAsync()` call do nothing and the consent banner din't come up.
+The original code with the new behavior failed a test, because the browser pointed to the _Home page_ before `await context.EnablePrivacyConsentBannerFeatureAsync()(=> context.EnableFeatureDirectlyAsync({featureId})`. So the `context.EnableFeatureDirectlyAsync` doesn't navigate away, the `await context.GoToHomePageAsync()` call does nothing, and the consent banner doesn't come up.
 
 The solution, in this case, is to call `await context.GoToHomePageAsync(onlyIfNotAlreadyThere: false)`, this result a reload, and the consent banner come up.

From 0962edd38ce06f77708e1db5820e5223ec33cec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 10:01:46 +0200
Subject: [PATCH 49/53] Update Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dávid El-Saig <david.el-saig@lombiq.com>
---
 Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
index b9bf7493a..06836cd4d 100644
--- a/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
+++ b/Lombiq.Tests.UI/Docs/TestableOrchardCoreApps.md
@@ -6,7 +6,7 @@ Tips on making specific features testable are under the ["Creating tests" page](
 
 - Create recipes with test content, and import them by starting with a UI testing-specific setup recipe. While you can run tests from an existing database, using recipes to create a test environment (that almost entirely doubles as a development environment) is more reliable. Keep in mind, that the data you test shouldn't change randomly, you can't assert on data coming from the export of a production app which is updated all the time. Using [Auto Setup](https://docs.orchardcore.net/en/dev/docs/reference/modules/AutoSetup/) works too, just check out the [samples project](../../Lombiq.Tests.UI.Samples/Readme.md).
 - In your web project do the following:
-  1. Prepare the web app uneder test as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
+  1. Prepare the web app to be testes as described in [Basic tests with the default WebApplicationFactory](https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?source=recommendations&view=aspnetcore-6.0#basic-tests-with-the-default-webapplicationfactory).
   2. Allow configuration of the app when launched for testing with the following piece of code in the app's `Program` class:
 
         ```csharp

From 33e252f00966044803cf2d91928e44d625afa44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 18:05:06 +0200
Subject: [PATCH 50/53] Updating docs Adding comments Adding
 InstanceCommandLineArgumentsBuilder.Add with Obsolate attribute

---
 Lombiq.Tests.UI/Docs/Migration.md                 | 12 +++++++-----
 .../VisualVerificationUITestContextExtensions.cs  | 12 +++++++-----
 Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs | 15 ++++++---------
 .../OrchardApplicationFactory.cs                  |  4 ++--
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/Lombiq.Tests.UI/Docs/Migration.md b/Lombiq.Tests.UI/Docs/Migration.md
index e76739d59..1b711a6c8 100644
--- a/Lombiq.Tests.UI/Docs/Migration.md
+++ b/Lombiq.Tests.UI/Docs/Migration.md
@@ -19,7 +19,7 @@ builder.Host.UseNLogHost();
 var configuration = builder.Configuration;
 
 - builder.Services.AddOrchardCms(orchard => orchard.ConfigureUITesting(configuration, enableShortcutsDuringUITesting: true));
-+ builder.Services.Add(new ServiceDescriptor(configuration.GetType(), configuration));
++ builder.Services.AddSingleton(configuration);
 + builder.Services.AddOrchardCms();
 
 var app = builder.Build();
@@ -28,10 +28,11 @@ app.UseStaticFiles();
 app.UseOrchardCore();
 app.Run();
 
-+ // As described here (https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?view=aspnetcore-6.0).
-+ #pragma warning disable CA1050
++ [SuppressMessage(
++     "Design",
++     "CA1050: Declare types in namespaces",
++     Justification = "As described here(https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests?view=aspnetcore-6.0).")]
 + public partial class Program
-+ #pragma warning restore CA1050
 + {
 +     protected Program()
 +     {
@@ -103,7 +104,8 @@ This means that calling the extension methods below don't cause browser navigati
 - `SelectThemeAsync`
 - `GenerateHttpEventUrlAsync`
 
-_Here is a sample for better understanding_:
+##### Here is a sample for better understanding:
+
 ```diff
     public static async Task EnablePrivacyConsentBannerFeatureAndAcceptPrivacyConsentAsync(this UITestContext context)
     {
diff --git a/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs b/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
index 2d5959429..033410577 100644
--- a/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
+++ b/Lombiq.Tests.UI/Extensions/VisualVerificationUITestContextExtensions.cs
@@ -292,7 +292,7 @@ private static void AssertVisualVerificationApproved(
         var approvedContext = new VisualVerificationMatchApprovedContext
         {
             ModuleName = testFrame.GetModuleName(),
-            MethodName = testFrame.GetMethodeName(),
+            MethodName = testFrame.GetMethodName(),
             BrowserName = context.Driver.As<IHasCapabilities>().Capabilities.GetCapability("browserName") as string,
         };
 
@@ -670,13 +670,15 @@ private static string GetModuleName(this EnhancedStackFrame frame)
         return moduleName;
     }
 
-    private static string GetMethodeName(this EnhancedStackFrame frame)
+    // Retrieves the method name. Removes the decoration in case of if it inherited from a base class but not overridden.
+    // Because of the inheritance, the method name gets some decoration in stack trace.
+    private static string GetMethodName(this EnhancedStackFrame frame)
     {
         var methodName = frame.MethodInfo.Name;
-        var inheriteedMethod = new Regex("^<(?<method>.*)>.*$", RegexOptions.ExplicitCapture);
-        if (inheriteedMethod.IsMatch(methodName))
+        var inheritedMethod = new Regex("^<(?<method>.*)>.*$", RegexOptions.ExplicitCapture);
+        if (inheritedMethod.IsMatch(methodName))
         {
-            methodName = inheriteedMethod.Match(methodName).Groups["method"].Value;
+            methodName = inheritedMethod.Match(methodName).Groups["method"].Value;
         }
 
         return methodName;
diff --git a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
index 3e05a3431..44cb6052c 100644
--- a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
+++ b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace Lombiq.Tests.UI.Models;
@@ -15,20 +16,16 @@ public InstanceCommandLineArgumentsBuilder AddSwitch(string argument)
 
     public InstanceCommandLineArgumentsBuilder AddWithValue<T>(string key, T value)
     {
-        _arguments.Add($"{PrepareArg(key)}={value}");
+        _arguments.Add(FormattableString.Invariant($"{PrepareArg(key)}={value}"));
 
         return this;
     }
 
-    private static string PrepareArg(string argument)
-    {
-        if (!argument.StartsWith("--", System.StringComparison.InvariantCultureIgnoreCase))
-        {
-            return $"--{argument}";
-        }
+    [Obsolete("Use AddSwitch or AddWithValue instead.")]
+    public InstanceCommandLineArgumentsBuilder Add(string value) => throw new NotSupportedException();
 
-        return argument;
-    }
+    private static string PrepareArg(string argument)
+        => $"--{argument.TrimStart('-')}";
 
     public IEnumerable<string> Arguments => _arguments;
 }
diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 9de778968..05f333a0a 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -34,7 +34,7 @@ public OrchardApplicationFactory(
         _configureOrchard = configureOrchard;
     }
 
-    public string BaseAddress => ClientOptions.BaseAddress.ToString();
+    public Uri BaseAddress => ClientOptions.BaseAddress;
 
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
@@ -65,7 +65,7 @@ .ImplementationInstance as OrchardCoreBuilder
                 .LastOrDefault(descriptor => descriptor.ServiceType == typeof(ConfigurationManager))?
                 .ImplementationInstance as ConfigurationManager
                 ?? throw new InvalidOperationException(
-                    "Pease add ConfigurationManager instance to WebApplicationBuilder.Services in your Program.cs!");
+                    $"Pease add {nameof(ConfigurationManager)} instance to WebApplicationBuilder.Services in your Program.cs!");
 
         _configureOrchard?.Invoke(configuration, builder);
 

From a87ade60211a833f2089d4788ab2933a79caef8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= <jozsef.horvath@lombiq.com>
Date: Thu, 29 Sep 2022 19:39:40 +0200
Subject: [PATCH 51/53] Updating Lombiq.Tests Nuget package version

---
 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
index 2487db644..94ac995fb 100644
--- a/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+++ b/Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
@@ -88,7 +88,7 @@
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\src\Utilities\Lombiq.Npm.Targets\Lombiq.Npm.Targets.targets" />
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests" Version="2.0.1-alpha.osoe-46.0" />
+    <PackageReference Include="Lombiq.Tests" Version="2.0.1-alpha.osoe-46.1" />
     <PackageReference Include="Lombiq.HelpfulLibraries.Cli" Version="4.6.1-alpha.walma-15.1" />
     <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.6.1-alpha.walma-15.1" />
     <PackageReference Include="Lombiq.HelpfulLibraries.RestEase" Version="4.6.1-alpha.walma-15.1" />

From 62fb81e52c14386b5f572419b7510b8546650fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 14 Oct 2022 09:55:11 +0200
Subject: [PATCH 52/53] Update
 Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs

---
 Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
index 44cb6052c..170ea582c 100644
--- a/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
+++ b/Lombiq.Tests.UI/Models/InstanceCommandLineArgs.cs
@@ -24,8 +24,8 @@ public InstanceCommandLineArgumentsBuilder AddWithValue<T>(string key, T value)
     [Obsolete("Use AddSwitch or AddWithValue instead.")]
     public InstanceCommandLineArgumentsBuilder Add(string value) => throw new NotSupportedException();
 
-    private static string PrepareArg(string argument)
-        => $"--{argument.TrimStart('-')}";
+    private static string PrepareArg(string argument) =>
+        $"--{argument.TrimStart('-')}";
 
     public IEnumerable<string> Arguments => _arguments;
 }

From dc810d23ba18b2f373fdb26df54ff73160527094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 14 Oct 2022 09:55:49 +0200
Subject: [PATCH 53/53] Update
 Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs

---
 .../Services/OrchardCoreHosting/OrchardApplicationFactory.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
index 05f333a0a..d6a8b7248 100644
--- a/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
+++ b/Lombiq.Tests.UI/Services/OrchardCoreHosting/OrchardApplicationFactory.cs
@@ -60,12 +60,12 @@ private void ConfigureTestServices(IServiceCollection services)
                 .LastOrDefault(descriptor => descriptor.ServiceType == typeof(OrchardCoreBuilder))?
                 .ImplementationInstance as OrchardCoreBuilder
                 ?? throw new InvalidOperationException(
-                    "Pease call WebApplicationBuilder.Services.AddOrchardCms() in your Program.cs!");
+                    "Please call WebApplicationBuilder.Services.AddOrchardCms() in your Program.cs!");
         var configuration = services
                 .LastOrDefault(descriptor => descriptor.ServiceType == typeof(ConfigurationManager))?
                 .ImplementationInstance as ConfigurationManager
                 ?? throw new InvalidOperationException(
-                    $"Pease add {nameof(ConfigurationManager)} instance to WebApplicationBuilder.Services in your Program.cs!");
+                    $"Please add {nameof(ConfigurationManager)} instance to WebApplicationBuilder.Services in your Program.cs!");
 
         _configureOrchard?.Invoke(configuration, builder);