fix tests, make Dir optional

angular · Dec 5, 2016 · f7a97de · f7a97de
1 parent 4c0a796
commit f7a97de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/e2e-app/tabs/tabs-e2e.html b/src/e2e-app/tabs/tabs-e2e.html
@@ -2,15 +2,15 @@
   <md-tab-group>
     <md-tab>
       <template md-tab-label>One</template>
-      <template md-tab-content>First tab's content</template>
+      First tab's content
     </md-tab>
     <md-tab>
       <template md-tab-label>Two</template>
-      <template md-tab-content>Second tab's content</template>
+      Second tab's content
     </md-tab>
     <md-tab>
       <template md-tab-label>Three</template>
-      <template md-tab-content>Third tab's content</template>
+      Third tab's content
     </md-tab>
   </md-tab-group>
 </section>
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
@@ -20,10 +20,7 @@ describe('MdTabGroup', () => {
         AsyncTabsTestApp,
         DisabledTabsTestApp,
         TabGroupWithSimpleApi,
-      ],
-      providers: [
-        { provide: Dir, useFactory: () => { return {value: 'ltr'}; }
-      }]
+      ]
     });
 
     TestBed.compileComponents();

diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
@@ -5,7 +5,7 @@ import {
   NgZone,
   QueryList,
   ElementRef,
-  Renderer, ViewEncapsulation, ContentChildren, Output, EventEmitter
+  Renderer, ViewEncapsulation, ContentChildren, Output, EventEmitter, Optional
 } from '@angular/core';
 import {RIGHT_ARROW, LEFT_ARROW, ENTER, Dir, LayoutDirection} from '../core';
 import {MdTabLabelWrapper} from './tab-label-wrapper';
@@ -71,7 +71,7 @@ export class MdTabHeader {
   constructor(private _zone: NgZone,
               private _elementRef: ElementRef,
               private _renderer: Renderer,
-              private _dir: Dir) {}
+              @Optional() private _dir: Dir) {}
 
   /**
    * Waits one frame for the view to update, then updates the ink bar and scroll.