review

Author: andrewseguin

src/material-experimental/mdc-chips/harness/chip-grid-harness.spec.ts

@@ -33,7 +33,7 @@ describe('MatChipGridHarness', () => {
 
   it('should get the chip input harness', async () => {
     const harnesses = await loader.getAllHarnesses(MatChipGridHarness);
-    const input = await harnesses[0].getInput();
+    const input = await harnesses[0].getTextInput();
     expect(await input).not.toBe(null);
   });
 });

src/material-experimental/mdc-chips/harness/chip-grid-harness.ts

@@ -25,8 +25,8 @@ export class MatChipGridHarness extends ComponentHarness {
     return await this._rows();
   }
 
-  /** Gets promise of the chip input harness. */
-  async getInput(): Promise<MatChipInputHarness|null> {
+  /** Gets promise of the chip text input harness. */
+  async getTextInput(): Promise<MatChipInputHarness|null> {
     return await this._input();
   }
 }

src/material-experimental/mdc-chips/harness/chip-harness.spec.ts

@@ -27,9 +27,9 @@ describe('MatChipHarness', () => {
 
   it('should get the chip text content', async () => {
     const harnesses = await loader.getAllHarnesses(MatChipHarness);
-    expect(await harnesses[0].getTextContent()).toBe('Basic Chip');
-    expect(await harnesses[1].getTextContent()).toBe('Chip');
-    expect(await harnesses[2].getTextContent()).toBe('Disabled Chip');
+    expect(await harnesses[0].getText()).toBe('Basic Chip');
+    expect(await harnesses[1].getText()).toBe('Chip');
+    expect(await harnesses[2].getText()).toBe('Disabled Chip');
   });
 
   it('should get the disabled state', async () => {

src/material-experimental/mdc-chips/harness/chip-harness.ts

@@ -16,13 +16,12 @@ export class MatChipHarness extends ComponentHarness {
   static hostSelector = 'mat-basic-chip, mat-chip';
 
   /** Gets a promise for the text content the option. */
-  async getTextContent(): Promise<string> {
+  async getText(): Promise<string> {
     return (await this.host()).text();
   }
 
   /** Gets a promise for the disabled state. */
   async isDisabled(): Promise<boolean> {
-    const ariaSelected = (await this.host()).getAttribute('aria-disabled');
-    return await ariaSelected === 'true';
+    return await ((await this.host()).getAttribute('aria-disabled')) === 'true';
   }
 }

src/material-experimental/mdc-chips/harness/chip-input.ts

@@ -13,12 +13,11 @@ import {ComponentHarness} from '@angular/cdk-experimental/testing';
  * @dynamic
  */
 export class MatChipInputHarness extends ComponentHarness {
-  static hostSelector = 'input.mat-mdc-chip-input';
+  static hostSelector = '.mat-mdc-chip-input';
 
   /** Gets a promise for the disabled state. */
   async isDisabled(): Promise<boolean> {
-    const ariaSelected = (await this.host()).getAttribute('disabled');
-    return await ariaSelected === 'true';
+    return await ((await this.host()).getAttribute('disabled')) === 'true';
   }
 
   /** Gets a promise for the placeholder text. */

src/material-experimental/mdc-chips/harness/chip-listbox-harness.spec.ts

@@ -44,7 +44,7 @@ describe('MatChipListboxHarness', () => {
       const harnesses = await loader.getAllHarnesses(MatChipListboxHarness);
       const selectedOption = await harnesses[0].getSelected();
       expect(await selectedOption.length).toBe(1);
-      expect(await selectedOption[0].getTextContent()).toContain('Blue');
+      expect(await selectedOption[0].getText()).toContain('Blue');
     });
 
     it('with multiple selected options', async () => {
@@ -56,8 +56,8 @@ describe('MatChipListboxHarness', () => {
       const harnesses = (await loader.getAllHarnesses(MatChipListboxHarness));
       const selectedOption = await harnesses[0].getSelected();
       expect(await selectedOption.length).toBe(2);
-      expect(await selectedOption[0].getTextContent()).toContain('Blue');
-      expect(await selectedOption[1].getTextContent()).toContain('Green');
+      expect(await selectedOption[0].getText()).toContain('Blue');
+      expect(await selectedOption[1].getText()).toContain('Green');
     });
   });
 });