From 1678fb0128870e290a2d023f0e5a17349468d4e7 Mon Sep 17 00:00:00 2001 From: Steve Van Opstal Date: Mon, 15 Aug 2016 16:14:38 +0200 Subject: [PATCH] feat(angular): update to angular 2.0.0-rc.5 --- config/spec-imports.ts | 13 +++++--- package.json | 18 +++++------ src/assets/css/base.css | 5 +-- src/client/boot.ts | 31 ++++++++++++++----- src/client/build/build.component.spec.ts | 26 +++++++++------- .../graph/ability-sequence.component.spec.ts | 4 +-- src/client/build/graph/axes/data.spec.ts | 5 +-- src/client/build/graph/axes/level.spec.ts | 6 ++-- src/client/build/graph/axes/time.spec.ts | 4 +-- .../build/graph/graph.component.spec.ts | 4 +-- src/client/build/graph/scales/data.spec.ts | 4 +-- src/client/build/graph/scales/level.spec.ts | 4 +-- src/client/build/graph/scales/time.spec.ts | 4 +-- .../build/items/item-slot.component.spec.ts | 4 +-- src/client/build/items/item.component.spec.ts | 5 +-- .../build/items/items.component.spec.ts | 4 +-- .../masteries/masteries.component.spec.ts | 6 ++-- .../mastery-category.component.spec.ts | 6 ++-- .../masteries/mastery-tier.component.spec.ts | 6 ++-- .../build/masteries/mastery.component.spec.ts | 6 ++-- src/client/build/shop/item.component.spec.ts | 4 +-- .../build/shop/pipes/champion.pipe.spec.ts | 4 +-- src/client/build/shop/pipes/hide.pipe.spec.ts | 4 +-- src/client/build/shop/pipes/map.pipe.spec.ts | 4 +-- src/client/build/shop/pipes/name.pipe.spec.ts | 4 +-- src/client/build/shop/pipes/sort.pipe.spec.ts | 4 +-- src/client/build/shop/pipes/tags.pipe.spec.ts | 4 +-- .../build/shop/pipes/translate.pipe.spec.ts | 4 +-- .../build/shop/preview/item.component.spec.ts | 4 +-- .../shop/preview/items-from.component.spec.ts | 4 +-- .../shop/preview/preview.component.spec.ts | 4 +-- src/client/build/shop/shop.component.spec.ts | 6 ++-- src/client/champions/bar.component.spec.ts | 4 +-- .../champions/champions.component.spec.ts | 6 ++-- .../champions/filters.component.spec.ts | 6 ++-- src/client/champions/pipes/name.pipe.spec.ts | 4 +-- src/client/champions/pipes/sort.pipe.spec.ts | 4 +-- src/client/champions/pipes/tags.pipe.spec.ts | 4 +-- src/client/misc/capitalize.pipe.spec.ts | 4 +-- src/client/misc/ddragon.directive.spec.ts | 6 ++-- src/client/misc/error.component.spec.ts | 4 +-- src/client/misc/help.component.spec.ts | 4 +-- src/client/misc/loading.component.spec.ts | 4 +-- src/client/misc/lolapi.service.spec.ts | 6 ++-- src/client/misc/to-iterable.pipe.spec.ts | 4 +-- 45 files changed, 149 insertions(+), 126 deletions(-) diff --git a/config/spec-imports.ts b/config/spec-imports.ts index 7cef7be..1ab31c1 100644 --- a/config/spec-imports.ts +++ b/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); diff --git a/package.json b/package.json index 4cc7d3c..1fc78fa 100644 --- a/package.json +++ b/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" }, diff --git a/src/assets/css/base.css b/src/assets/css/base.css index 35898fe..c003d80 100644 --- a/src/assets/css/base.css +++ b/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; } diff --git a/src/client/boot.ts b/src/client/boot.ts index 638bfef..484d8ad 100644 --- a/src/client/boot.ts +++ b/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)); diff --git a/src/client/build/build.component.spec.ts b/src/client/build/build.component.spec.ts index c0a6a58..dd7622f 100644 --- a/src/client/build/build.component.spec.ts +++ b/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 + ] + }); }); diff --git a/src/client/build/graph/ability-sequence.component.spec.ts b/src/client/build/graph/ability-sequence.component.spec.ts index 8cd5b64..c5b0cdd 100644 --- a/src/client/build/graph/ability-sequence.component.spec.ts +++ b/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) => { diff --git a/src/client/build/graph/axes/data.spec.ts b/src/client/build/graph/axes/data.spec.ts index 3b4d70b..b3ec05c 100644 --- a/src/client/build/graph/axes/data.spec.ts +++ b/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) => { diff --git a/src/client/build/graph/axes/level.spec.ts b/src/client/build/graph/axes/level.spec.ts index c7fdf36..e3a4bea 100644 --- a/src/client/build/graph/axes/level.spec.ts +++ b/src/client/build/graph/axes/level.spec.ts @@ -1,4 +1,4 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {Samples} from '../../samples'; import {LevelScale} from '../scales/level'; @@ -6,7 +6,7 @@ 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) => { diff --git a/src/client/build/graph/axes/time.spec.ts b/src/client/build/graph/axes/time.spec.ts index e042690..c57cb12 100644 --- a/src/client/build/graph/axes/time.spec.ts +++ b/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) => { diff --git a/src/client/build/graph/graph.component.spec.ts b/src/client/build/graph/graph.component.spec.ts index 77007e2..f4c8dd7 100644 --- a/src/client/build/graph/graph.component.spec.ts +++ b/src/client/build/graph/graph.component.spec.ts @@ -1,5 +1,5 @@ import {ElementRef} from '@angular/core'; -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {MockElementRef} from '../../testing'; @@ -7,7 +7,7 @@ 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) => {})); diff --git a/src/client/build/graph/scales/data.spec.ts b/src/client/build/graph/scales/data.spec.ts index 6abb600..f2cb859 100644 --- a/src/client/build/graph/scales/data.spec.ts +++ b/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) => { diff --git a/src/client/build/graph/scales/level.spec.ts b/src/client/build/graph/scales/level.spec.ts index f06ae03..be7d976 100644 --- a/src/client/build/graph/scales/level.spec.ts +++ b/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) => { diff --git a/src/client/build/graph/scales/time.spec.ts b/src/client/build/graph/scales/time.spec.ts index f44be62..fde50dd 100644 --- a/src/client/build/graph/scales/time.spec.ts +++ b/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) => { diff --git a/src/client/build/items/item-slot.component.spec.ts b/src/client/build/items/item-slot.component.spec.ts index fb994ca..cd9f10e 100644 --- a/src/client/build/items/item-slot.component.spec.ts +++ b/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; diff --git a/src/client/build/items/item.component.spec.ts b/src/client/build/items/item.component.spec.ts index d372f2f..e0ab4d8 100644 --- a/src/client/build/items/item.component.spec.ts +++ b/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) => { diff --git a/src/client/build/items/items.component.spec.ts b/src/client/build/items/items.component.spec.ts index b161bfd..98fcb9a 100644 --- a/src/client/build/items/items.component.spec.ts +++ b/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) => { diff --git a/src/client/build/masteries/masteries.component.spec.ts b/src/client/build/masteries/masteries.component.spec.ts index cf25d91..e9fb51d 100644 --- a/src/client/build/masteries/masteries.component.spec.ts +++ b/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 - ]); + ]}); }); }; diff --git a/src/client/build/masteries/mastery-category.component.spec.ts b/src/client/build/masteries/mastery-category.component.spec.ts index c095f2f..c8192a7 100644 --- a/src/client/build/masteries/mastery-category.component.spec.ts +++ b/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; diff --git a/src/client/build/masteries/mastery-tier.component.spec.ts b/src/client/build/masteries/mastery-tier.component.spec.ts index ec47d35..23bc762 100644 --- a/src/client/build/masteries/mastery-tier.component.spec.ts +++ b/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; diff --git a/src/client/build/masteries/mastery.component.spec.ts b/src/client/build/masteries/mastery.component.spec.ts index 5b7827b..11ff93b 100644 --- a/src/client/build/masteries/mastery.component.spec.ts +++ b/src/client/build/masteries/mastery.component.spec.ts @@ -1,4 +1,4 @@ -import {ComponentFixture, TestComponentBuilder, addProviders, async, inject} from '@angular/core/testing'; +import {ComponentFixture, TestBed, TestComponentBuilder, async, inject} from '@angular/core/testing'; import {BaseRequestOptions, Http} from '@angular/http'; import {MockBackend} from '@angular/http/testing'; import {ActivatedRoute} from '@angular/router'; @@ -20,7 +20,7 @@ const data = { describe('MasteryComponent', () => { beforeEach(() => { - addProviders([ + TestBed.configureTestingModule({providers: [ {provide: ActivatedRoute, useValue: new MockActivatedRoute()}, BaseRequestOptions, MockBackend, { @@ -33,7 +33,7 @@ describe('MasteryComponent', () => { LolApiService, MasteriesComponent, MasteryCategoryComponent, MasteryTierComponent, MasteryComponent - ]); + ]}); }); let component: MasteryComponent; diff --git a/src/client/build/shop/item.component.spec.ts b/src/client/build/shop/item.component.spec.ts index b17289f..6d4ac69 100644 --- a/src/client/build/shop/item.component.spec.ts +++ b/src/client/build/shop/item.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {ItemComponent} from './item.component'; describe('ItemComponent', () => { beforeEach(() => { - addProviders([ItemComponent]); + TestBed.configureTestingModule({providers: [ItemComponent]}); }); it('should be initialised', inject([ItemComponent], (component) => { diff --git a/src/client/build/shop/pipes/champion.pipe.spec.ts b/src/client/build/shop/pipes/champion.pipe.spec.ts index 1d743d0..59e4a69 100644 --- a/src/client/build/shop/pipes/champion.pipe.spec.ts +++ b/src/client/build/shop/pipes/champion.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {ChampionPipe} from './champion.pipe'; describe('Shop ChampionPipe', () => { beforeEach(() => { - addProviders([ChampionPipe]); + TestBed.configureTestingModule({providers: [ChampionPipe]}); }); let items = []; diff --git a/src/client/build/shop/pipes/hide.pipe.spec.ts b/src/client/build/shop/pipes/hide.pipe.spec.ts index 03064bf..4dd0e13 100644 --- a/src/client/build/shop/pipes/hide.pipe.spec.ts +++ b/src/client/build/shop/pipes/hide.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {HidePipe} from './hide.pipe'; describe('Shop HidePipe', () => { beforeEach(() => { - addProviders([HidePipe]); + TestBed.configureTestingModule({providers: [HidePipe]}); }); let items = []; diff --git a/src/client/build/shop/pipes/map.pipe.spec.ts b/src/client/build/shop/pipes/map.pipe.spec.ts index 0684f12..5f30061 100644 --- a/src/client/build/shop/pipes/map.pipe.spec.ts +++ b/src/client/build/shop/pipes/map.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {MapPipe} from './map.pipe'; describe('Shop MapPipe', () => { beforeEach(() => { - addProviders([MapPipe]); + TestBed.configureTestingModule({providers: [MapPipe]}); }); let items = []; diff --git a/src/client/build/shop/pipes/name.pipe.spec.ts b/src/client/build/shop/pipes/name.pipe.spec.ts index b1e18d5..8bd4357 100644 --- a/src/client/build/shop/pipes/name.pipe.spec.ts +++ b/src/client/build/shop/pipes/name.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {NamePipe} from './name.pipe'; describe('NamePipe', () => { beforeEach(() => { - addProviders([NamePipe]); + TestBed.configureTestingModule({providers: [NamePipe]}); }); let champions = []; diff --git a/src/client/build/shop/pipes/sort.pipe.spec.ts b/src/client/build/shop/pipes/sort.pipe.spec.ts index a7de04d..1d4cf47 100644 --- a/src/client/build/shop/pipes/sort.pipe.spec.ts +++ b/src/client/build/shop/pipes/sort.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {SortPipe} from './sort.pipe'; describe('Shop SortPipe', () => { beforeEach(() => { - addProviders([SortPipe]); + TestBed.configureTestingModule({providers: [SortPipe]}); }); let items = []; diff --git a/src/client/build/shop/pipes/tags.pipe.spec.ts b/src/client/build/shop/pipes/tags.pipe.spec.ts index 6b022c2..5089636 100644 --- a/src/client/build/shop/pipes/tags.pipe.spec.ts +++ b/src/client/build/shop/pipes/tags.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {TagsPipe} from './tags.pipe'; describe('Shop TagsPipe', () => { beforeEach(() => { - addProviders([TagsPipe]); + TestBed.configureTestingModule({providers: [TagsPipe]}); }); let items = []; diff --git a/src/client/build/shop/pipes/translate.pipe.spec.ts b/src/client/build/shop/pipes/translate.pipe.spec.ts index 38db507..08b54de 100644 --- a/src/client/build/shop/pipes/translate.pipe.spec.ts +++ b/src/client/build/shop/pipes/translate.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {TranslatePipe} from './translate.pipe'; describe('Shop TranslatePipe', () => { beforeEach(() => { - addProviders([TranslatePipe]); + TestBed.configureTestingModule({providers: [TranslatePipe]}); }); it('should translate', inject([TranslatePipe], (pipe) => { diff --git a/src/client/build/shop/preview/item.component.spec.ts b/src/client/build/shop/preview/item.component.spec.ts index a7765c2..acbd071 100644 --- a/src/client/build/shop/preview/item.component.spec.ts +++ b/src/client/build/shop/preview/item.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {ItemComponent} from './item.component'; describe('ItemComponent', () => { beforeEach(() => { - addProviders([ItemComponent]); + TestBed.configureTestingModule({providers: [ItemComponent]}); }); it('should be initialised', inject([ItemComponent], (component) => { diff --git a/src/client/build/shop/preview/items-from.component.spec.ts b/src/client/build/shop/preview/items-from.component.spec.ts index 576176a..32b07d1 100644 --- a/src/client/build/shop/preview/items-from.component.spec.ts +++ b/src/client/build/shop/preview/items-from.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {ItemsFromComponent} from './items-from.component'; describe('ItemsFromComponent', () => { beforeEach(() => { - addProviders([ItemsFromComponent]); + TestBed.configureTestingModule({providers: [ItemsFromComponent]}); }); it('should be initialised', inject([ItemsFromComponent], (component) => { diff --git a/src/client/build/shop/preview/preview.component.spec.ts b/src/client/build/shop/preview/preview.component.spec.ts index bb28030..1264f7e 100644 --- a/src/client/build/shop/preview/preview.component.spec.ts +++ b/src/client/build/shop/preview/preview.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {PreviewComponent} from './preview.component'; describe('PreviewComponent', () => { beforeEach(() => { - addProviders([PreviewComponent]); + TestBed.configureTestingModule({providers: [PreviewComponent]}); }); let item1 = {id: 1, from: ['2', '3']}; diff --git a/src/client/build/shop/shop.component.spec.ts b/src/client/build/shop/shop.component.spec.ts index 76be1f8..3553c06 100644 --- a/src/client/build/shop/shop.component.spec.ts +++ b/src/client/build/shop/shop.component.spec.ts @@ -1,5 +1,5 @@ import {provide} from '@angular/core'; -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'; @@ -15,7 +15,7 @@ class MockEvent { describe('ShopComponent', () => { beforeEach(() => { - addProviders([ + TestBed.configureTestingModule({providers: [ {provide: ActivatedRoute, useValue: new MockActivatedRoute()}, BaseRequestOptions, {provide: MockBackend, useValue: new MockMockBackend()}, { @@ -29,7 +29,7 @@ describe('ShopComponent', () => { provide(Event, {useValue: new MockEvent()}), LolApiService, ShopComponent - ]); + ]}); }); // let pickedItem1 = {id: 1, group: 'PinkWards'}; diff --git a/src/client/champions/bar.component.spec.ts b/src/client/champions/bar.component.spec.ts index b57f68e..eeb159b 100644 --- a/src/client/champions/bar.component.spec.ts +++ b/src/client/champions/bar.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {BarComponent} from './bar.component'; describe('BarComponent', () => { beforeEach(() => { - addProviders([BarComponent]); + TestBed.configureTestingModule({providers: [BarComponent]}); }); it('should be initialised', inject([BarComponent], (component) => { diff --git a/src/client/champions/champions.component.spec.ts b/src/client/champions/champions.component.spec.ts index 2ebaf46..8ff87c1 100644 --- a/src/client/champions/champions.component.spec.ts +++ b/src/client/champions/champions.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, Router} from '@angular/router'; @@ -10,7 +10,7 @@ import {ChampionsComponent} from './champions.component'; describe('ChampionsComponent', () => { beforeEach(() => { - addProviders([ + TestBed.configureTestingModule({providers: [ {provide: ActivatedRoute, useValue: new MockActivatedRoute()}, BaseRequestOptions, {provide: MockBackend, useValue: new MockMockBackend()}, { @@ -24,7 +24,7 @@ describe('ChampionsComponent', () => { {provide: Router, useValue: new MockRouter()}, LolApiService, ChampionsComponent - ]); + ]}); }); it('should call getData() on contruct', inject([ChampionsComponent], (component) => { diff --git a/src/client/champions/filters.component.spec.ts b/src/client/champions/filters.component.spec.ts index 8c8d416..969bf51 100644 --- a/src/client/champions/filters.component.spec.ts +++ b/src/client/champions/filters.component.spec.ts @@ -1,5 +1,5 @@ import {provide} from '@angular/core'; -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {MockEvent, MockKeyboardEvent} from '../testing'; @@ -7,10 +7,10 @@ import {FiltersComponent} from './filters.component'; describe('FiltersComponent', () => { beforeEach(() => { - addProviders([ + TestBed.configureTestingModule({providers: [ provide(Event, {useValue: new MockEvent()}), provide(KeyboardEvent, {useValue: new MockKeyboardEvent()}), FiltersComponent - ]); + ]}); }); it('should not emit tagsChange on incorrect event', diff --git a/src/client/champions/pipes/name.pipe.spec.ts b/src/client/champions/pipes/name.pipe.spec.ts index b1c7d91..babfd50 100644 --- a/src/client/champions/pipes/name.pipe.spec.ts +++ b/src/client/champions/pipes/name.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {NamePipe} from './name.pipe'; describe('NamePipe', () => { beforeEach(() => { - addProviders([NamePipe]); + TestBed.configureTestingModule({providers: [NamePipe]}); }); let champions = []; diff --git a/src/client/champions/pipes/sort.pipe.spec.ts b/src/client/champions/pipes/sort.pipe.spec.ts index 55ad872..788a9bd 100644 --- a/src/client/champions/pipes/sort.pipe.spec.ts +++ b/src/client/champions/pipes/sort.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {SortPipe} from './sort.pipe'; describe('SortPipe', () => { beforeEach(() => { - addProviders([SortPipe]); + TestBed.configureTestingModule({providers: [SortPipe]}); }); let champions = []; diff --git a/src/client/champions/pipes/tags.pipe.spec.ts b/src/client/champions/pipes/tags.pipe.spec.ts index b106436..b75ae2d 100644 --- a/src/client/champions/pipes/tags.pipe.spec.ts +++ b/src/client/champions/pipes/tags.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {TagsPipe} from './tags.pipe'; describe('TagsPipe', () => { beforeEach(() => { - addProviders([TagsPipe]); + TestBed.configureTestingModule({providers: [TagsPipe]}); }); let champions = []; diff --git a/src/client/misc/capitalize.pipe.spec.ts b/src/client/misc/capitalize.pipe.spec.ts index 1fcac67..976021b 100644 --- a/src/client/misc/capitalize.pipe.spec.ts +++ b/src/client/misc/capitalize.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {CapitalizePipe} from './capitalize.pipe'; describe('CapitalizePipe', () => { beforeEach(() => { - addProviders([CapitalizePipe]); + TestBed.configureTestingModule({providers: [CapitalizePipe]}); }); it('should capitalize', inject([CapitalizePipe], (pipe) => { diff --git a/src/client/misc/ddragon.directive.spec.ts b/src/client/misc/ddragon.directive.spec.ts index 0bc7eaa..bbad94c 100644 --- a/src/client/misc/ddragon.directive.spec.ts +++ b/src/client/misc/ddragon.directive.spec.ts @@ -1,5 +1,5 @@ import {ElementRef} from '@angular/core'; -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'; @@ -57,7 +57,7 @@ let realm = { function addCommonProviders(elementRefType: {new (): T}) { - addProviders([ + TestBed.configureTestingModule({providers: [ {provide: ElementRef, useValue: new elementRefType()}, {provide: ActivatedRoute, useValue: new MockActivatedRoute()}, @@ -71,7 +71,7 @@ function addCommonProviders(elementRefType: {new (): T}) { }, LolApiService, DDragonDirective - ]); + ]}); } describe('DDragonDirective:style', () => { diff --git a/src/client/misc/error.component.spec.ts b/src/client/misc/error.component.spec.ts index e32f9f3..9b63859 100644 --- a/src/client/misc/error.component.spec.ts +++ b/src/client/misc/error.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {ErrorComponent} from './error.component'; describe('ErrorComponent', () => { beforeEach(() => { - addProviders([ErrorComponent]); + TestBed.configureTestingModule({providers: [ErrorComponent]}); }); it('should be initialised', inject([ErrorComponent], (component) => { diff --git a/src/client/misc/help.component.spec.ts b/src/client/misc/help.component.spec.ts index 6cbd62b..507a2e0 100644 --- a/src/client/misc/help.component.spec.ts +++ b/src/client/misc/help.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {HelpComponent} from './help.component'; describe('HelpComponent', () => { beforeEach(() => { - addProviders([HelpComponent]); + TestBed.configureTestingModule({providers: [HelpComponent]}); }); it('should be initialised', inject([HelpComponent], (component) => { diff --git a/src/client/misc/loading.component.spec.ts b/src/client/misc/loading.component.spec.ts index 1b74f2d..d240a95 100644 --- a/src/client/misc/loading.component.spec.ts +++ b/src/client/misc/loading.component.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {LoadingComponent} from './loading.component'; describe('LoadingComponent', () => { beforeEach(() => { - addProviders([LoadingComponent]); + TestBed.configureTestingModule({providers: [LoadingComponent]}); }); it('should be initialised', inject([LoadingComponent], (component) => { diff --git a/src/client/misc/lolapi.service.spec.ts b/src/client/misc/lolapi.service.spec.ts index c850c8f..fd7c852 100644 --- a/src/client/misc/lolapi.service.spec.ts +++ b/src/client/misc/lolapi.service.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, Params} from '@angular/router'; @@ -9,7 +9,7 @@ import {MockActivatedRoute, MockMockBackend} from '../testing'; describe('LolApiService', () => { beforeEach(() => { - addProviders([ + TestBed.configureTestingModule({providers: [ {provide: ActivatedRoute, useValue: new MockActivatedRoute()}, BaseRequestOptions, {provide: MockBackend, useValue: new MockMockBackend()}, { @@ -21,7 +21,7 @@ describe('LolApiService', () => { }, LolApiService - ]); + ]}); }); beforeEach(async(inject([MockBackend], (mockBackend) => { diff --git a/src/client/misc/to-iterable.pipe.spec.ts b/src/client/misc/to-iterable.pipe.spec.ts index 02c693f..91b2afb 100644 --- a/src/client/misc/to-iterable.pipe.spec.ts +++ b/src/client/misc/to-iterable.pipe.spec.ts @@ -1,10 +1,10 @@ -import {addProviders, inject} from '@angular/core/testing'; +import {TestBed, inject} from '@angular/core/testing'; import {ToIterablePipe} from './to-iterable.pipe'; describe('ToIterablePipe', () => { beforeEach(() => { - addProviders([ToIterablePipe]); + TestBed.configureTestingModule({providers: [ToIterablePipe]}); }); it('should transform object to array', inject([ToIterablePipe], (pipe) => {