fixup! fix(cdk/testing): fix webdriver zone support

angular · Mar 31, 2021 · 67a0200 · 67a0200
1 parent 80e384a
commit 67a0200
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/cdk/testing/tests/BUILD.bazel b/src/cdk/testing/tests/BUILD.bazel
@@ -87,13 +87,13 @@ ts_library(
     testonly = 1,
     srcs = ["webdriver.e2e.spec.ts"],
     deps = [
+        ":cross_environment_specs",
+        ":test_harnesses",
+        "//src/cdk/testing",
+        "//src/cdk/testing/webdriver",
         "@npm//@types/jasmine",
         "@npm//@types/node",
         "@npm//@types/selenium-webdriver",
-        "//src/cdk/testing",
-        "//src/cdk/testing/webdriver",
-        ":test_harnesses",
-        ":cross_environment_specs",
     ],
 )
 

diff --git a/tools/public_api_guard/cdk/testing/webdriver.d.ts b/tools/public_api_guard/cdk/testing/webdriver.d.ts
@@ -1,5 +1,6 @@
 export declare class WebDriverElement implements TestElement {
-    constructor(_webElement: () => webdriver.WebElement);
+    readonly element: () => webdriver.WebElement;
+    constructor(element: () => webdriver.WebElement, _stabilize: () => Promise<void>);
     blur(): Promise<void>;
     clear(): Promise<void>;
     click(...args: [ModifierKeys?] | ['center', ModifierKeys?] | [
@@ -31,12 +32,17 @@ export declare class WebDriverElement implements TestElement {
 }
 
 export declare class WebDriverHarnessEnvironment extends HarnessEnvironment<() => webdriver.WebElement> {
-    protected constructor(rawRootElement: () => webdriver.WebElement);
+    protected constructor(rawRootElement: () => webdriver.WebElement, options?: WebDriverHarnessEnvironmentOptions);
     protected createEnvironment(element: () => webdriver.WebElement): HarnessEnvironment<() => webdriver.WebElement>;
     protected createTestElement(element: () => webdriver.WebElement): TestElement;
     forceStabilize(): Promise<void>;
     protected getAllRawElements(selector: string): Promise<(() => webdriver.WebElement)[]>;
     protected getDocumentRoot(): () => webdriver.WebElement;
     waitForTasksOutsideAngular(): Promise<void>;
-    static loader(driver: webdriver.WebDriver): HarnessLoader;
+    static getNativeElement(el: TestElement): webdriver.WebElement;
+    static loader(driver: webdriver.WebDriver, options?: WebDriverHarnessEnvironmentOptions): HarnessLoader;
+}
+
+export interface WebDriverHarnessEnvironmentOptions {
+    queryFn: (selector: string, root: () => webdriver.WebElement) => Promise<webdriver.WebElement[]>;
 }