tests are passing

Author: jelbourn

package.json

@@ -28,18 +28,18 @@
     "node": ">= 4.2.1 < 5"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.3",
-    "@angular/compiler": "2.0.0-rc.3",
-    "@angular/core": "2.0.0-rc.3",
-    "@angular/http": "2.0.0-rc.3",
-    "@angular/platform-browser": "2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/common": "2.0.0-rc.4",
+    "@angular/compiler": "2.0.0-rc.4",
+    "@angular/core": "2.0.0-rc.4",
+    "@angular/http": "2.0.0-rc.4",
+    "@angular/platform-browser": "2.0.0-rc.4",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.4",
     "@angular/router": "v3.0.0-alpha.8",
     "@angular/forms": "^0.1.0",
     "core-js": "^2.4.0",
     "hammerjs": "^2.0.8",
     "rxjs": "5.0.0-beta.6",
-    "systemjs": "0.19.26",
+    "systemjs": "0.19.31",
     "zone.js": "0.6.12"
   },
   "devDependencies": {
@@ -56,24 +56,24 @@
     "glob": "^6.0.4",
     "jasmine-core": "^2.4.1",
     "js-yaml": "^3.5.2",
-    "karma": "^0.13.15",
-    "karma-browserstack-launcher": "^0.1.7",
-    "karma-chrome-launcher": "^0.2.3",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-jasmine": "^0.3.8",
-    "karma-sauce-launcher": "^0.2.14",
-    "madge": "^0.5.3",
+    "karma": "^1.1.1",
+    "karma-browserstack-launcher": "^1.0.1",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-jasmine": "^1.0.2",
+    "karma-sauce-launcher": "^1.0.0",
+    "madge": "^0.6.0",
     "node-sass": "^3.4.2",
     "protractor": "^3.3.0",
     "protractor-accessibility-plugin": "0.1.1",
     "sass": "^0.5.0",
     "strip-ansi": "^3.0.0",
-    "stylelint": "^6.5.1",
+    "stylelint": "^6.9.0",
     "symlink-or-copy": "^1.0.1",
     "ts-node": "^0.7.3",
-    "tslint": "^3.5.0",
-    "typescript": "^1.9.0-dev",
-    "typings": "^1.0.4",
+    "tslint": "^3.13.0",
+    "typescript": "^2.0.0",
+    "typings": "^1.3.1",
     "which": "^1.2.4"
   }
 }

src/components/icon/package.json

@@ -21,7 +21,7 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular/http": "2.0.0-rc.3",
+    "@angular/http": "2.0.0-rc.4",
     "@angular2-material/core": "2.0.0-alpha.6"
   }
 }

src/components/sidenav/sidenav.spec.ts

@@ -1,18 +1,17 @@
 import {
-  it,
+  it, iit,
   describe,
   expect,
   beforeEach,
   fakeAsync,
+  async,
   inject,
-  injectAsync,
   tick
 } from '@angular/core/testing';
 import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
 import {XHR} from '@angular/compiler';
 import {
   Component,
-  Type,
   ViewMetadata
 } from '@angular/core';
 
@@ -28,14 +27,14 @@ function fakeAsyncAdaptor(fn: () => void) {
 /**
  * Create a ComponentFixture from the builder. This takes a template and a style for sidenav.
  */
-function createFixture(appType: Type, builder: TestComponentBuilder,
+function createFixture(appType: any, builder: TestComponentBuilder,
                        template: string, style: string): ComponentFixture<any> {
   let fixture: ComponentFixture<any> = null;
   // Remove the styles (which remove the animations/transitions).
   builder
     .overrideView(MdSidenavLayout, new ViewMetadata({
       template: template,
-      styles: [style],
+      styles: [style || ''],
       directives: [MdSidenav],
     }))
     .createAsync(appType).then((f: ComponentFixture<any>) => {
@@ -61,6 +60,12 @@ describe('MdSidenav', () => {
   let template: string;
   let style: string;
   let builder: TestComponentBuilder;
+  let xhr: XHR;
+
+  beforeEach(inject([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, x: XHR) => {
+    builder = tcb;
+    xhr = x;
+  }));
 
   /**
    * We need to get the template and styles for the sidenav in an Async test.
@@ -69,14 +74,12 @@ describe('MdSidenav', () => {
    * We do some style verification so styles have to match.
    * But we remove the transitions so we only set the regular `sidenav.css` styling.
    */
-  beforeEach(injectAsync([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, xhr: XHR) => {
-    builder = tcb;
-
+  beforeEach(async(() => {
     return Promise.all([
-      xhr.get('./components/sidenav/sidenav.html').then((t) => {
+      xhr.get('./components/sidenav/sidenav.html').then(t => {
         template = t;
       }),
-      xhr.get('./components/sidenav/sidenav.css').then((css) => {
+      xhr.get('./components/sidenav/sidenav.css').then(css => {
         style = css;
       })
     ]).catch((err: any) => {

src/components/tabs/tab-group.spec.ts

@@ -16,37 +16,38 @@ import {Observable} from 'rxjs/Observable';
 
 describe('MdTabGroup', () => {
   let builder: TestComponentBuilder;
-  let fixture: ComponentFixture<SimpleTabsTestApp>;
 
   beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
     builder = tcb;
   }));
 
   describe('basic behavior', () => {
+    let fixture: ComponentFixture<SimpleTabsTestApp>;
+
     beforeEach(async(() => {
       builder.createAsync(SimpleTabsTestApp).then(f => {
         fixture = f;
       });
     }));
 
     it('should default to the first tab', () => {
-      checkSelectedIndex(1);
+      checkSelectedIndex(1, fixture);
     });
 
     it('should change selected index on click', () => {
       let component = fixture.debugElement.componentInstance;
       component.selectedIndex = 0;
-      checkSelectedIndex(0);
+      checkSelectedIndex(0, fixture);
 
       // select the second tab
       let tabLabel = fixture.debugElement.queryAll(By.css('.md-tab-label'))[1];
       tabLabel.nativeElement.click();
-      checkSelectedIndex(1);
+      checkSelectedIndex(1, fixture);
 
       // select the third tab
       tabLabel = fixture.debugElement.queryAll(By.css('.md-tab-label'))[2];
       tabLabel.nativeElement.click();
-      checkSelectedIndex(2);
+      checkSelectedIndex(2, fixture);
     });
 
     it('should support two-way binding for selectedIndex', async(() => {
@@ -128,11 +129,11 @@ describe('MdTabGroup', () => {
 
       spyOn(component, 'handleSelection').and.callThrough();
 
-      checkSelectedIndex(1);
+      checkSelectedIndex(1, fixture);
 
       tabComponent.selectedIndex = 2;
 
-      checkSelectedIndex(2);
+      checkSelectedIndex(2, fixture);
       tick();
 
       expect(component.handleSelection).toHaveBeenCalledTimes(1);
@@ -141,6 +142,8 @@ describe('MdTabGroup', () => {
   });
 
   describe('async tabs', () => {
+    let fixture: ComponentFixture<AsyncTabsTestApp>;
+
     beforeEach(async(() => {
       builder.createAsync(AsyncTabsTestApp).then(f => fixture = f);
     }));
@@ -164,7 +167,7 @@ describe('MdTabGroup', () => {
    * Checks that the `selectedIndex` has been updated; checks that the label and body have the
    * `md-active` class
    */
-  function checkSelectedIndex(index: number) {
+  function checkSelectedIndex(index: number, fixture: ComponentFixture<any>) {
     fixture.detectChanges();
 
     let tabComponent: MdTabGroup = fixture.debugElement

src/core/package.json

@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.3",
-    "@angular/common": "^2.0.0-rc.3"
+    "@angular/core": "^2.0.0-rc.4",
+    "@angular/common": "^2.0.0-rc.4"
   }
 }

src/core/portal/portal.spec.ts

@@ -140,7 +140,7 @@ describe('Portals', () => {
       appFixture.detectChanges();
 
       // Expect the new value to be reflected in the rendered output.
-      expect(hostContainer.textContent).toContainError('Mango');
+      expect(hostContainer.textContent).toContain('Mango');
     }));
 
     it('should change the attached portal', fakeAsync(() => {
@@ -210,7 +210,7 @@ describe('Portals', () => {
 
       flushMicrotasks();
 
-      expect(componentInstance).toBeAnInstanceOf(PizzaMsg);
+      expect(componentInstance).toEqual(jasmine.any(PizzaMsg));
       expect(someDomElement.textContent).toContain('Pizza');
 
       host.detach();
@@ -269,7 +269,7 @@ describe('Portals', () => {
       appFixture.detectChanges();
 
       // Expect the new value to be reflected in the rendered output.
-      expect(someDomElement.textContent).toContainError('Mango');
+      expect(someDomElement.textContent).toContain('Mango');
 
       host.detach();
       expect(someDomElement.innerHTML).toBe('');