add test, refactor

Author: annieyw

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

@@ -6,8 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ElementDimensions, ModifierKeys, TestElement, TestKey} from '@angular/cdk/testing';
-import {browser, by, ElementFinder, Key} from 'protractor';
+import {
+  ElementDimensions,
+  getTextWithExcludedElements,
+  ModifierKeys,
+  TestElement,
+  TestKey
+} from '@angular/cdk/testing';
+import {browser, ElementFinder, Key} from 'protractor';
 
 /** Maps the `TestKey` constants to Protractor's `Key` constants. */
 const keyMap = {
@@ -131,9 +137,7 @@ export class ProtractorElement implements TestElement {
 
   async text(options?: {excludes?: string}): Promise<string> {
     if (options?.excludes) {
-      return browser.executeScript(`var clone = arguments[0].cloneNode(true); 
-      var remove = clone.querySelectorAll(arguments[1]); 
-      remove.forEach(n => n.remove()); return clone.textContent`, this.element, options.excludes);
+      return browser.executeScript(getTextWithExcludedElements, this.element, options.excludes);
     } else {
       return this.element.getText();
     }

src/cdk/testing/test-element.ts

@@ -132,3 +132,13 @@ 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

@@ -7,7 +7,13 @@
  */
 
 import * as keyCodes from '@angular/cdk/keycodes';
-import {ElementDimensions, ModifierKeys, TestElement, TestKey} from '@angular/cdk/testing';
+import {
+  ElementDimensions,
+  getTextWithExcludedElements,
+  ModifierKeys,
+  TestElement,
+  TestKey
+} from '@angular/cdk/testing';
 import {
   clearElement,
   dispatchMouseEvent,
@@ -129,10 +135,7 @@ export class UnitTestElement implements TestElement {
   async text(options?: {excludes?: string}): Promise<string> {
     await this._stabilize();
     if (options?.excludes) {
-      const clone = this.element.cloneNode(true);
-      const exclusions = this.element.querySelectorAll(options.excludes);
-      exclusions.forEach(n => n.remove());
-      return (clone.textContent || '').trim();
+      return getTextWithExcludedElements(this.element, options.excludes);
     } else {
       return (this.element.textContent || '').trim();
     }

src/cdk/testing/tests/cross-environment.spec.ts

@@ -412,6 +412,15 @@ export function crossEnvironmentSpecs(
       expect(await button.matchesSelector('button:disabled')).toBe(false);
     });
 
+
+    it('should get correct text excluding certain selectors', async () => {
+      const results = await harness.subcomponentAndSpecialHarnesses();
+      const subHarnessHost = await results[0].host();
+
+      expect(await subHarnessHost.text({excludes: 'h2'})).toBe('ProtractorTestBedOther');
+      expect(await subHarnessHost.text({excludes: 'li'})).toBe('List of test tools');
+    });
+
     it('should get TestElements and ComponentHarnesses', async () => {
       const results = await harness.subcomponentHarnessesAndElements();
       expect(results.length).toBe(5);