fix tests

Author: mmalerba

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

@@ -5,11 +5,11 @@ import {
   dispatchMouseEvent,
   patchElementFocus,
 } from '@angular/cdk/testing';
-import {Component, ElementRef, ViewChild} from '@angular/core';
+import {Component, NgZone} 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';
 import {A11yModule} from '../index';
+import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
 
 
 describe('FocusMonitor', () => {
@@ -393,36 +393,37 @@ describe('cdkMonitorFocus', () => {
 });
 
 describe('FocusMonitor observable stream', () => {
-  let fixture: ComponentFixture<MonitoredElementRequiringChangeDetection>;
+  let fixture: ComponentFixture<PlainButton>;
   let buttonElement: HTMLElement;
   let focusMonitor: FocusMonitor;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [A11yModule],
       declarations: [
-        MonitoredElementRequiringChangeDetection,
+        PlainButton,
       ],
     }).compileComponents();
   });
 
   beforeEach(inject([FocusMonitor], (fm: FocusMonitor) => {
-    fixture = TestBed.createComponent(MonitoredElementRequiringChangeDetection);
-    fixture.detectChanges();
-
-    buttonElement = fixture.componentInstance.button.nativeElement;
+    fixture = TestBed.createComponent(PlainButton);
     focusMonitor = fm;
-
+    fixture.detectChanges();
+    buttonElement = fixture.debugElement.nativeElement.querySelector('button');
     patchElementFocus(buttonElement);
   }));
 
-  it('should emit inside the NgZone', () => {
-    fixture.detectChanges();
-    expect(buttonElement.innerText).toBe('');
+  it('should emit inside the NgZone', fakeAsync(() => {
+    const spy = jasmine.createSpy('zone spy');
+    focusMonitor.monitor(buttonElement).subscribe(() => spy(NgZone.isInAngularZone()));
+    expect(spy).not.toHaveBeenCalled();
+
     buttonElement.focus();
     fixture.detectChanges();
-    expect(buttonElement.innerText).toBe('program');
-  });
+    tick();
+    expect(spy).toHaveBeenCalledWith(true);
+  }));
 });
 
 
@@ -450,21 +451,3 @@ class ComplexComponentWithMonitorElementFocus {}
   template: `<div tabindex="0" cdkMonitorSubtreeFocus><button></button></div>`
 })
 class ComplexComponentWithMonitorSubtreeFocus {}
-
-@Component({
-  template: `<button #b>{{origin}}</button>`
-})
-class MonitoredElementRequiringChangeDetection {
-  @ViewChild('b') button: ElementRef;
-  origin: string;
-
-  constructor(private _focusMonitor: FocusMonitor) {}
-
-  ngOnInit() {
-    this._focusMonitor.monitor(this.button.nativeElement).subscribe(o => this.origin = o || '');
-  }
-
-  ngOnDestroy() {
-    this._focusMonitor.stopMonitoring(this.button.nativeElement);
-  }
-}