Nested AssertionScopes do not print inner scope reportables (#2044)

fluentassertions · Dec 17, 2022 · 9e0a2e9 · 9e0a2e9
1 parent 3999d05
commit 9e0a2e9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/Src/FluentAssertions/Execution/AssertionScope.cs b/Src/FluentAssertions/Execution/AssertionScope.cs
@@ -395,6 +395,7 @@ public void Dispose()
                 parent.assertionStrategy.HandleFailure(failureMessage);
             }
 
+            parent.contextData.Add(contextData);
             parent.AppendTracing(tracing.ToString());
 
             parent = null;

diff --git a/Tests/FluentAssertions.Specs/Collections/CollectionAssertionSpecs.BeEquivalentTo.cs b/Tests/FluentAssertions.Specs/Collections/CollectionAssertionSpecs.BeEquivalentTo.cs
@@ -300,17 +300,18 @@ public void When_asserting_collections_not_to_be_equivalent_with_options_but_sub
         {
             // Arrange
             int[] actual = null;
+            int[] expectation = new[] { 1, 2, 3 };
 
             // Act
             Action act = () =>
             {
                 using var _ = new AssertionScope();
-                actual.Should().NotBeEquivalentTo(new[] { 1, 2, 3 }, opt => opt, "we want to test the failure {0}", "message");
+                actual.Should().NotBeEquivalentTo(expectation, opt => opt, "we want to test the failure {0}", "message");
             };
 
             // Assert
             act.Should().Throw<XunitException>()
-                .WithMessage("Expected actual not to be equivalent *failure message*, but found <null>.");
+                .WithMessage("Expected actual not to be equivalent *failure message*, but found <null>.*");
         }
 
         [Fact]

diff --git a/Tests/FluentAssertions.Specs/Execution/AssertionScopeSpecs.cs b/Tests/FluentAssertions.Specs/Execution/AssertionScopeSpecs.cs
@@ -235,6 +235,24 @@ public void When_using_a_custom_strategy_it_should_include_failure_messages_of_a
                 .WithMessage("*but found false*but found true*");
         }
 
+        [Fact]
+        public void When_nested_scope_is_disposed_it_passes_reports_to_parent_scope()
+        {
+            // Arrange/Act
+            using (var outerScope = new AssertionScope())
+            {
+                outerScope.AddReportable("outerReportable", "foo"); 
+
+                using (var innerScope = new AssertionScope())
+                {
+                    innerScope.AddReportable("innerReportable", "bar");
+                }
+
+                // Assert
+                outerScope.Get<string>("innerReportable").Should().Be("bar");
+            }
+        }
+
         public class CustomAssertionStrategy : IAssertionStrategy
         {
             private readonly List<string> failureMessages = new();

diff --git a/docs/_pages/releases.md b/docs/_pages/releases.md
@@ -17,6 +17,7 @@ sidebar:
 
 ### Fixes
 * Quering properties on classes, e.g. `typeof(MyClass).Properties()`, now also includes static properties - [#2054](https://github.com/fluentassertions/fluentassertions/pull/2054)
+* Nested AssertionScopes now print the inner scope reportables - [#2044](https://github.com/fluentassertions/fluentassertions/pull/2044)
 
 ## 6.8.0