SAVEPOINT

fluentassertions · Jan 14, 2023 · 373da79 · 373da79
1 parent 3d60b71
commit 373da79
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Src/FluentAssertions/AsyncAssertionsExtensions.cs b/Src/FluentAssertions/AsyncAssertionsExtensions.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using FluentAssertions.Execution;
 using FluentAssertions.Specialized;
 
 namespace FluentAssertions;
@@ -18,22 +19,20 @@ public static class AsyncAssertionsExtensions
     /// <param name="becauseArgs">
     /// Zero or more objects to format using the placeholders in <paramref name="because"/>.
     /// </param>
-    public static Task<AndWhichConstraint<GenericAsyncFunctionAssertions<T>, T>> WithResult<T>(
+    public static async Task<AndWhichConstraint<GenericAsyncFunctionAssertions<T>, T>> WithResult<T>(
         this Task<AndWhichConstraint<GenericAsyncFunctionAssertions<T>, T>> task,
         T expected, string because = "", params object[] becauseArgs)
     {
-        if (!task.IsCompleted) // TODO Diese Task ist nicht die richtige...
+        if (AssertionScope.Current.HasFailures())
         {
-            // The task is not completed, this means the previous assertion was failed.
-            // There is no result which can be checked.
-            return task;
+            return null;
         }
 
-        var andWhichConstraint = task.Result;
+        var andWhichConstraint = await task;
         var subject = andWhichConstraint.Subject;
         subject.Should().Be(expected, because, becauseArgs);
 
-        return task;
+        return andWhichConstraint;
     }
 
     /// <summary>