From bac0388ca323efcf860b3b28cd40267c15a9a85a Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 13 Dec 2016 19:23:03 -0800
Subject: [PATCH] chore: fix bad chips merge and broken tests (#2207)

---
 src/lib/chips/chip-list.spec.ts | 4 +++-
 src/lib/chips/chip.ts           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index cd77b9c234d3..01daa7be7bd9 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -22,7 +22,9 @@ describe('MdChipList', () => {
     });
 
     TestBed.compileComponents();
+  }));
 
+  beforeEach(() => {
     fixture = TestBed.createComponent(StaticChipList);
     fixture.detectChanges();
 
@@ -30,7 +32,7 @@ describe('MdChipList', () => {
     chipListNativeElement = chipListDebugElement.nativeElement;
     chipListInstance = chipListDebugElement.componentInstance;
     testComponent = fixture.debugElement.componentInstance;
-  }));
+  });
 
   describe('basic behaviors', () => {
     it('adds the `md-chip-list` class', () => {
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 9b9fadb5a052..81cd0f48914d 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -10,7 +10,7 @@ import {
 } from '@angular/core';
 
 import {MdFocusable} from '../core/a11y/list-key-manager';
-import {coerceBooleanProperty} from '../core/coersion/boolean-property';
+import {coerceBooleanProperty} from '../core/coercion/boolean-property';
 
 export interface MdChipEvent {
   chip: MdChip;