fix: Fix failing Switch test (#2673)

* fix(core) Fix tests * apply same idea to radio test Co-authored-by: Mike O'Donnell <mikerodonnell89@users.noreply.github.com>
SAP · Jun 17, 2020 · e6a41f6 · e6a41f6
1 parent 9f410fb
commit e6a41f6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/libs/core/src/lib/radio/radio-button/radio-button-reactive-form.component.spec.ts b/libs/core/src/lib/radio/radio-button/radio-button-reactive-form.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { RadioButtonComponent } from './radio-button.component';
-import { Component, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, ViewChild } from '@angular/core';
 import { FormsModule, FormGroup, FormControl, ReactiveFormsModule } from '@angular/forms';
 
 @Component({
@@ -34,6 +34,7 @@ class TestRadioButtonComponentReactiveForms {
 describe('RadioButtonComponent reactive forms', () => {
     let component: TestRadioButtonComponentReactiveForms;
     let fixture: ComponentFixture<TestRadioButtonComponentReactiveForms>;
+    let changeDetectorRef: ChangeDetectorRef;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -45,10 +46,12 @@ describe('RadioButtonComponent reactive forms', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(TestRadioButtonComponentReactiveForms);
         component = fixture.componentInstance;
+        changeDetectorRef = fixture.componentRef.injector.get(ChangeDetectorRef);
         fixture.detectChanges();
     });
 
     async function wait(componentFixture: ComponentFixture<any>) {
+        changeDetectorRef.markForCheck();
         componentFixture.detectChanges();
         await componentFixture.whenStable();
     }

diff --git a/libs/core/src/lib/switch/switch.component.spec.ts b/libs/core/src/lib/switch/switch.component.spec.ts
@@ -48,23 +48,22 @@ describe('SwitchComponent', () => {
         expect(component.id).toBeTruthy();
     });
 
-    it('should switch on click', fakeAsync (() => {
-        spyOn(component.checkedChange, 'emit');
-
-        component.checked = false;
-        fixture.detectChanges();
+    it('should switch on click', fakeAsync(() => {
 
+        const checkedChangeSpy = spyOn(component.checkedChange, 'emit');
         input.click();
-        fixture.detectChanges();
-        tick(10);
 
-        expect(component.checkedChange.emit).toHaveBeenCalledWith(true);
+        detectChangesOnPush();
+        tick();
+
+        expect(checkedChangeSpy).toHaveBeenCalledWith(true);
 
         input.click();
-        fixture.detectChanges();
-        tick(10);
 
-        expect(component.checkedChange.emit).toHaveBeenCalledWith(false);
+        detectChangesOnPush();
+        tick();
+
+        expect(checkedChangeSpy).toHaveBeenCalledWith(false);
     }));
 
     it('should focus inner input element', () => {
@@ -95,12 +94,12 @@ describe('SwitchComponent', () => {
         expect(switchComp.classList).toContain('fd-switch--semantic');
     });
 
-    it('should disable', async () => {
+    it('should disable', fakeAsync(() => {
         spyOn(component.checkedChange, 'emit');
         component.disabled = true;
 
         detectChangesOnPush();
-        await fixture.whenStable();
+        tick();
 
         input.click();
 
@@ -109,5 +108,5 @@ describe('SwitchComponent', () => {
         expect(component.checkedChange.emit).not.toHaveBeenCalled();
         expect(switchComp.classList).toContain('is-disabled');
         expect(input.disabled).toBeTrue();
-    });
+    }));
 });