From 217840c5b9c26a4584ea79306ba28b9d71d50859 Mon Sep 17 00:00:00 2001
From: NothingEverHappens <kirjs@google.com>
Date: Fri, 29 Sep 2017 16:07:35 -0400
Subject: [PATCH] fix(stepper): selected is always undefined (#7213)

---
 src/cdk/stepper/stepper.ts      | 2 +-
 src/lib/stepper/stepper.spec.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 30b12781b75..d4637008ec1 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -150,7 +150,7 @@ export class CdkStepper {
 
   /** The step that is selected. */
   @Input()
-  get selected() { return this._steps[this.selectedIndex]; }
+  get selected() { return this._steps.toArray()[this.selectedIndex]; }
   set selected(step: CdkStep) {
     this.selectedIndex = this._steps.toArray().indexOf(step);
   }
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index eebd89f6dee..76904b22a16 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -10,7 +10,6 @@ import {MatStepperModule} from './index';
 import {MatHorizontalStepper, MatStepper, MatVerticalStepper} from './stepper';
 import {MatStepperNext, MatStepperPrevious} from './stepper-button';
 
-
 const VALID_REGEX = /valid/;
 
 describe('MatHorizontalStepper', () => {
@@ -307,6 +306,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
+  expect(stepperComponent.selected instanceof MdStep).toBe(true);
 
   // select the second step
   let stepHeaderEl = stepHeaders[1].nativeElement;
@@ -314,6 +314,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(1);
+  expect(stepperComponent.selected instanceof MdStep).toBe(true);
 
   // select the third step
   stepHeaderEl = stepHeaders[2].nativeElement;
@@ -321,6 +322,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(2);
+  expect(stepperComponent.selected instanceof MdStep).toBe(true);
 }
 
 /** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */