working on tests

Author: mmalerba

src/lib/core/style/focus-classes.spec.ts

@@ -23,7 +23,7 @@ describe('FocusOriginMonitor', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([FocusOriginMonitor], (fom: FocusOriginMonitor) => {
+  beforeEach(async(inject([FocusOriginMonitor], (fom: FocusOriginMonitor) => {
     fixture = TestBed.createComponent(PlainButton);
     fixture.detectChanges();
 
@@ -32,7 +32,8 @@ describe('FocusOriginMonitor', () => {
     focusOriginMonitor = fom;
 
     focusOriginMonitor.registerElementForFocusClasses(buttonElement, buttonRenderer);
-  }));
+    document.body.focus();
+  })));
 
   it('manually registered element should receive focus classes', async(() => {
     buttonElement.focus();
@@ -171,11 +172,6 @@ describe('cdkFocusClasses', () => {
     buttonElement = fixture.debugElement.query(By.css('button')).nativeElement;
   });
 
-  afterEach(() => {
-    buttonElement.blur();
-    fixture.detectChanges();
-  });
-
   it('should initially not be focused', () => {
     expect(buttonElement.classList.length).toBe(0, 'button should not have focus classes');
   });

src/lib/core/style/focus-classes.ts

@@ -16,7 +16,6 @@ export class FocusOriginMonitor {
     // TODO(mmalerba): Figure out how to handle touchstart
     document.addEventListener(
         'keydown', () => this._setOriginForCurrentEventQueue('keyboard'), true);
-
     document.addEventListener(
         'mousedown', () => this._setOriginForCurrentEventQueue('mouse'), true);
   }