Merge pull request #127 from Lombiq/issue/NEST-501

NEST-501: Improving UI test
Lombiq · Jul 18, 2024 · de8b8a0 · de8b8a0
2 parents 92b7261 + 7862c08
commit de8b8a0
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/...EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj b/...EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
   </ItemGroup>
 
 </Project>
diff --git a/...nants.EnvironmentRobots.Tests.UI/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj b/...nants.EnvironmentRobots.Tests.UI/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-        <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+        <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...sting.Tenants.FeaturesGuard.Tests.UI/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj b/...sting.Tenants.FeaturesGuard.Tests.UI/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
   </ItemGroup>
 
 </Project>
diff --git a/...osting.Tenants.IdleTenantManagement.Tests.UI/Extensions/IdleTenantManagementExtensions.cs b/...osting.Tenants.IdleTenantManagement.Tests.UI/Extensions/IdleTenantManagementExtensions.cs
@@ -1,16 +1,15 @@
 using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.Services;
 using Shouldly;
-using System;
 using System.Threading.Tasks;
 using static Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.Constants.IdleTenantData;
 
 namespace Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.Extensions;
 
 public static class IdleTenantManagementExtensions
 {
-    public static void SetMaxIdleMinutesAndLoggingForUITest(
-        this OrchardCoreUITestExecutorConfiguration configuration) => configuration.OrchardCoreConfiguration.BeforeAppStart +=
+    public static void SetMaxIdleMinutesAndLoggingForUITest(this OrchardCoreUITestExecutorConfiguration configuration) =>
+        configuration.OrchardCoreConfiguration.BeforeAppStart +=
             (_, argumentsBuilder) =>
             {
                 argumentsBuilder
@@ -24,8 +23,7 @@ public static void SetMaxIdleMinutesAndLoggingForUITest(
                 return Task.CompletedTask;
             };
 
-    public static readonly Func<IWebApplicationInstance, Task> AssertAppLogsWithIdleCheckAsync =
-        async webApplicationInstance =>
+    public static async Task AssertAppLogsWithIdleCheckAsync(this IWebApplicationInstance webApplicationInstance) =>
             (await webApplicationInstance.GetLogOutputAsync())
             .ShouldContain($"Shutting down tenant \"{IdleTenantName}\" because of idle timeout.");
 }
diff --git a/...sting.Tenants.IdleTenantManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/...sting.Tenants.IdleTenantManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -36,5 +36,8 @@ await context.GoToSetupPageAndSetupOrchardCoreAsync(
         // working as intended.
         await context.SignInDirectlyAsync();
         await context.GoToDashboardAsync();
+
+        // Make sure the shutdown message is in the logs.
+        await context.Application.AssertAppLogsWithIdleCheckAsync();
     }
 }
diff --git a/...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj b/...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...q.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj b/...q.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.Hosting.Tenants.Management.Tests.UI/Lombiq.Hosting.Tenants.Management.Tests.UI.csproj b/Lombiq.Hosting.Tenants.Management.Tests.UI/Lombiq.Hosting.Tenants.Management.Tests.UI.csproj
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-        <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+        <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...aStorageManagement.Tests.UI/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj b/...aStorageManagement.Tests.UI/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.0.nest-501" />
   </ItemGroup>
 
 </Project>