working on tests

Author: mmalerba

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

@@ -4,17 +4,23 @@ import {StyleModule} from './index';
 import {By} from '@angular/platform-browser';
 import {TAB} from '../keyboard/keycodes';
 import {FocusOriginMonitor} from './focus-classes';
+import {PlatformModule} from '../platform/index';
+import {Platform} from '../platform/platform';
 
 
+// NOTE: Focus listeners fail to trigger in Firefox due to the browser window not having focus.
+// (see https://bugzilla.mozilla.org/show_bug.cgi?id=497839).
+// Therefore we skip the tests for firefox.
 describe('FocusOriginMonitor', () => {
   let fixture: ComponentFixture<PlainButton>;
   let buttonElement: HTMLElement;
   let buttonRenderer: Renderer;
   let focusOriginMonitor: FocusOriginMonitor;
+  let platform: Platform;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [StyleModule],
+      imports: [StyleModule, PlatformModule],
       declarations: [
         PlainButton,
       ],
@@ -23,18 +29,21 @@ describe('FocusOriginMonitor', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([FocusOriginMonitor], (fom: FocusOriginMonitor) => {
+  beforeEach(inject([FocusOriginMonitor, Platform], (fom: FocusOriginMonitor, pfm: Platform) => {
     fixture = TestBed.createComponent(PlainButton);
     fixture.detectChanges();
 
     buttonElement = fixture.debugElement.query(By.css('button')).nativeElement;
     buttonRenderer = fixture.componentInstance.renderer;
     focusOriginMonitor = fom;
+    platform = pfm;
 
     focusOriginMonitor.registerElementForFocusClasses(buttonElement, buttonRenderer);
   }));
 
   it('manually registered element should receive focus classes', async(() => {
+    if (platform.FIREFOX) return;
+
     buttonElement.focus();
     fixture.detectChanges();
 
@@ -47,6 +56,8 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('should detect focus via keyboard', async(() => {
+    if (platform.FIREFOX) return;
+
     // Simulate focus via keyboard.
     dispatchKeydownEvent(document, TAB);
     buttonElement.focus();
@@ -65,6 +76,8 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('should detect focus via mouse', async(() => {
+    if (platform.FIREFOX) return;
+
     // Simulate focus via mouse.
     dispatchMousedownEvent(document);
     buttonElement.focus();
@@ -83,6 +96,8 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('should detect programmatic focus', async(() => {
+    if (platform.FIREFOX) return;
+
     // Programmatically focus.
     buttonElement.focus();
     fixture.detectChanges();
@@ -100,6 +115,8 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia keyboard should simulate keyboard focus', async(() => {
+    if (platform.FIREFOX) return;
+
     focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'keyboard');
     fixture.detectChanges();
 
@@ -116,6 +133,8 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia mouse should simulate mouse focus', async(() => {
+    if (platform.FIREFOX) return;
+
     focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'mouse');
     fixture.detectChanges();
 
@@ -132,6 +151,8 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia program should simulate programmatic focus', async(() => {
+    if (platform.FIREFOX) return;
+
     focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'program');
     fixture.detectChanges();
 
@@ -152,10 +173,11 @@ describe('FocusOriginMonitor', () => {
 describe('cdkFocusClasses', () => {
   let fixture: ComponentFixture<ButtonWithFocusClasses>;
   let buttonElement: HTMLElement;
+  let platform: Platform;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [StyleModule],
+      imports: [StyleModule, PlatformModule],
       declarations: [
         ButtonWithFocusClasses,
       ],
@@ -164,23 +186,21 @@ describe('cdkFocusClasses', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(() => {
+  beforeEach(inject([Platform], (pfm: Platform) => {
     fixture = TestBed.createComponent(ButtonWithFocusClasses);
     fixture.detectChanges();
 
     buttonElement = fixture.debugElement.query(By.css('button')).nativeElement;
-  });
-
-  afterEach(() => {
-    buttonElement.blur();
-    fixture.detectChanges();
-  });
+    platform = pfm;
+  }));
 
   it('should initially not be focused', () => {
     expect(buttonElement.classList.length).toBe(0, 'button should not have focus classes');
   });
 
   it('should detect focus via keyboard', async(() => {
+    if (platform.FIREFOX) return;
+
     // Simulate focus via keyboard.
     dispatchKeydownEvent(document, TAB);
     buttonElement.focus();
@@ -199,6 +219,8 @@ describe('cdkFocusClasses', () => {
   }));
 
   it('should detect focus via mouse', async(() => {
+    if (platform.FIREFOX) return;
+
     // Simulate focus via mouse.
     dispatchMousedownEvent(document);
     buttonElement.focus();
@@ -217,6 +239,8 @@ describe('cdkFocusClasses', () => {
   }));
 
   it('should detect programmatic focus', async(() => {
+    if (platform.FIREFOX) return;
+
     // Programmatically focus.
     buttonElement.focus();
     fixture.detectChanges();

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);
   }