fix(radio): tidy up tests and fix ngmodel propagation

Author: cal-smith

src/radio/radio-group.component.ts

@@ -227,8 +227,10 @@ export class RadioGroup implements AfterContentInit, AfterViewInit, ControlValue
 	/**
 	 * Creates a class of `RadioChange` to emit the change in the `RadioGroup`.
 	 */
-	emitChangeEvent(event) {
+	emitChangeEvent(event: RadioChange) {
 		this.change.emit(event);
+		this.propagateChange(event.value);
+		this.onTouched();
 	}
 
 	/**
@@ -249,15 +251,6 @@ export class RadioGroup implements AfterContentInit, AfterViewInit, ControlValue
 		this.value = value;
 	}
 
-	/**
-	 * Callback triggered when a `Radio` within the `RadioGroup` is changed.
-	 */
-	touch() {
-		if (this.onTouched) {
-			this.onTouched();
-		}
-	}
-
 	ngAfterContentInit() {
 		this.radios.changes.subscribe(() => {
 			this.updateRadioNames();
@@ -276,10 +269,7 @@ export class RadioGroup implements AfterContentInit, AfterViewInit, ControlValue
 	 * Used to set method to propagate changes back to the form.
 	 */
 	public registerOnChange(fn: any) {
-		this.propagateChange = value => {
-			this.value = value;
-			fn(value);
-		};
+		this.propagateChange = fn;
 	}
 
 	/**

src/radio/radio.component.spec.ts

@@ -1,11 +1,4 @@
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import {
-	ComponentFixture,
-	TestBed,
-	fakeAsync,
-	tick,
-	async
-} from "@angular/core/testing";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { FormsModule } from "@angular/forms";
 import { DebugElement, Component } from "@angular/core";
@@ -14,12 +7,25 @@ import { StaticIconModule } from "../icon/static-icon.module";
 import { Radio } from "./radio.component";
 import { RadioGroup } from "./radio-group.component";
 
+@Component({
+	selector: "test-cmp",
+	template: `
+	<ibm-radio-group [(ngModel)]="radio">
+		<ibm-radio *ngFor="let one of manyRadios" [value]="one"
+			class="indent">Radio {{one}}
+		</ibm-radio>
+	</ibm-radio-group>`
+})
+class RadioTest {
+	manyRadios = ["one", "two", "three", "four", "five", "six"];
+	radio: string;
+}
+
 describe("RadioGroup", () => {
 	beforeEach(() => {
 		TestBed.configureTestingModule({
 			declarations: [Radio, RadioGroup, RadioTest],
-			imports: [BrowserAnimationsModule, FormsModule, StaticIconModule],
-			providers: []
+			imports: [FormsModule, StaticIconModule]
 		});
 	});
 
@@ -35,31 +41,15 @@ describe("RadioGroup", () => {
 		const fixture = TestBed.createComponent(RadioTest);
 		fixture.detectChanges();
 
-		const directiveEl = fixture.debugElement.query(By.directive(RadioGroup));
 		const radioOne = fixture.debugElement.query(By.directive(Radio));
+		radioOne.triggerEventHandler("click", null);
 		radioOne.nativeElement.querySelector("input").click();
 		fixture.detectChanges();
 
 		expect(fixture.componentInstance.radio).toBe("one");
 	});
 });
 
-@Component({
-	selector: "test-cmp",
-	template: `
-	<ibm-radio-group [(ngModel)]="radio">
-		<ibm-radio *ngFor="let one of manyRadios" [value]="one"
-			class="indent">Radio {{one}}
-		</ibm-radio>
-	</ibm-radio-group>`,
-	entryComponents: [Radio]
-})
-class RadioTest {
-	manyRadios = ["one", "two", "three", "four", "five", "six"];
-	radio: string;
-}
-
-
 describe("RadioComponent", () => {
 	let component: Radio;
 	let fixture: ComponentFixture<Radio>;
@@ -68,9 +58,7 @@ describe("RadioComponent", () => {
 
 	beforeEach(() => {
 		TestBed.configureTestingModule({
-			declarations: [Radio],
-			imports: [BrowserAnimationsModule],
-			providers: []
+			declarations: [Radio]
 		});
 
 		fixture = TestBed.createComponent(Radio);