Merge pull request #633 from Lombiq/issue/OSOE-727

OSOE-727: SignInDirectly randomly fails with 404 in Lombiq.UITestingToolbox
Lombiq · Dec 5, 2023 · bcf02fc · bcf02fc
2 parents 11390a5 + e97db82
commit bcf02fc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs
@@ -1,4 +1,5 @@
 using Lombiq.Hosting.Tenants.Maintenance.Tests.UI.Extensions;
+using Lombiq.OSOCE.NuGet.Tests.UI.Helpers;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
@@ -12,9 +13,18 @@ public BehaviorMaintenanceTests(ITestOutputHelper testOutputHelper)
     {
     }
 
+    // This test uses ExecuteTestAsync with a different setup delegate instead of ExecuteTestAfterSetupAsync because the
+    // maintenance does changes to the DB on startup only necessary for this test (like depersonalizing user accounts).
+    // This would occasionally lead to failures in subsequent tests if this was the first test to run and thus create
+    // the DB snapshot after running the setup.
     [Fact]
     public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully() =>
-        ExecuteTestAfterSetupAsync(
+        ExecuteTestAsync(
             context => context.ChangeUserSensitiveContentMaintenanceExecutionAsync(),
+            async context =>
+            {
+                var homepageUri = await SetupHelpers.RunSetupAsync(context);
+                return homepageUri;
+            },
             configuration => configuration.ChangeUserSensitiveContentMaintenanceConfiguration());
 }
diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs
@@ -1,4 +1,5 @@
 using Lombiq.Hosting.Tenants.Maintenance.Tests.UI.Extensions;
+using Lombiq.Tests.UI.Samples.Helpers;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
@@ -24,9 +25,18 @@ public Task AddSiteOwnerPermissionToRoleMaintenanceTaskShouldBeExecutedSuccessfu
             context => context.TestSiteOwnerPermissionToRoleMaintenanceExecutionAsync(),
             configuration => configuration.SetAddSiteOwnerPermissionToRoleMaintenanceConfiguration());
 
+    // This test uses ExecuteTestAsync with a different setup delegate instead of ExecuteTestAfterSetupAsync because the
+    // maintenance does changes to the DB on startup only necessary for this test (like depersonalizing user accounts).
+    // This would occasionally lead to failures in subsequent tests if this was the first test to run and thus create
+    // the DB snapshot after running the setup.
     [Fact]
     public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully() =>
-        ExecuteTestAfterSetupAsync(
+        ExecuteTestAsync(
             context => context.ChangeUserSensitiveContentMaintenanceExecutionAsync(),
+            async context =>
+            {
+                var homepageUri = await SetupHelpers.RunSetupAsync(context);
+                return homepageUri;
+            },
             configuration => configuration.ChangeUserSensitiveContentMaintenanceConfiguration());
 }