From 6cc46836df599895199c653d4ee32a61e9e5e918 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Tue, 3 Sep 2024 22:12:02 +0300
Subject: [PATCH] fix

---
 .../Tests/DoAfter/DoAfterCancellationTests.cs            | 9 +++++++++
 .../Tests/Interaction/InteractionTest.Helpers.cs         | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
index f3c7890235..6cec4cf30a 100644
--- a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
+++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
@@ -69,6 +69,15 @@ public async Task CancelTilePry()
     {
         await SetTile(Floor);
         await Interact(Pry, awaitDoAfters: false);
+
+        // WD EDIT START
+        if (!ActiveDoAfters.Any())
+        {
+            await AssertTile(Plating);
+            return;
+        }
+        // WD EDIT END
+
         await CancelDoAfters();
         await AssertTile(Floor);
 
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index a786250d5b..480fd9cde6 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -369,11 +369,14 @@ protected async Task AwaitDoAfters(bool shouldSucceed = true, int maxExpected =
     /// Cancel any currently active DoAfters. Default arguments are such that it also checks that there is at least one
     /// active DoAfter to cancel.
     /// </summary>
-    protected async Task CancelDoAfters(int minExpected = 0, int maxExpected = 1)
+    protected async Task CancelDoAfters(int minExpected = 1, int maxExpected = 1)
     {
         Assert.That(ActiveDoAfters.Count(), Is.GreaterThanOrEqualTo(minExpected));
         Assert.That(ActiveDoAfters.Count(), Is.LessThanOrEqualTo(maxExpected));
 
+        if (!ActiveDoAfters.Any())
+            return;
+
         // Cancel all the do-afters
         var doAfters = ActiveDoAfters.ToList();
         await Server.WaitPost(() =>