Merge pull request #1482 from nerdfury/querywrapper-selector

Maintain QueryWrapper Selector
NancyFx · Mar 8, 2014 · b0654a0 · b0654a0
2 parents 08be470 + 3b3bcf2
commit b0654a0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/Nancy.Testing.Tests/QueryWrapperTests.cs b/src/Nancy.Testing.Tests/QueryWrapperTests.cs
@@ -12,13 +12,13 @@ public class QueryWrapperTests
         public void Should_use_cq_find_when_indexer_invoked()
         {
             // Given
-            var document = 
+            var document =
                 CQ.Create(@"<html><head></head><body><div id='testId' class='myClass'>Test</div></body></html>");
 
             var queryResult =
                 document.Find("#testId").FirstOrDefault();
 
-            var wrapper = 
+            var wrapper =
                 new QueryWrapper(document);
 
             // When
@@ -28,5 +28,25 @@ public void Should_use_cq_find_when_indexer_invoked()
             Assert.NotNull(result);
             Assert.Same(queryResult, result);
         }
+
+        [Fact]
+        public void Should_filter_selection_when_second_indexer_invoked()
+        {
+            // Given
+            var document =
+                CQ.Create(
+                    @"<html><head></head><body><table><tr><td></td><td></td></tr><tr><td></td><td></td></tr></body></html>");
+
+            var wrapper = new QueryWrapper(document);
+
+            var row = wrapper["tr:first"];
+
+            // When
+            var cells = row["td"];
+
+            // Then
+            Assert.NotNull(cells);
+            Assert.Equal(2, cells.Count());
+        }
     }
 }
diff --git a/src/Nancy.Testing/QueryWrapper.cs b/src/Nancy.Testing/QueryWrapper.cs
@@ -27,7 +27,13 @@ public QueryWrapper(CQ document)
         /// <returns>A <see cref="QueryWrapper"/> instance</returns>
         public QueryWrapper this[string selector]
         {
-            get { return new QueryWrapper(this.document[selector]); }
+            get
+            {
+                var newDocument = this.document.Selector == null
+                                      ? this.document
+                                      : new CQ(this.document.RenderSelection());
+                return new QueryWrapper(newDocument[selector]);
+            }
         }
 
         /// <summary>