feat(angular): update to angular 2.0.0-rc.5

config/spec-imports.ts

@@ -8,10 +8,13 @@ import 'zone.js/dist/sync-test';
 import 'rxjs/Rx';
 import './jasmine-matchers.js';
 
-import * as testing from '@angular/core/testing';
-import {TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS, TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic/testing';
+import {TestBed} from '@angular/core/testing';
+import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
 
-testing.setBaseTestProviders(
-    TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
+TestBed.initTestEnvironment(
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting()
+    );
 
-Object.assign(global, testing);
+
+Object.assign(global, TestBed);

package.json

@@ -81,13 +81,13 @@
     "release": "./node_modules/.bin/standard-version && npm run reddit-release"
   },
   "dependencies": {
-    "@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": "3.0.0-beta.2",
+    "@angular/common": "2.0.0-rc.5",
+    "@angular/compiler": "2.0.0-rc.5",
+    "@angular/core": "2.0.0-rc.5",
+    "@angular/http": "2.0.0-rc.5",
+    "@angular/platform-browser": "2.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
+    "@angular/router": "3.0.0-rc.1",
     "async": "2.0.1",
     "chalk": "1.1.3",
     "core-js": "2.4.1",
@@ -98,8 +98,8 @@
     "dateformat": "1.0.12",
     "es6-shim": "0.35.1",
     "lru-cache": "4.0.1",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.10",
+    "reflect-metadata": "0.1.8",
+    "rxjs": "5.0.0-beta.6",
     "typescript": "^2.0.0-beta",
     "zone.js": "0.6.12"
   },

src/assets/css/base.css

@@ -34,13 +34,14 @@ p {
 
 .beta {
   transform: rotate(20deg);
-  position: absolute;
-  margin-left: -30px;
+  margin-left: -25px;
+  margin-right: -15px;
   margin-top: -4px;
   padding: 2px 5px;
   background-color: #246935;
   color: white;
   border-radius: 5px;
+  height: 20px;
 }
 
 

src/client/boot.ts

@@ -18,19 +18,34 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import {PLATFORM_DIRECTIVES, enableProdMode, provide} from '@angular/core';
+import {NgModule, enableProdMode} from '@angular/core';
 import {HTTP_BINDINGS} from '@angular/http';
-import {bootstrap} from '@angular/platform-browser-dynamic';
+import {BrowserModule} from '@angular/platform-browser';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {ROUTER_DIRECTIVES} from '@angular/router';
 
+import {AppComponent} from './app.component';
+import {APP_ROUTER_PROVIDERS} from './app.routes';
+
+import {BuildComponent} from './build/build.component';
+import {ChampionsComponent} from './champions/champions.component';
+import {FeaturesComponent} from './features/features.component';
+import {RegionsComponent} from './region/region.component';
+
 if (ENV === 'production') {
   enableProdMode();
 }
 
-import {AppComponent} from './app.component';
-import {APP_ROUTER_PROVIDERS} from './app.routes';
+@NgModule({
+  declarations: [
+    ROUTER_DIRECTIVES, AppComponent, BuildComponent, ChampionsComponent, FeaturesComponent,
+    RegionsComponent
+  ],
+  imports: [BrowserModule],
+  providers: [APP_ROUTER_PROVIDERS, HTTP_BINDINGS],
+  bootstrap: [AppComponent]
+})
+class AppModule {
+}
 
-bootstrap(AppComponent, [
-  HTTP_BINDINGS, APP_ROUTER_PROVIDERS,
-  provide(PLATFORM_DIRECTIVES, {useValue: ROUTER_DIRECTIVES, multi: true})
-]).catch(err => console.error(err));
+platformBrowserDynamic().bootstrapModule(AppModule).catch(err => console.error(err));

src/client/build/build.component.spec.ts

@@ -1,4 +1,4 @@
-import {addProviders, async, inject} from '@angular/core/testing';
+import {TestBed, async, inject} from '@angular/core/testing';
 import {BaseRequestOptions, Http} from '@angular/http';
 import {MockBackend} from '@angular/http/testing';
 import {ActivatedRoute} from '@angular/router';
@@ -10,19 +10,21 @@ import {BuildComponent} from './build.component';
 
 describe('BuildComponent', () => {
   beforeEach(() => {
-    addProviders([
-      {provide: ActivatedRoute, useValue: new MockActivatedRoute()},
-
-      BaseRequestOptions, {provide: MockBackend, useValue: new MockMockBackend()}, {
-        provide: Http,
-        useFactory: (backend, defaultOptions) => {
-          return new Http(backend, defaultOptions);
+    TestBed.configureTestingModule({
+      providers: [
+        {provide: ActivatedRoute, useValue: new MockActivatedRoute()},
+
+        BaseRequestOptions, {provide: MockBackend, useValue: new MockMockBackend()}, {
+          provide: Http,
+          useFactory: (backend, defaultOptions) => {
+            return new Http(backend, defaultOptions);
+          },
+          deps: [MockBackend, BaseRequestOptions]
         },
-        deps: [MockBackend, BaseRequestOptions]
-      },
 
-      LolApiService, BuildComponent
-    ]);
+        LolApiService, BuildComponent
+      ]
+    });
   });
 
 

src/client/build/graph/ability-sequence.component.spec.ts

@@ -1,10 +1,10 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {AbilitySequenceComponent} from './ability-sequence.component';
 
 describe('AbilitySequenceComponent', () => {
   beforeEach(() => {
-    addProviders([AbilitySequenceComponent]);
+    TestBed.configureTestingModule({providers: [AbilitySequenceComponent]});
   });
 
   beforeEach(inject([AbilitySequenceComponent], (component) => {

src/client/build/graph/axes/data.spec.ts

@@ -1,11 +1,12 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {DataScale} from '../scales/data';
 import {DataAxis} from './data';
 
 describe('DataAxis', () => {
   beforeEach(() => {
-    addProviders([DataAxis]);
+    TestBed.configureTestingModule({
+      providers: [DataAxis]});
   });
 
   it('should set axis on create', inject([DataAxis], (component) => {

src/client/build/graph/axes/level.spec.ts

@@ -1,12 +1,12 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {Samples} from '../../samples';
 import {LevelScale} from '../scales/level';
 import {LevelAxisLine, LevelAxisText} from './level';
 
 describe('LevelAxisLine', () => {
   beforeEach(() => {
-    addProviders([LevelAxisLine]);
+    TestBed.configureTestingModule({providers: [LevelAxisLine]});
   });
 
   it('should set axis on create', inject([LevelAxisLine], (component) => {
@@ -24,7 +24,7 @@ describe('LevelAxisLine', () => {
 
 describe('LevelAxisText', () => {
   beforeEach(() => {
-    addProviders([LevelAxisText]);
+    TestBed.configureTestingModule({providers: [LevelAxisText]});
   });
 
   it('should set axis on create', inject([LevelAxisText], (component) => {

src/client/build/graph/axes/time.spec.ts

@@ -1,11 +1,11 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {TimeScale} from '../scales/time';
 import {TimeAxis} from './time';
 
 describe('TimeAxis', () => {
   beforeEach(() => {
-    addProviders([TimeAxis]);
+    TestBed.configureTestingModule({providers: [TimeAxis]});
   });
 
   it('should set axis on create', inject([TimeAxis], (component) => {

src/client/build/graph/graph.component.spec.ts

@@ -1,13 +1,13 @@
 import {ElementRef} from '@angular/core';
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {MockElementRef} from '../../testing';
 
 import {GraphComponent} from './graph.component';
 
 describe('GraphComponent', () => {
   beforeEach(() => {
-    addProviders([GraphComponent, {provide: ElementRef, useValue: new MockElementRef()}]);
+    TestBed.configureTestingModule({providers: [GraphComponent, {provide: ElementRef, useValue: new MockElementRef()}]});
   });
 
   it('should initialise', inject([GraphComponent], (component) => {}));

src/client/build/graph/scales/data.spec.ts

@@ -1,10 +1,10 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {DataScale} from './data';
 
 describe('DataScale', () => {
   beforeEach(() => {
-    addProviders([DataScale]);
+    TestBed.configureTestingModule({providers: [DataScale]});
   });
 
   it('should set scale on create', inject([DataScale], (component) => {

src/client/build/graph/scales/level.spec.ts

@@ -1,11 +1,11 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {Samples} from '../../samples';
 import {LevelScale} from './level';
 
 describe('LevelScale', () => {
   beforeEach(() => {
-    addProviders([LevelScale]);
+    TestBed.configureTestingModule({providers: [LevelScale]});
   });
 
   it('should set scale on create', inject([LevelScale], (component) => {

src/client/build/graph/scales/time.spec.ts

@@ -1,10 +1,10 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {TimeScale} from './time';
 
 describe('TimeScale', () => {
   beforeEach(() => {
-    addProviders([TimeScale]);
+    TestBed.configureTestingModule({providers: [TimeScale]});
   });
 
   it('should set scale on create', inject([TimeScale], (component) => {

src/client/build/items/item-slot.component.spec.ts

@@ -1,4 +1,4 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {settings} from '../../../../config/settings';
 
@@ -7,7 +7,7 @@ import {ItemsComponent} from './items.component';
 
 describe('ItemSlotComponent', () => {
   beforeEach(() => {
-    addProviders([ItemsComponent, ItemSlotComponent]);
+    TestBed.configureTestingModule({providers: [ItemsComponent, ItemSlotComponent]});
   });
 
   let item1;

src/client/build/items/item.component.spec.ts

@@ -1,13 +1,14 @@
 import {ElementRef} from '@angular/core';
 
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 import {MockElementRef} from '../../testing';
 
 import {ItemComponent} from './item.component';
 
 describe('ItemComponent', () => {
   beforeEach(() => {
-    addProviders([ItemComponent, {provide: ElementRef, useValue: new MockElementRef()}]);
+    TestBed.configureTestingModule(
+        {providers: [ItemComponent, {provide: ElementRef, useValue: new MockElementRef()}]});
   });
 
   it('should be initialised', inject([ItemComponent], (component) => {

src/client/build/items/items.component.spec.ts

@@ -1,4 +1,4 @@
-import {addProviders, inject} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
 import {ItemsComponent} from './items.component';
 
@@ -8,7 +8,7 @@ import {ItemsComponent} from './items.component';
 
 describe('ItemsComponent', () => {
   beforeEach(() => {
-    addProviders([ItemsComponent]);
+    TestBed.configureTestingModule({providers: [ItemsComponent]});
   });
 
   beforeEach(inject([ItemsComponent], (component) => {

src/client/build/masteries/masteries.component.spec.ts

@@ -1,4 +1,4 @@
-import {ComponentFixture, TestComponentBuilder, addProviders, async, inject} from '@angular/core/testing';
+import {ComponentFixture, TestComponentBuilder, TestBed, async, inject} from '@angular/core/testing';
 import {BaseRequestOptions, Http} from '@angular/http';
 import {MockBackend} from '@angular/http/testing';
 import {ActivatedRoute} from '@angular/router';
@@ -71,7 +71,7 @@ const masteriesDataAltered = [
 
 let providers = () => {
   beforeEach(() => {
-    addProviders([
+    TestBed.configureTestingModule({providers: [
       {provide: ActivatedRoute, useValue: new MockActivatedRoute()},
 
       BaseRequestOptions, {provide: MockBackend, useValue: new MockMockBackend()}, {
@@ -83,7 +83,7 @@ let providers = () => {
       },
 
       LolApiService, MasteryCategoryComponent, MasteriesComponent
-    ]);
+    ]});
   });
 };
 

src/client/build/masteries/mastery-category.component.spec.ts

@@ -1,4 +1,4 @@
-import {ComponentFixture, TestComponentBuilder, addProviders, async, inject} from '@angular/core/testing';
+import {ComponentFixture, TestComponentBuilder, TestBed, async, inject} from '@angular/core/testing';
 import {BaseRequestOptions, Http} from '@angular/http';
 import {MockBackend} from '@angular/http/testing';
 import {ActivatedRoute} from '@angular/router';
@@ -26,7 +26,7 @@ const data = {
 
 describe('MasteryCategoryComponent', () => {
   beforeEach(() => {
-    addProviders([
+    TestBed.configureTestingModule({providers: [
       {provide: ActivatedRoute, useValue: new MockActivatedRoute()},
 
       BaseRequestOptions, MockBackend, {
@@ -40,7 +40,7 @@ describe('MasteryCategoryComponent', () => {
       LolApiService,
 
       MasteriesComponent, MasteryCategoryComponent
-    ]);
+    ]});
   });
 
   let component: MasteryCategoryComponent;

src/client/build/masteries/mastery-tier.component.spec.ts

@@ -1,4 +1,4 @@
-import {ComponentFixture, TestComponentBuilder, addProviders, async, inject} from '@angular/core/testing';
+import {ComponentFixture, TestComponentBuilder, TestBed, async, inject} from '@angular/core/testing';
 import {BaseRequestOptions, Http} from '@angular/http';
 import {MockBackend} from '@angular/http/testing';
 import {ActivatedRoute} from '@angular/router';
@@ -16,7 +16,7 @@ const data = [
 
 describe('MasteryTierComponent', () => {
   beforeEach(() => {
-    addProviders([
+    TestBed.configureTestingModule({providers: [
       {provide: ActivatedRoute, useValue: new MockActivatedRoute()},
 
       BaseRequestOptions, MockBackend, {
@@ -28,7 +28,7 @@ describe('MasteryTierComponent', () => {
       },
 
       LolApiService, MasteryCategoryComponent, MasteryTierComponent
-    ]);
+    ]});
   });
 
   let component: MasteryTierComponent;