feat(chore): upgrade to rc4, upgrade tests

.eslintrc

@@ -363,9 +363,8 @@
     "describe": true,
     "it": true,
     "inject": true,
-    "injectAsync": true,
     "beforeEach": true,
-    "beforeEachProviders": true,
+    "addProviders": true,
     "spyOn": true,
     "expect": true,
     "global": true,

client/app/auth/components/login/login.component.spec.js

@@ -1,4 +1,4 @@
-import { TestComponentBuilder } from '@angular/compiler/testing';
+import { TestComponentBuilder } from '@angular/core/testing';
 import { FormBuilder } from '@angular/common';
 import { HTTP_PROVIDERS } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
@@ -18,13 +18,15 @@ describe('LoginComponent', () => {
   let subjectElement;
   let credentials = { email: '[email protected]', password: 'secret' };
 
-  beforeEachProviders(() => [
-    TestComponentBuilder,
-    FormBuilder,
-    HTTP_PROVIDERS,
-    AUTH_TESTING_PROVIDERS,
-    CORE_TESTING_PROVIDERS
-  ]);
+  beforeEach(() => {
+    addProviders([
+      TestComponentBuilder,
+      FormBuilder,
+      HTTP_PROVIDERS,
+      AUTH_TESTING_PROVIDERS,
+      CORE_TESTING_PROVIDERS
+    ]);
+  });
 
   beforeEach(async(inject([TestComponentBuilder], (componentBuilder) => {
     return componentBuilder

client/app/auth/services/request/request.service.spec.js

@@ -4,10 +4,9 @@ import { StorageService } from '../storage/storage.service';
 describe('RequestService', () => {
   let subject;
 
-  beforeEachProviders(() => [
-    RequestService,
-    StorageService
-  ]);
+  beforeEach(() => {
+    addProviders([RequestService, StorageService]);
+  });
 
   beforeEach(inject([RequestService], (request) => {
     subject = request;

client/app/auth/services/storage/storage.service.spec.js

@@ -11,9 +11,9 @@ describe('StorageService', () => {
     spyOn(localStorage, 'removeItem');
   });
 
-  beforeEachProviders(() => [
-    StorageService
-  ]);
+  beforeEach(() => {
+    addProviders([StorageService]);
+  });
 
   beforeEach(inject([StorageService], (storage) => {
     subject = storage;

client/app/auth/services/user/user.service.spec.js

@@ -15,12 +15,14 @@ describe('UserService', () => {
       .respond(200, JSON.stringify({ success: true, auth_token: 'secret_token' }));
   }
 
-  beforeEachProviders(() => [
-    UserService,
-    StorageService,
-    RequestService,
-    FAKE_BACKEND_PROVIDERS
-  ]);
+  beforeEach(() => {
+    addProviders([
+      UserService,
+      StorageService,
+      RequestService,
+      FAKE_BACKEND_PROVIDERS
+    ]);
+  });
 
   beforeEach(inject([Injector], (injector) => {
     subject = injector.get(UserService);

client/app/core/components/about/about.component.spec.js

@@ -1,13 +1,13 @@
-import { TestComponentBuilder } from '@angular/compiler/testing';
+import { TestComponentBuilder } from '@angular/core/testing';
 
 import { AboutComponent } from './about.component';
 
 describe('AboutComponent', () => {
   let subjectElement;
 
-  beforeEachProviders(() => [
-    TestComponentBuilder
-  ]);
+  beforeEach(() => {
+    addProviders([TestComponentBuilder]);
+  });
 
   beforeEach(async(inject([TestComponentBuilder], (componentBuilder) => {
     return componentBuilder

client/app/posts/components/post-form/post-form.component.spec.js

@@ -1,6 +1,6 @@
 import { FormBuilder } from '@angular/common';
 import { Injector, Component, EventEmitter } from '@angular/core';
-import { TestComponentBuilder } from '@angular/compiler/testing';
+import { TestComponentBuilder } from '@angular/core/testing';
 
 import { PostFormComponent } from './post-form.component';
 
@@ -42,7 +42,9 @@ describe('FormComponent', () => {
     expect(element.querySelector('#post-description').value).toBe(examplePost.description);
   }
 
-  beforeEachProviders(() => [TestComponentBuilder, FormBuilder]);
+  beforeEach(() => {
+    addProviders([TestComponentBuilder, FormBuilder]);
+  });
 
   beforeEach(inject([Injector], (injector) => {
     builder = injector.get(TestComponentBuilder);

client/app/posts/pipes/short-description.pipe.spec.js

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { TestComponentBuilder } from '@angular/compiler/testing';
+import { TestComponentBuilder } from '@angular/core/testing';
 
 import { ShortDescriptionPipe } from './short-description.pipe';
 
@@ -24,7 +24,9 @@ describe('ShortDescriptionPipe', () => {
   let pipe;
   let builder;
 
-  beforeEachProviders(() => [ShortDescriptionPipe, TestComponentBuilder]);
+  beforeEach(() => {
+    addProviders([ShortDescriptionPipe, TestComponentBuilder]);
+  });
 
   beforeEach(inject([ShortDescriptionPipe, TestComponentBuilder], (descriptionPipe, componentBuilder) => {
     pipe = descriptionPipe;

client/app/posts/services/post/post.service.spec.js

@@ -36,19 +36,21 @@ describe('PostService', () => {
     });
   }
 
-  beforeEachProviders(() => [
-    PostService,
-    MockBackend,
-    BaseRequestOptions,
-    AUTH_PROVIDERS,
-    {
-      provide: Http,
-      useFactory: (mokcBackend, defaultOptions) => {
-        return new Http(mokcBackend, defaultOptions);
-      },
-      deps: [MockBackend, BaseRequestOptions]
-    }
-  ]);
+  beforeEach(() => {
+    addProviders([
+      PostService,
+      MockBackend,
+      BaseRequestOptions,
+      AUTH_PROVIDERS,
+      {
+        provide: Http,
+        useFactory: (mokcBackend, defaultOptions) => {
+          return new Http(mokcBackend, defaultOptions);
+        },
+        deps: [MockBackend, BaseRequestOptions]
+      }
+    ]);
+  });
 
   beforeEach(inject([Injector], (injector) => {
     service = injector.get(PostService);

client/test.boot.js

@@ -4,18 +4,15 @@ import {
   TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
 } from '@angular/platform-browser-dynamic/testing';
 import {
-  setBaseTestProviders,
-  afterEach, beforeEach, beforeEachProviders,
-  describe, it, expect,
-  inject, async, tick
+  setBaseTestProviders, addProviders,
+  inject, async
 } from '@angular/core/testing';
 
 setBaseTestProviders(TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
 
 Object.assign(global, {
-  afterEach, beforeEach, beforeEachProviders,
-  describe, it, expect,
-  inject, async: async, tick
+  addProviders,
+  inject, async: async
 });
 
 let testContext = require.context('./app', true, /\.spec\.js/);

package.json

@@ -36,13 +36,14 @@
     "node-uuid": "1.4.7"
   },
   "devDependencies": {
-    "@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/router": "3.0.0-alpha.7",
+    "@angular/common": "2.0.0-rc.4",
+    "@angular/compiler": "2.0.0-rc.4",
+    "@angular/core": "2.0.0-rc.4",
+    "@angular/forms": "0.2.0",
+    "@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": "3.0.0-beta.2",
     "babel-core": "6.10.4",
     "babel-eslint": "6.1.1",
     "babel-loader": "6.2.4",