Skip to content

Commit 1480b0c

Browse files
committed
chore(@angular): Bump @angular version to rc4
Update @angular to rc4 Update karma libraries Update SystemJS Update TypeScript Update TSLint Update Typings Remove `MockLocationStrategy` references and usages from `sign-in.component.spec.ts`, `sign-up.component.spec.ts` and `app.component.spec.ts`
1 parent fce8c66 commit 1480b0c

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
},
2323
"private": true,
2424
"dependencies": {
25-
"@angular/common": "2.0.0-rc.3",
26-
"@angular/compiler": "2.0.0-rc.3",
27-
"@angular/core": "2.0.0-rc.3",
25+
"@angular/common": "2.0.0-rc.4",
26+
"@angular/compiler": "2.0.0-rc.4",
27+
"@angular/core": "2.0.0-rc.4",
2828
"@angular/forms": "^0.2.0",
29-
"@angular/http": "^2.0.0-rc.3",
30-
"@angular/platform-browser": "2.0.0-rc.3",
31-
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
29+
"@angular/http": "^2.0.0-rc.4",
30+
"@angular/platform-browser": "2.0.0-rc.4",
31+
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
3232
"@angular/router": "3.0.0-alpha.7",
3333
"@angular2-material/button": "^2.0.0-alpha.6",
3434
"@angular2-material/card": "^2.0.0-alpha.6",
@@ -49,7 +49,7 @@
4949
"es6-shim": "^0.35.0",
5050
"reflect-metadata": "0.1.3",
5151
"rxjs": "5.0.0-beta.6",
52-
"systemjs": "0.19.26",
52+
"systemjs": "0.19.31",
5353
"zone.js": "^0.6.12"
5454
},
5555
"devDependencies": {
@@ -65,10 +65,10 @@
6565
"ember-cli-inject-live-reload": "^1.4.0",
6666
"jasmine-core": "^2.4.1",
6767
"jasmine-spec-reporter": "^2.4.0",
68-
"karma": "^0.13.15",
69-
"karma-chrome-launcher": "^0.2.3",
68+
"karma": "^1.1.1",
69+
"karma-chrome-launcher": "^1.0.1",
7070
"karma-coverage": "^1.0.0",
71-
"karma-jasmine": "^0.3.8",
71+
"karma-jasmine": "^1.0.2",
7272
"karma-mocha-reporter": "^2.0.3",
7373
"karma-phantomjs-launcher": "^1.0.0",
7474
"karma-sourcemap-loader": "^0.3.7",
@@ -77,9 +77,9 @@
7777
"protractor-cucumber-framework": "^0.5.0",
7878
"remap-istanbul": "^0.6.4",
7979
"ts-node": "^0.5.5",
80-
"tslint": "^3.6.0",
81-
"typescript": "^1.8.10",
82-
"typings": "^0.8.1"
80+
"tslint": "^3.13.0",
81+
"typescript": "^2.0.0",
82+
"typings": "^1.3.1"
8383
},
8484
"config": {
8585
"commitizen": {

src/app/+sign-in/sign-in.component.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99

1010
import { ActivatedRoute, DefaultUrlSerializer, Router, RouterConfig, RouterOutletMap, UrlSerializer } from '@angular/router';
1111
import { Location, LocationStrategy } from '@angular/common';
12-
import { MockLocationStrategy } from '@angular/common/testing/mock_location_strategy';
1312
import { SpyLocation } from '@angular/common/testing';
1413

1514
import { By } from '@angular/platform-browser';
@@ -32,7 +31,6 @@ describe('Component: SignIn', () => {
3231
RouterOutletMap,
3332
{provide: UrlSerializer, useClass: DefaultUrlSerializer},
3433
{provide: Location, useClass: SpyLocation},
35-
{provide: LocationStrategy, useClass: MockLocationStrategy},
3634
{
3735
provide: Router,
3836
useFactory: (resolver: ComponentResolver, urlSerializer: UrlSerializer, outletMap: RouterOutletMap, location: Location, injector: Injector) => {

src/app/+sign-up/sign-up.component.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ import {
44
describe,
55
expect,
66
it,
7-
inject,
8-
injectAsync,
7+
inject
98
} from '@angular/core/testing';
109

1110
import { ActivatedRoute, DefaultUrlSerializer, Router, RouterConfig, RouterOutletMap, UrlSerializer } from '@angular/router';
1211
import { Location, LocationStrategy } from '@angular/common';
1312
import { Observable } from 'rxjs/Observable';
14-
import { MockLocationStrategy } from '@angular/common/testing/mock_location_strategy';
1513
import { SpyLocation } from '@angular/common/testing';
1614

1715
import { By } from '@angular/platform-browser';
@@ -51,7 +49,6 @@ describe('Component: SignUp', () => {
5149
RouterOutletMap,
5250
{provide: UrlSerializer, useClass: DefaultUrlSerializer},
5351
{provide: Location, useClass: SpyLocation},
54-
{provide: LocationStrategy, useClass: MockLocationStrategy},
5552
{
5653
provide: Router,
5754
useFactory: (resolver: ComponentResolver, urlSerializer: UrlSerializer, outletMap: RouterOutletMap, location: Location, injector: Injector) => {

src/app/app.component.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
import { ActivatedRoute, DefaultUrlSerializer, Router, RouterConfig, RouterOutletMap, UrlSerializer } from '@angular/router';
1010
import { Location, LocationStrategy } from '@angular/common';
1111
import { Observable } from 'rxjs/Observable';
12-
import { MockLocationStrategy } from '@angular/common/testing/mock_location_strategy';
1312
import { SpyLocation } from '@angular/common/testing';
1413

1514
import { Component, provide, ComponentResolver, Injector } from '@angular/core';
@@ -30,7 +29,6 @@ beforeEachProviders(() => {
3029
RouterOutletMap,
3130
{provide: UrlSerializer, useClass: DefaultUrlSerializer},
3231
{provide: Location, useClass: SpyLocation},
33-
{provide: LocationStrategy, useClass: MockLocationStrategy},
3432
{
3533
provide: Router,
3634
useFactory: (resolver: ComponentResolver, urlSerializer: UrlSerializer, outletMap: RouterOutletMap, location: Location, injector: Injector) => {

0 commit comments

Comments
 (0)