fix tests

Author: mmalerba

src/cdk/a11y/focus-monitor/focus-monitor.spec.ts

@@ -5,7 +5,10 @@ import {
   dispatchMouseEvent,
   patchElementFocus,
 } from '@angular/cdk/testing';
-import {Component, ElementRef, ViewChild} from '@angular/core';
+import {
+  ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef,
+  ViewChild
+} from '@angular/core';
 import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
@@ -395,7 +398,6 @@ describe('cdkMonitorFocus', () => {
 describe('FocusMonitor observable stream', () => {
   let fixture: ComponentFixture<MonitoredElementRequiringChangeDetection>;
   let buttonElement: HTMLElement;
-  let focusMonitor: FocusMonitor;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -406,23 +408,20 @@ describe('FocusMonitor observable stream', () => {
     }).compileComponents();
   });
 
-  beforeEach(inject([FocusMonitor], (fm: FocusMonitor) => {
+  beforeEach(() => {
     fixture = TestBed.createComponent(MonitoredElementRequiringChangeDetection);
     fixture.detectChanges();
-
     buttonElement = fixture.componentInstance.button.nativeElement;
-    focusMonitor = fm;
-
     patchElementFocus(buttonElement);
-  }));
+  });
 
-  it('should emit inside the NgZone', () => {
+  it('should emit inside the NgZone', fakeAsync(() => {
     fixture.detectChanges();
     expect(buttonElement.innerText).toBe('');
     buttonElement.focus();
     fixture.detectChanges();
     expect(buttonElement.innerText).toBe('program');
-  });
+  }));
 });
 
 
@@ -452,16 +451,21 @@ class ComplexComponentWithMonitorElementFocus {}
 class ComplexComponentWithMonitorSubtreeFocus {}
 
 @Component({
-  template: `<button #b>{{origin}}</button>`
+  template: `<button #b>{{origin}}</button>`,
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 class MonitoredElementRequiringChangeDetection {
   @ViewChild('b') button: ElementRef;
   origin: string;
 
-  constructor(private _focusMonitor: FocusMonitor) {}
+  constructor(private _focusMonitor: FocusMonitor,
+              private _changeDetectorRef: ChangeDetectorRef) {}
 
   ngOnInit() {
-    this._focusMonitor.monitor(this.button.nativeElement).subscribe(o => this.origin = o || '');
+    this._focusMonitor.monitor(this.button.nativeElement).subscribe(o => {
+      this.origin = o || '';
+      this._changeDetectorRef.markForCheck();
+    });
   }
 
   ngOnDestroy() {