fix tests

Author: mmalerba

src/lib/sidenav/drawer.spec.ts

@@ -18,7 +18,7 @@ describe('MdDrawer', () => {
         DrawerContainerNoDrawerTestApp,
         DrawerSetToOpenedFalse,
         DrawerSetToOpenedTrue,
-        DrawerDynamicSide,
+        DrawerDynamicPosition,
         DrawerWitFocusableElements,
       ],
     });
@@ -234,24 +234,24 @@ describe('MdDrawer', () => {
           .toBe(false, 'Expected drawer not to have a native align attribute.');
     });
 
-    it('should throw when multiple drawers have the same side', fakeAsync(() => {
-      const fixture = TestBed.createComponent(DrawerDynamicSide);
+    it('should throw when multiple drawers have the same position', fakeAsync(() => {
+      const fixture = TestBed.createComponent(DrawerDynamicPosition);
       fixture.detectChanges();
       tick();
 
-      const testComponent: DrawerDynamicSide = fixture.debugElement.componentInstance;
-      testComponent.drawer1Side = 'end';
+      const testComponent: DrawerDynamicPosition = fixture.debugElement.componentInstance;
+      testComponent.drawer1Position = 'end';
 
       expect(() => fixture.detectChanges()).toThrow();
     }));
 
-    it('should not throw when drawers swap sides', () => {
-      const fixture = TestBed.createComponent(DrawerDynamicSide);
+    it('should not throw when drawers swap positions', () => {
+      const fixture = TestBed.createComponent(DrawerDynamicPosition);
       fixture.detectChanges();
 
-      const testComponent: DrawerDynamicSide = fixture.debugElement.componentInstance;
-      testComponent.drawer1Side = 'end';
-      testComponent.drawer2Side = 'start';
+      const testComponent: DrawerDynamicPosition = fixture.debugElement.componentInstance;
+      testComponent.drawer1Position = 'end';
+      testComponent.drawer2Position = 'start';
 
       expect(() => fixture.detectChanges()).not.toThrow();
     });
@@ -368,12 +368,12 @@ describe('MdDrawerContainer', () => {
 @Component({template: `<md-drawer-container></md-drawer-container>`})
 class DrawerContainerNoDrawerTestApp { }
 
-/** Test component that contains an MdDrawerContainer and 2 MdDrawer on the same side. */
+/** Test component that contains an MdDrawerContainer and 2 MdDrawer in the same position. */
 @Component({
   template: `
     <md-drawer-container>
-      <md-drawer [position]="start"></md-drawer>
-      <md-drawer [position]="end"></md-drawer>
+      <md-drawer position="start"></md-drawer>
+      <md-drawer position="end"></md-drawer>
     </md-drawer-container>`,
 })
 class DrawerContainerTwoDrawerTestApp {
@@ -384,7 +384,7 @@ class DrawerContainerTwoDrawerTestApp {
 @Component({
   template: `
     <md-drawer-container (backdropClick)="backdropClicked()">
-      <md-drawer #drawer [position]="start"
+      <md-drawer #drawer position="start"
                  (open)="open()"
                  (close)="close()">
         <button #drawerButton>Content.</button>
@@ -438,19 +438,19 @@ class DrawerSetToOpenedTrue { }
 @Component({
   template: `
     <md-drawer-container>
-      <md-drawer #drawer1 [position]="drawer1Side"></md-drawer>
-      <md-drawer #drawer2 [position]="drawer2Side"></md-drawer>
+      <md-drawer #drawer1 [position]="drawer1Position"></md-drawer>
+      <md-drawer #drawer2 [position]="drawer2Position"></md-drawer>
     </md-drawer-container>`,
 })
-class DrawerDynamicSide {
-  drawer1Side = 'start';
-  drawer2Side = 'end';
+class DrawerDynamicPosition {
+  drawer1Position = 'start';
+  drawer2Position = 'end';
 }
 
 @Component({
   template: `
     <md-drawer-container>
-      <md-drawer [position]="start" [mode]="mode">
+      <md-drawer position="start" [mode]="mode">
         <a class="link1" href="#">link1</a>
       </md-drawer>
       <a class="link2" href="#">link2</a>

src/lib/sidenav/drawer.ts

@@ -33,9 +33,9 @@ import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
 
 
-/** Throws an exception when two MdDrawer are matching the same side. */
-export function throwMdDuplicatedDrawerError(side: string) {
-  throw Error(`A drawer was already declared for 'side="${side}"'`);
+/** Throws an exception when two MdDrawer are matching the same position. */
+export function throwMdDuplicatedDrawerError(position: string) {
+  throw Error(`A drawer was already declared for 'position="${position}"'`);
 }
 
 
@@ -149,8 +149,8 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   /** Event emitted when the drawer is fully closed. */
   @Output('close') onClose = new EventEmitter<MdDrawerToggleResult | void>();
 
-  /** Event emitted when the drawer's side changes. */
-  @Output('side-changed') onPositionChanged = new EventEmitter<void>();
+  /** Event emitted when the drawer's position changes. */
+  @Output('positionChanged') onPositionChanged = new EventEmitter<void>();
 
   /** @deprecated */
   @Output('align-changed') onAlignChanged = new EventEmitter<void>();
@@ -316,16 +316,16 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
 export class MdDrawerContainer implements AfterContentInit {
   @ContentChildren(MdDrawer) _drawers: QueryList<MdDrawer>;
 
-  /** The drawer child with the `start` side. */
+  /** The drawer child with the `start` position. */
   get start() { return this._start; }
 
-  /** The drawer child with the `end` side. */
+  /** The drawer child with the `end` position. */
   get end() { return this._end; }
 
   /** Event emitted when the drawer backdrop is clicked. */
   @Output() backdropClick = new EventEmitter<void>();
 
-  /** The drawer at the start/end side, independent of direction. */
+  /** The drawer at the start/end position, independent of direction. */
   private _start: MdDrawer | null;
   private _end: MdDrawer | null;
 
@@ -356,7 +356,7 @@ export class MdDrawerContainer implements AfterContentInit {
       this._validateDrawers();
       this._drawers.forEach((drawer: MdDrawer) => {
         this._watchDrawerToggle(drawer);
-        this._watchDrawerSide(drawer);
+        this._watchDrawerPosition(drawer);
       });
     });
   }
@@ -392,14 +392,15 @@ export class MdDrawerContainer implements AfterContentInit {
   }
 
   /**
-   * Subscribes to drawer onSideChanged event in order to re-validate drawers when the side changes.
+   * Subscribes to drawer onPositionChanged event in order to re-validate drawers when the position
+   * changes.
    */
-  private _watchDrawerSide(drawer: MdDrawer): void {
+  private _watchDrawerPosition(drawer: MdDrawer): void {
     if (!drawer) {
       return;
     }
     // NOTE: We need to wait for the microtask queue to be empty before validating,
-    // since both drawers may be swapping sides at the same time.
+    // since both drawers may be swapping positions at the same time.
     takeUntil.call(drawer.onPositionChanged, this._drawers.changes).subscribe(() =>
         first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => this._validateDrawers()));
   }