move shared function to separate file

Author: annieyw

src/cdk/testing/dom-helpers.ts

@@ -0,0 +1,9 @@
+export function getTextWithExcludedElements(element: Element, excludeSelector: string) {
+  const clone = element.cloneNode(true) as Element;
+  const exclusions = clone.querySelectorAll(excludeSelector);
+  for (let i = 0; i < exclusions.length; i++) {
+    let child = exclusions[i];
+    child.parentNode?.removeChild(child);
+  }
+  return (clone.textContent || '').trim();
+}

src/cdk/testing/protractor/protractor-element.ts

@@ -8,12 +8,12 @@
 
 import {
   ElementDimensions,
-  getTextWithExcludedElements,
   ModifierKeys,
   TestElement,
   TestKey
 } from '@angular/cdk/testing';
 import {browser, ElementFinder, Key} from 'protractor';
+import {getTextWithExcludedElements} from '@angular/cdk/testing/dom-helpers';
 
 /** Maps the `TestKey` constants to Protractor's `Key` constants. */
 const keyMap = {
@@ -135,12 +135,11 @@ export class ProtractorElement implements TestElement {
     return this.element.sendKeys(...keys);
   }
 
-  async text(options?: {excludes?: string}): Promise<string> {
-    if (options?.excludes) {
-      return browser.executeScript(getTextWithExcludedElements, this.element, options.excludes);
-    } else {
-      return this.element.getText();
+  async text(options?: {exclude?: string}): Promise<string> {
+    if (options?.exclude) {
+      return browser.executeScript(getTextWithExcludedElements, this.element, options.excludes;
     }
+    return this.element.getText();
   }
 
   async getAttribute(name: string): Promise<string|null> {

src/cdk/testing/test-element.ts

@@ -106,7 +106,7 @@ export interface TestElement {
    * @param options Options that affect what text is included
    *   exclude: A selector for elements whose text should be excluded from the result.
    */
-  text(options?: {excludes?: string}): Promise<string>;
+  text(options?: {exclude?: string}): Promise<string>;
 
   /** Gets the value for the given attribute from the element. */
   getAttribute(name: string): Promise<string | null>;
@@ -132,13 +132,3 @@ export interface TestElement {
   /** Checks whether the element is focused. */
   isFocused(): Promise<boolean>;
 }
-
-export function getTextWithExcludedElements(element: Element, excludeSelector: string) {
-  const clone = element.cloneNode(true) as Element;
-  const exclusions = clone.querySelectorAll(excludeSelector);
-  for (let i = 0; i < exclusions.length; i++) {
-    let child = exclusions[i];
-    child.parentNode?.removeChild(child);
-  }
-  return (clone.textContent || '').trim();
-}

src/cdk/testing/testbed/unit-test-element.ts

@@ -9,7 +9,6 @@
 import * as keyCodes from '@angular/cdk/keycodes';
 import {
   ElementDimensions,
-  getTextWithExcludedElements,
   ModifierKeys,
   TestElement,
   TestKey
@@ -23,6 +22,7 @@ import {
   triggerFocus,
   typeInElement,
 } from './fake-events';
+import {getTextWithExcludedElements} from '@angular/cdk/testing/dom-helpers';
 
 /** Maps `TestKey` constants to the `keyCode` and `key` values used by native browser events. */
 const keyMap = {
@@ -132,13 +132,12 @@ export class UnitTestElement implements TestElement {
     await this._stabilize();
   }
 
-  async text(options?: {excludes?: string}): Promise<string> {
+  async text(options?: {exclude?: string}): Promise<string> {
     await this._stabilize();
-    if (options?.excludes) {
-      return getTextWithExcludedElements(this.element, options.excludes);
-    } else {
-      return (this.element.textContent || '').trim();
+    if (options?.exclude) {
+      return getTextWithExcludedElements(this.element, options.exclude);
     }
+    return (this.element.textContent || '').trim();
   }
 
   async getAttribute(name: string): Promise<string|null> {

tools/public_api_guard/cdk/testing.d.ts

@@ -134,7 +134,7 @@ export interface TestElement {
     sendKeys(modifiers: ModifierKeys, ...keys: (string | TestKey)[]): Promise<void>;
     setInputValue?(value: string): Promise<void>;
     text(options?: {
-        excludes?: string;
+        exclude?: string;
     }): Promise<string>;
 }
 

tools/public_api_guard/cdk/testing/protractor.d.ts

@@ -18,7 +18,7 @@ export declare class ProtractorElement implements TestElement {
     sendKeys(modifiers: ModifierKeys, ...keys: (string | TestKey)[]): Promise<void>;
     setInputValue(value: string): Promise<void>;
     text(options?: {
-        excludes?: string;
+        exclude?: string;
     }): Promise<string>;
 }
 

tools/public_api_guard/cdk/testing/testbed.d.ts

@@ -35,6 +35,6 @@ export declare class UnitTestElement implements TestElement {
     sendKeys(modifiers: ModifierKeys, ...keys: (string | TestKey)[]): Promise<void>;
     setInputValue(value: string): Promise<void>;
     text(options?: {
-        excludes?: string;
+        exclude?: string;
     }): Promise<string>;
 }