chore(): fix travis tests (#2925)

angular · Feb 3, 2017 · b905130 · b905130
1 parent eec4dc6
commit b905130
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/src/demo-app/autocomplete/autocomplete-demo.ts b/src/demo-app/autocomplete/autocomplete-demo.ts
@@ -1,6 +1,5 @@
 import {Component, ViewEncapsulation} from '@angular/core';
 import {FormControl} from '@angular/forms';
-import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/operator/startWith';
 
 @Component({
@@ -15,7 +14,7 @@ export class AutocompleteDemo {
   currentState = '';
   topHeightCtrl = new FormControl(0);
 
-  reactiveStates: Observable<any>;
+  reactiveStates: any;
   tdStates: any[];
 
   tdDisabled = false;

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
@@ -182,24 +182,23 @@ describe('MdAutocomplete', () => {
       });
     }));
 
-    it('should keep the label floating until the panel closes', () => {
+    it('should keep the label floating until the panel closes', async(() => {
       fixture.componentInstance.trigger.openPanel();
-      fixture.detectChanges();
-
-      dispatchEvent('blur', input);
-      fixture.detectChanges();
-
       expect(fixture.componentInstance.inputContainer.floatPlaceholder)
-          .toEqual('always', 'Expected placeholder to keep floating on blur.');
+          .toEqual('always', 'Expected placeholder to float as soon as panel opens.');
 
-      const backdrop =
-          overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
-      backdrop.click();
-      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        fixture.detectChanges();
 
-      expect(fixture.componentInstance.inputContainer.floatPlaceholder)
-          .toEqual('auto', 'Expected placeholder to return to auto state after panel closes.');
-    });
+        const options =
+            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        options[1].click();
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.inputContainer.floatPlaceholder)
+            .toEqual('auto', 'Expected placeholder to return to auto state after panel closes.');
+      });
+    }));
 
   });
 
@@ -739,8 +738,8 @@ describe('MdAutocomplete', () => {
       const panelTop = panel.getBoundingClientRect().top;
 
       // Panel is offset by 6px in styles so that the underline has room to display.
-      expect((inputBottom + 6).toFixed(2))
-          .toEqual(panelTop.toFixed(2), `Expected panel top to match input bottom by default.`);
+      expect((inputBottom + 6).toFixed(1))
+          .toEqual(panelTop.toFixed(1), `Expected panel top to match input bottom by default.`);
       expect(fixture.componentInstance.trigger.autocomplete.positionY)
           .toEqual('below', `Expected autocomplete positionY to default to below.`);
     });
@@ -758,8 +757,8 @@ describe('MdAutocomplete', () => {
       const panelBottom = panel.getBoundingClientRect().bottom;
 
       // Panel is offset by 24px in styles so that the label has room to display.
-      expect((inputTop - 24).toFixed(2))
-          .toEqual(panelBottom.toFixed(2), `Expected panel to fall back to above position.`);
+      expect((inputTop - 24).toFixed(1))
+          .toEqual(panelBottom.toFixed(1), `Expected panel to fall back to above position.`);
       expect(fixture.componentInstance.trigger.autocomplete.positionY)
           .toEqual('above', `Expected autocomplete positionY to be "above" if panel won't fit.`);
     });
@@ -782,8 +781,8 @@ describe('MdAutocomplete', () => {
         const panelBottom = panel.getBoundingClientRect().bottom;
 
         // Panel is offset by 24px in styles so that the label has room to display.
-        expect((inputTop - 24).toFixed(2))
-            .toEqual(panelBottom.toFixed(2), `Expected panel to stay aligned after filtering.`);
+        expect((inputTop - 24).toFixed(1))
+            .toEqual(panelBottom.toFixed(1), `Expected panel to stay aligned after filtering.`);
         expect(fixture.componentInstance.trigger.autocomplete.positionY)
             .toEqual('above', `Expected autocomplete positionY to be "above" if panel won't fit.`);
       });

diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
@@ -9,14 +9,15 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import {MdOption} from '../core';
-import {MenuPositionY} from '../menu/menu-positions';
 
 /**
  * Autocomplete IDs need to be unique across components, so this counter exists outside of
  * the component definition.
  */
 let _uniqueAutocompleteIdCounter = 0;
 
+export type AutocompletePositionY = 'above' | 'below';
+
 @Component({
   moduleId: module.id,
   selector: 'md-autocomplete, mat-autocomplete',
@@ -28,7 +29,7 @@ let _uniqueAutocompleteIdCounter = 0;
 export class MdAutocomplete {
 
   /** Whether the autocomplete panel displays above or below its trigger. */
-  positionY: MenuPositionY = 'below';
+  positionY: AutocompletePositionY = 'below';
 
   @ViewChild(TemplateRef) template: TemplateRef<any>;
   @ViewChild('panel') panel: ElementRef;