Merge pull request #37 from Workiva/set-scope-to-body

CPLAT-15997 Scope Queries to the Body Element
Workiva · Nov 8, 2021 · 033034b · 033034b
2 parents e0c3562 + 5f67ba4
commit 033034b
Show file tree

Hide file tree

Showing 9 changed files with 193 additions and 109 deletions.
diff --git a/lib/src/react/render/render.dart b/lib/src/react/render/render.dart
@@ -165,7 +165,7 @@ RenderResult render(
 /// {@category Queries}
 @sealed
 class RenderResult extends ScopedQueries {
-  RenderResult._(this._jsRenderResult, this._renderedElement) : super(() => _jsRenderResult.container);
+  RenderResult._(this._jsRenderResult, this._renderedElement) : super(() => _jsRenderResult.baseElement);
 
   final JsRenderResult _jsRenderResult;
 

diff --git a/test/unit/dom/queries/by_label_text_test.dart b/test/unit/dom/queries/by_label_text_test.dart
@@ -88,7 +88,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('no form control was found associated to that label')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -105,7 +105,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('no form control was found associated to that label')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -121,7 +121,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('no form control was found associated to that label')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -138,7 +138,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('no form control was found associated to that label')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });

diff --git a/test/unit/dom/queries/by_role_test.dart b/test/unit/dom/queries/by_role_test.dart
@@ -106,7 +106,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "dialog"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -124,7 +124,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "dialog"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -141,7 +141,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "dialog"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -159,7 +159,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "dialog"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -202,7 +202,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "option"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -220,7 +220,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "option"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -237,7 +237,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "option"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -255,7 +255,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "option"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -498,7 +498,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "checkbox"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -516,7 +516,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "checkbox"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -533,7 +533,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "checkbox"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -551,7 +551,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "checkbox"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -699,7 +699,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "switch"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -717,7 +717,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "switch"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -734,7 +734,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "switch"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -752,7 +752,7 @@ void main() {
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Unable to find an accessible element with the role "switch"')),
                   hasToStringValue(contains('Here are the accessible roles:')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });

diff --git a/test/unit/dom/queries/by_testid_test.dart b/test/unit/dom/queries/by_testid_test.dart
@@ -66,7 +66,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="testId-2"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
 
@@ -76,7 +76,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -96,7 +96,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -116,7 +116,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="testId-2"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
 
@@ -154,7 +154,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="testId-2"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
 
@@ -164,7 +164,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -184,7 +184,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -201,7 +201,7 @@ void main() {
                 throwsA(allOf(
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="estid-2"]')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -223,7 +223,7 @@ void main() {
                 throwsA(allOf(
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="estid-2"]')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -245,7 +245,7 @@ void main() {
                 throwsA(allOf(
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="estid-2"]')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -290,7 +290,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="testId-3"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
 
@@ -300,7 +300,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -324,7 +324,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -344,7 +344,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="testId-3"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
 
@@ -386,7 +386,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="testId-2"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
 
@@ -396,7 +396,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -420,7 +420,7 @@ void main() {
               throwsA(allOf(
                 isA<TestingLibraryElementError>(),
                 hasToStringValue(contains('Unable to find an element by: [$defaultTestIdKey="fail"]')),
-                hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
               )));
         });
       });
@@ -437,7 +437,7 @@ void main() {
                 throwsA(allOf(
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="estid-2"]')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -461,7 +461,7 @@ void main() {
                 throwsA(allOf(
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="estid-2"]')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });
@@ -485,7 +485,7 @@ void main() {
                 throwsA(allOf(
                   isA<TestingLibraryElementError>(),
                   hasToStringValue(contains('Found multiple elements by: [$defaultTestIdKey="estid-2"]')),
-                  hasToStringValue(contains(rtl.prettyDOM(view.container))),
+                  hasToStringValue(contains(rtl.prettyDOM(view.baseElement))),
                 )));
           });
         });