fix(focus-classes): tests for firefox on saucelabs

angular · Feb 4, 2017 · 8014fe9 · 8014fe9
1 parent 8d900e0
commit 8014fe9
Showing 1 changed file with 6 additions and 39 deletions.
diff --git a/src/lib/core/style/focus-classes.spec.ts b/src/lib/core/style/focus-classes.spec.ts
@@ -4,26 +4,16 @@ 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: Firefox only fires focus & blur events when it is the currently active window.
-// This is not always the case on our CI setup, therefore we disable tests that depend on these
-// events firing for Firefox. We may be able to fix this by configuring our CI to start Firefox with
-// the following preference: focusmanager.testmode = true
-
-
-describe('FocusOriginMonitor', () => {
+fdescribe('FocusOriginMonitor', () => {
   let fixture: ComponentFixture<PlainButton>;
   let buttonElement: HTMLElement;
   let buttonRenderer: Renderer;
   let focusOriginMonitor: FocusOriginMonitor;
-  let platform: Platform;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [StyleModule, PlatformModule],
+      imports: [StyleModule],
       declarations: [
         PlainButton,
       ],
@@ -32,21 +22,18 @@ describe('FocusOriginMonitor', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([FocusOriginMonitor, Platform], (fom: FocusOriginMonitor, pfm: Platform) => {
+  beforeEach(inject([FocusOriginMonitor], (fom: FocusOriginMonitor) => {
     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();
 
@@ -59,8 +46,6 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('should detect focus via keyboard', async(() => {
-    if (platform.FIREFOX) { return; }
-
     // Simulate focus via keyboard.
     dispatchKeydownEvent(document, TAB);
     buttonElement.focus();
@@ -79,8 +64,6 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('should detect focus via mouse', async(() => {
-    if (platform.FIREFOX) { return; }
-
     // Simulate focus via mouse.
     dispatchMousedownEvent(document);
     buttonElement.focus();
@@ -99,8 +82,6 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('should detect programmatic focus', async(() => {
-    if (platform.FIREFOX) { return; }
-
     // Programmatically focus.
     buttonElement.focus();
     fixture.detectChanges();
@@ -118,8 +99,6 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia keyboard should simulate keyboard focus', async(() => {
-    if (platform.FIREFOX) { return; }
-
     focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'keyboard');
     fixture.detectChanges();
 
@@ -136,8 +115,6 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia mouse should simulate mouse focus', async(() => {
-    if (platform.FIREFOX) { return; }
-
     focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'mouse');
     fixture.detectChanges();
 
@@ -154,8 +131,6 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia program should simulate programmatic focus', async(() => {
-    if (platform.FIREFOX) { return; }
-
     focusOriginMonitor.focusVia(buttonElement, buttonRenderer, 'program');
     fixture.detectChanges();
 
@@ -176,11 +151,10 @@ describe('FocusOriginMonitor', () => {
 describe('cdkFocusClasses', () => {
   let fixture: ComponentFixture<ButtonWithFocusClasses>;
   let buttonElement: HTMLElement;
-  let platform: Platform;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [StyleModule, PlatformModule],
+      imports: [StyleModule],
       declarations: [
         ButtonWithFocusClasses,
       ],
@@ -189,21 +163,18 @@ describe('cdkFocusClasses', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([Platform], (pfm: Platform) => {
+  beforeEach(() => {
     fixture = TestBed.createComponent(ButtonWithFocusClasses);
     fixture.detectChanges();
 
     buttonElement = fixture.debugElement.query(By.css('button')).nativeElement;
-    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();
@@ -222,8 +193,6 @@ describe('cdkFocusClasses', () => {
   }));
 
   it('should detect focus via mouse', async(() => {
-    if (platform.FIREFOX) { return; }
-
     // Simulate focus via mouse.
     dispatchMousedownEvent(document);
     buttonElement.focus();
@@ -242,8 +211,6 @@ describe('cdkFocusClasses', () => {
   }));
 
   it('should detect programmatic focus', async(() => {
-    if (platform.FIREFOX) { return; }
-
     // Programmatically focus.
     buttonElement.focus();
     fixture.detectChanges();