Fixed tests

Author: tinayuangao

src/lib/radio/radio.spec.ts

@@ -414,11 +414,13 @@ describe('MdRadio', () => {
 
     it('should write to the radio button based on ngModel', fakeAsync(() => {
       testComponent.modelValue = 'chocolate';
+
       fixture.detectChanges();
       tick();
       fixture.detectChanges();
 
       expect(innerRadios[1].nativeElement.checked).toBe(true);
+      expect(radioInstances[1].checked).toBe(true);
     }));
 
     it('should update the ngModel value when selecting a radio button', () => {
@@ -548,7 +550,7 @@ describe('MdRadio', () => {
     it('should change aria-label attribute if property is changed at runtime', () => {
       expect(fruitRadioNativeInputs[0].getAttribute('aria-label')).toBe('Banana');
 
-      fruitRadioInstances[0].ariaLabel = 'Pineapple';
+      testComponent.ariaLabel = 'Pineapple';
       fixture.detectChanges();
 
       expect(fruitRadioNativeInputs[0].getAttribute('aria-label')).toBe('Pineapple');
@@ -565,7 +567,7 @@ describe('MdRadio', () => {
     it('should change aria-labelledby attribute if property is changed at runtime', () => {
       expect(fruitRadioNativeInputs[0].getAttribute('aria-labelledby')).toBe('xyz');
 
-      fruitRadioInstances[0].ariaLabelledby = 'uvw';
+      testComponent.ariaLabelledby = 'uvw';
       fixture.detectChanges();
 
       expect(fruitRadioNativeInputs[0].getAttribute('aria-labelledby')).toBe('uvw');
@@ -615,12 +617,15 @@ class RadiosInsideRadioGroup {
     <md-radio-button name="weather" value="cool">Autumn</md-radio-button>
 
     <span id="xyz">Baby Banana</span>
-    <md-radio-button name="fruit" value="banana" aria-label="Banana" aria-labelledby="xyz">
+    <md-radio-button name="fruit" value="banana" [aria-label]="ariaLabel" [aria-labelledby]="ariaLabelledby">
     </md-radio-button>
     <md-radio-button name="fruit" value="raspberry">Raspberry</md-radio-button>
   `
 })
-class StandaloneRadioButtons { }
+class StandaloneRadioButtons {
+  ariaLabel: string = 'Banana';
+  ariaLabelledby: string = 'xyz';
+}
 
 
 @Component({

src/lib/radio/radio.ts

@@ -83,6 +83,9 @@ export class MdRadioGroup implements AfterContentInit, ControlValueAccessor {
   /** Whether the `value` has been set to its initial value. */
   private _isInitialized: boolean = false;
 
+  /** Whether the labels should appear after or before the radio-buttons. Defaults to 'after' */
+  private _labelPosition: 'before' | 'after' = 'after';
+
   /** The method to be called in order to update ngModel */
   _controlValueAccessorChangeFn: (value: any) => void = (value) => {};
 
@@ -127,15 +130,29 @@ export class MdRadioGroup implements AfterContentInit, ControlValueAccessor {
     this.labelPosition = (v == 'start') ? 'after' : 'before';
   }
 
+
   /** Whether the labels should appear after or before the radio-buttons. Defaults to 'after' */
-  @Input() labelPosition: 'before' | 'after' = 'after';
+  @Input()
+  get labelPosition() {
+    return this._labelPosition;
+  }
+
+  set labelPosition(v) {
+    this._labelPosition = (v == 'before') ? 'before' : 'after';
+    if (this._radios) {
+      this._radios.forEach(radio => radio.groupValueChanged());
+    }
+  }
 
   /** Whether the radio button is disabled. */
   @Input()
   get disabled(): boolean { return this._disabled; }
   set disabled(value) {
     // The presence of *any* disabled value makes the component disabled, *except* for false.
     this._disabled = (value != null && value !== false) ? true : null;
+    if (this._radios) {
+      this._radios.forEach(radio => radio.groupValueChanged());
+    }
   }
 
   /** Value of the radio button. */
@@ -327,6 +344,7 @@ export class MdRadioButton implements OnInit {
   constructor(@Optional() radioGroup: MdRadioGroup,
               private _elementRef: ElementRef,
               private _renderer: Renderer,
+              private _changeDetector: ChangeDetectorRef,
               public radioDispatcher: UniqueSelectionDispatcher) {
     // Assertions. Ideally these should be stripped out by the compiler.
     // TODO(jelbourn): Assert that there's no name binding AND a parent radio group.
@@ -368,6 +386,7 @@ export class MdRadioButton implements OnInit {
         // Notify all radio buttons with the same name to un-check.
         this.radioDispatcher.notify(this.id, this.name);
       }
+      this._changeDetector.markForCheck();
     }
   }
 
@@ -431,6 +450,10 @@ export class MdRadioButton implements OnInit {
     this._disabled = (value != null && value !== false) ? true : null;
   }
 
+  groupValueChanged() {
+    this._changeDetector.markForCheck();
+  }
+
   ngOnInit() {
     if (this.radioGroup) {
       // If the radio is inside a radio group, determine if it should be checked