fix tests

Author: mmalerba

src/lib/button/button.spec.ts

@@ -1,16 +1,17 @@
 import {async, TestBed, ComponentFixture} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdButtonModule} from './button';
+import {MdButtonModule} from './index';
 import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
 import {FakeViewportRuler} from '../core/overlay/position/fake-viewport-ruler';
+import {StyleModule} from '../core/style/index';
 
 
 describe('MdButton', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonModule.forRoot()],
+      imports: [MdButtonModule.forRoot(), StyleModule],
       declarations: [TestApp],
       providers: [
         {provide: ViewportRuler, useClass: FakeViewportRuler},

src/lib/button/button.ts

@@ -5,14 +5,11 @@ import {
   ElementRef,
   HostBinding,
   Input,
-  ModuleWithProviders,
-  NgModule,
   OnDestroy,
   Renderer,
   ViewEncapsulation
 } from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {coerceBooleanProperty, CompatibilityModule, MdRippleModule} from '../core';
+import {coerceBooleanProperty} from '../core';
 import {FocusOriginMonitor} from '../core/style/focus-origin-monitor';
 
 
@@ -196,35 +193,3 @@ export class MdAnchor extends MdButton {
     }
   }
 }
-
-
-@NgModule({
-  imports: [CommonModule, MdRippleModule, CompatibilityModule],
-  exports: [
-    MdButton, MdAnchor,
-    CompatibilityModule,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
-    MdFabCssMatStyler,
-    MdMiniFabCssMatStyler
-  ],
-  declarations: [
-    MdButton,
-    MdAnchor,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
-    MdFabCssMatStyler,
-    MdMiniFabCssMatStyler
-  ],
-})
-export class MdButtonModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdButtonModule,
-      providers: []
-    };
-  }
-}

src/lib/button/index.ts

@@ -1 +1,49 @@
+import {ModuleWithProviders, NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdRippleModule} from '../core/ripple/ripple';
+import {CompatibilityModule} from '../core/compatibility/compatibility';
+import {
+  MdAnchor,
+  MdButton,
+  MdButtonCssMatStyler,
+  MdFabCssMatStyler,
+  MdIconButtonCssMatStyler,
+  MdMiniFabCssMatStyler,
+  MdRaisedButtonCssMatStyler
+} from './button';
+import {StyleModule} from '../core/style/index';
+
+
 export * from './button';
+
+
+@NgModule({
+  imports: [CommonModule, MdRippleModule, CompatibilityModule, StyleModule],
+  exports: [
+    MdButton, MdAnchor,
+    CompatibilityModule,
+    MdButtonCssMatStyler,
+    MdRaisedButtonCssMatStyler,
+    MdIconButtonCssMatStyler,
+    MdFabCssMatStyler,
+    MdMiniFabCssMatStyler
+  ],
+  declarations: [
+    MdButton,
+    MdAnchor,
+    MdButtonCssMatStyler,
+    MdRaisedButtonCssMatStyler,
+    MdIconButtonCssMatStyler,
+    MdFabCssMatStyler,
+    MdMiniFabCssMatStyler
+  ],
+})
+export class MdButtonModule {
+  /** @deprecated */
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdButtonModule,
+      providers: []
+    };
+  }
+}