chore(package): test against angular2 beta.17

- Update devDependencies - Directly import zone modules - Adapt to breaking changes of testing

Author: shuhei

karma.conf.js

@@ -15,7 +15,6 @@ module.exports = function(config) {
 
  // list of files / patterns to load in the browser
  files: [
- 'node_modules/zone.js/dist/zone-microtask.js',
  'test/integration/init.js',
  'test/integration/*.spec.js'
  ],

package.json

@@ -27,39 +27,39 @@
  "author": "Shuhei Kagawa <shuhei.kagawa@gmail.com>",
  "license": "ISC",
  "devDependencies": {
- "angular2": "^2.0.0-beta.7",
- "babel-cli": "^6.3.17",
- "babel-core": "^6.3.17",
- "babel-eslint": "^5.0.0-beta6",
+ "angular2": "2.0.0-beta.17",
+ "babel-cli": "^6.7.7",
+ "babel-core": "^6.7.7",
+ "babel-eslint": "^6.0.4",
  "babel-plugin-external-helpers-2": "^6.3.13",
- "babel-plugin-transform-class-properties": "^6.3.13",
- "babel-plugin-transform-decorators-legacy": "^1.3.3",
- "babel-plugin-transform-flow-strip-types": "^6.3.15",
- "babel-polyfill": "^6.3.14",
- "babel-preset-es2015": "^6.3.13",
- "babelify": "^7.2.0",
- "babylon": "^6.3.20",
+ "babel-plugin-transform-class-properties": "^6.6.0",
+ "babel-plugin-transform-decorators-legacy": "^1.3.4",
+ "babel-plugin-transform-flow-strip-types": "^6.7.0",
+ "babel-polyfill": "^6.7.4",
+ "babel-preset-es2015": "^6.6.0",
+ "babelify": "^7.3.0",
+ "babylon": "^6.7.0",
  "browserify": "^13.0.0",
- "es6-promise": "^3.0.2",
- "es6-shim": "^0.33.0",
- "eslint": "^2.2.0",
+ "es6-promise": "^3.1.2",
+ "es6-shim": "0.35.0",
+ "eslint": "^2.8.0",
  "jasmine-core": "^2.4.1",
- "karma": "^0.13.15",
- "karma-browserify": "^5.0.2",
- "karma-jasmine": "^0.3.6",
+ "karma": "^0.13.22",
+ "karma-browserify": "^5.0.4",
+ "karma-jasmine": "^0.3.8",
  "karma-phantomjs-launcher": "^1.0.0",
  "karma-source-map-support": "^1.1.0",
- "phantomjs-prebuilt": "^2.1.3",
+ "phantomjs-prebuilt": "^2.1.7",
  "reflect-metadata": "0.1.2",
- "rxjs": "5.0.0-beta.2",
- "tape": "^4.2.2",
+ "rxjs": "5.0.0-beta.6",
+ "tape": "^4.5.1",
  "watchify": "^3.7.0",
- "zone.js": "0.5.15"
+ "zone.js": "0.6.12"
  },
  "peerDependencies": {
- "babel-plugin-transform-decorators-legacy": "^1.3.3"
+ "babel-plugin-transform-decorators-legacy": "^1.3.4"
  },
  "dependencies": {
- "babel-generator": "^6.3.26"
+ "babel-generator": "^6.7.7"
  }
 }

test/integration/component.spec.js

@@ -5,17 +5,17 @@ import {
  ViewMetadata
 } from 'angular2/core';
 import {
- AsyncTestCompleter,
  beforeEach,
  describe,
  expect,
  inject,
  it,
- TestComponentBuilder,
-} from 'angular2/testing_internal';
+ async,
+ TestComponentBuilder
+} from 'angular2/testing';
 
 describe('component', () => {
- it('works with class/prop/param decorators and type annotations', inject([TestComponentBuilder, AsyncTestCompleter], (tcb, async) => {
+ it('works with class/prop/param decorators and type annotations', async(inject([TestComponentBuilder], (tcb) => {
  class Greeter {
  say(greeting, name) {
  return `${greeting}, ${name}!`;
@@ -53,8 +53,6 @@ describe('component', () => {
 
  fixture.detectChanges();
  expect(fixture.debugElement.nativeElement).toHaveText('Hello, Babel!');
- async.done();
- })
- .catch((e) => console.error(e));
- }));
+ });
+ })));
 });

test/integration/init.js

@@ -1,6 +1,12 @@
 import 'reflect-metadata';
 import 'babel-polyfill';
 
+import 'zone.js/dist/zone';
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+
 import {setBaseTestProviders} from 'angular2/testing';
 import {
  TEST_BROWSER_PLATFORM_PROVIDERS,

test/integration/parameter-decorator-alternative.spec.js

@@ -1,5 +1,5 @@
 import {
- Injector, Injectable, provide,
+ ReflectiveInjector, Injectable, provide,
  Component, Directive,
  QueryList,
  AttributeMetadata, QueryMetadata, ViewQueryMetadata,
@@ -10,20 +10,23 @@ import {
  NgFor
 } from 'angular2/common';
 import {
- AsyncTestCompleter,
  beforeEach,
  describe,
  expect,
  inject,
  it,
  xit,
+ async,
  TestComponentBuilder,
-} from 'angular2/testing_internal';
+} from 'angular2/testing';
 
 describe('parameter decorator alternatives', () => {
  describe('Directive DI', () => {
- it('works as @Attribute', inject([TestComponentBuilder, AsyncTestCompleter], (tcb, async) => {
- @Directive({ selector: 'foo' })
+ it('works as @Attribute', async(inject([TestComponentBuilder], (tcb) => {
+ @Component({
+ selector: 'foo',
+ template: '{{bar}}'
+ })
  @Reflect.metadata('parameters', [[new AttributeMetadata('bar')]])
  class Foo {
  constructor(barProp) {
@@ -42,12 +45,10 @@ describe('parameter decorator alternatives', () => {
  .then((fixture) => {
  const foo = fixture.debugElement.children[0].componentInstance;
  expect(foo.bar).toEqual('baz');
-
- async.done();
  });
- }));
+ })));
 
- it('works as @Query', inject([TestComponentBuilder, AsyncTestCompleter], (tcb, async) => {
+ it('works as @Query', async(inject([TestComponentBuilder], (tcb) => {
  @Component({
  selector: 'pane',
  inputs: ['title'],
@@ -62,7 +63,7 @@ describe('parameter decorator alternatives', () => {
  directives: [NgFor],
  template: `
  <ul>
- <li *ngFor="#pane of panes">{{pane.title}}</li>
+ <li *ngFor="let pane of panes">{{pane.title}}</li>
  </ul>
  <ng-content></ng-content>
  `
@@ -80,7 +81,7 @@ describe('parameter decorator alternatives', () => {
  template: `
  <tabs>
  <pane title="Overview">...</pane>
- <pane *ngFor="#o of objects" [title]="o.title">{{o.text}}</pane>
+ <pane *ngFor="let o of objects" [title]="o.title">{{o.text}}</pane>
  </tabs>
  `
  })
@@ -101,12 +102,10 @@ describe('parameter decorator alternatives', () => {
  expect([...listItems].map((l) => l.textContent)).toEqual(['Overview', 'foo', 'bar', 'baz']);
  const panes = tabs.nativeElement.querySelectorAll('div');
  expect([...panes].map((p) => p.textContent)).toEqual(['...', 'Foo!', 'Bar!', 'Baz!']);
-
- async.done();
  });
- }));
+ })));
 
- it('works as @ViewQuery', inject([TestComponentBuilder, AsyncTestCompleter], (tcb, async) => {
+ it('works as @ViewQuery', async(inject([TestComponentBuilder], (tcb) => {
  @Component({
  selector: 'item',
  template: '<ng-content></ng-content>'
@@ -134,19 +133,20 @@ describe('parameter decorator alternatives', () => {
  const items = fixture.componentInstance.items;
  items.changes.subscribe(() => {
  expect(items.length).toEqual(3);
-
- async.done();
  });
 
  fixture.detectChanges();
  });
- }));
+ })));
 
- it('works as @Host', inject([TestComponentBuilder, AsyncTestCompleter], (tcb, async) => {
+ it('works as @Host', async(inject([TestComponentBuilder], (tcb) => {
  class OtherService {}
  class HostService {}
 
- @Directive({ selector: 'child-directive' })
+ @Component({
+ selector: 'child-directive',
+ template: 'child'
+ })
  @Reflect.metadata('parameters', [
  [new OptionalMetadata(), new HostMetadata()],
  [new OptionalMetadata(), new HostMetadata()]
@@ -183,12 +183,9 @@ describe('parameter decorator alternatives', () => {
  const parent = fixture.debugElement.children[0];
  const childInstance = parent.children[0].componentInstance;
  expect(childInstance.os).toBeNull();
- expect(childInstance.hs).toBeAnInstanceOf(HostService)
-
- async.done();
- })
- .catch((e) => console.error(e));
- }));
+ expect(childInstance.hs).toBeAnInstanceOf(HostService);
+ });
+ })));
  });
 
  describe('Pure DI', () => {
@@ -203,7 +200,7 @@ describe('parameter decorator alternatives', () => {
  }
  }
 
- const injector = Injector.resolveAndCreate([
+ const injector = ReflectiveInjector.resolveAndCreate([
  provide('MyEngine', { useClass: Engine }),
  Car
  ]);
@@ -222,7 +219,7 @@ describe('parameter decorator alternatives', () => {
  }
  }
 
- const injector = Injector.resolveAndCreate([Car]);
+ const injector = ReflectiveInjector.resolveAndCreate([Car]);
 
  expect(injector.get(Car).engine).toBeNull();
  }));
@@ -238,10 +235,10 @@ describe('parameter decorator alternatives', () => {
  }
  }
 
- const injector = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+ const injector = ReflectiveInjector.resolveAndCreate([Dependency, NeedsDependency]);
  expect(injector.get(NeedsDependency).dependency).toBeAnInstanceOf(Dependency);
 
- const parent= Injector.resolveAndCreate([Dependency]);
+ const parent= ReflectiveInjector.resolveAndCreate([Dependency]);
  const child= parent.resolveAndCreateChild([NeedsDependency]);
  expect(() => child.get(NeedsDependency)).toThrowError();
  }));
@@ -257,10 +254,10 @@ describe('parameter decorator alternatives', () => {
  }
  }
 
- const injector = Injector.resolveAndCreate([Dependency, NeedsDependency]);
+ const injector = ReflectiveInjector.resolveAndCreate([Dependency, NeedsDependency]);
  expect(() => injector.get(NeedsDependency)).toThrowError();
 
- const parent= Injector.resolveAndCreate([Dependency]);
+ const parent= ReflectiveInjector.resolveAndCreate([Dependency]);
  const child= parent.resolveAndCreateChild([NeedsDependency]);
  expect(child.get(NeedsDependency).dependency).toBeAnInstanceOf(Dependency);
  }));

test/integration/reflection.spec.js

@@ -2,7 +2,7 @@ import {
  describe,
  expect,
  it
-} from 'angular2/testing_internal';
+} from 'angular2/testing';
 
 import {
  EventEmitter,