Merge pull request #1953 from whymatter/issue-1952

Make For/Excluding work with nested paths
fluentassertions · Jul 7, 2022 · c1283b7 · c1283b7
2 parents 59e96d4 + 24641f6
commit c1283b7
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 1 deletion.
diff --git a/Src/FluentAssertions/Common/MemberPath.cs b/Src/FluentAssertions/Common/MemberPath.cs
@@ -81,7 +81,7 @@ private bool IsChildOf(MemberPath candidate)
     public MemberPath AsParentCollectionOf(MemberPath nextPath)
     {
         var extendedDottedPath = dottedPath.Combine(nextPath.dottedPath, "[]");
-        return new MemberPath(declaringType, nextPath.reflectedType, extendedDottedPath);
+        return new MemberPath(nextPath.reflectedType, nextPath.declaringType, extendedDottedPath);
     }
 
     /// <summary>

diff --git a/Tests/FluentAssertions.Equivalency.Specs/CollectionSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/CollectionSpecs.cs
@@ -765,6 +765,105 @@ public void When_property_in_collection_in_collection_is_excluded_it_should_not_
             );
         }
 
+        [Fact]
+        public void When_property_in_object_in_collection_is_excluded_it_should_not_throw()
+        {
+            // Arrange
+            var subject = new
+            {
+                Collection = new[]
+                {
+                    new
+                    {
+                        Level = new
+                        {
+                            Text = "Actual"
+                        }
+                    }
+                }
+            };
+
+            var expected = new
+            {
+                Collection = new[]
+                {
+                    new
+                    {
+                        Level = new
+                        {
+                            Text = "Expected"
+                        }
+                    }
+                }
+            };
+
+            // Act / Assert
+            subject.Should().BeEquivalentTo(expected,
+                options => options
+                    .For(x => x.Collection)
+                    .Exclude(x => x.Level.Text)
+            );
+        }
+
+        [Fact]
+        public void When_property_in_object_in_collection_in_object_in_collection_is_excluded_it_should_not_throw()
+        {
+            // Arrange
+            var subject = new
+            {
+                Collection = new[]
+                {
+                    new
+                    {
+                        Level = new
+                        {
+                            Collection = new[]
+                            {
+                                new
+                                {
+                                    Level = new
+                                    {
+                                        Text = "Actual"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var expected = new
+            {
+                Collection = new[]
+                {
+                    new
+                    {
+                        Level = new
+                        {
+                            Collection = new[]
+                            {
+                                new
+                                {
+                                    Level = new
+                                    {
+                                        Text = "Expected"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            // Act / Assert
+            subject.Should().BeEquivalentTo(expected,
+                options => options
+                    .For(x => x.Collection)
+                    .For(x => x.Level.Collection)
+                    .Exclude(x => x.Level)
+            );
+        }
+
         [Fact]
         public void A_nested_exclusion_can_be_followed_by_a_root_level_exclusion()
         {

diff --git a/docs/_pages/releases.md b/docs/_pages/releases.md
@@ -7,6 +7,13 @@ sidebar:
   nav: "sidebar"
 ---
 
+## Unreleased
+
+### What's new
+
+### Fixes
+* Fix `For`/`Exclude` not excluding properties in objects in a collection - [#1953](https://github.com/fluentassertions/fluentassertions/pull/1953)
+
 ## 6.7.0
 
 ### What's new