Upgrade angular cli to fix security vulnerability

Author: tommysitu

package-lock.json

@@ -12,28 +12,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-redux/form": "^6.1.1",
-    "@angular-redux/store": "^6.1.0",
-    "@angular/animations": "^4.0.0",
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/forms": "^4.0.0",
-    "@angular/http": "^4.0.0",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "@angular/router": "^4.0.0",
-    "core-js": "^2.4.1",
-    "immutable": "^3.8.1",
-    "ngx-bootstrap": "^1.7.1",
-    "redux": "^3.6.0",
-    "rxjs": "^5.1.0",
-    "zone.js": "^0.8.4"
+    "@angular-redux/form": "6.1.1",
+    "@angular-redux/store": "6.1.0",
+    "@angular/animations": "4.0.0",
+    "@angular/common": "4.0.0",
+    "@angular/compiler": "4.0.0",
+    "@angular/core": "4.0.0",
+    "@angular/forms": "4.0.0",
+    "@angular/http": "4.0.0",
+    "@angular/platform-browser": "4.0.0",
+    "@angular/platform-browser-dynamic": "4.0.0",
+    "@angular/router": "4.0.0",
+    "core-js": "2.4.1",
+    "immutable": "3.8.1",
+    "ngx-bootstrap": "1.7.1",
+    "redux": "3.6.0",
+    "rxjs": "5.1.0",
+    "zone.js": "0.8.4"
   },
   "devDependencies": {
-    "@angular/cli": "1.1.0",
-    "@angular/compiler-cli": "^4.0.0",
-    "@angular/language-service": "^4.0.0",
+    "@angular/cli": "1.6.7",
+    "@angular/compiler-cli": "4.0.0",
+    "@angular/language-service": "4.0.0",
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "codelyzer": "~3.0.1",
@@ -42,9 +42,9 @@
     "karma": "~1.7.0",
     "karma-chrome-launcher": "~2.1.1",
     "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "1.2.1",
     "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-jasmine-html-reporter": "0.2.2",
     "protractor": "~5.1.2",
     "ts-node": "~3.0.4",
     "tslint": "~5.3.2",

package.json

@@ -1,9 +1,8 @@
 
 import { API_ERRORS, notifyError } from './error-handling';
-import { mockErrorResponse } from '../testing/http-helper';
 import { NotificationService } from '../../components/notifications/notification.service';
-import createSpy = jasmine.createSpy;
 import { MockNotificationService } from '../testing/mock-helper.spec';
+import { mockErrorResponse } from '../testing/http-helper.spec';
 describe('Http error handler', () => {
   let service: NotificationService;
 

src/app/shared/http/error-handling.spec.ts

@@ -5,15 +5,11 @@ import {
   BaseRequestOptions, ConnectionBackend, Http, RequestOptions, ResponseOptions, Response,
   RequestMethod
 } from '@angular/http';
-import createSpy = jasmine.createSpy;
 import { Router } from '@angular/router';
-import { NgRedux } from '@angular-redux/store';
-import { AppState } from 'app/app.state';
-import { mockErrorResponse } from '../testing/http-helper';
-import { HOVERFLY_ACTIONS } from './hoverfly.service';
 import { API_ERRORS } from '../http/error-handling';
 import { MockNotificationService, MockRouter } from '../testing/mock-helper.spec';
 import { NotificationService } from '../../components/notifications/notification.service';
+import { mockErrorResponse } from '../testing/http-helper.spec';
 
 describe('Service: Auth', () => {
 

src/app/shared/services/auth.service.spec.ts

@@ -12,10 +12,10 @@ import {
 import { HOVERFLY_ACTIONS, HoverflyService } from './hoverfly.service';
 import { NgRedux } from '@angular-redux/store';
 import { AppState } from '../../app.state';
-import { mockErrorResponse } from '../testing/http-helper';
 import { API_ERRORS } from '../http/error-handling';
 import { NotificationService } from '../../components/notifications/notification.service';
 import { MockNotificationService } from '../testing/mock-helper.spec';
+import { mockErrorResponse } from '../testing/http-helper.spec';
 
 describe('Service: Hoverfly', () => {
 

src/app/shared/services/hoverfly.service.spec.ts

@@ -1,13 +1,15 @@
-import { MockNgRedux } from '@angular-redux/store/lib/testing';
 import { Observable } from 'rxjs/Observable';
 import { NgRedux } from '@angular-redux/store';
 
-export class MockRedux extends MockNgRedux<any> {
+export class MockRedux extends NgRedux<any> {
   constructor(private state: any) {
-    super();
+    super(null);
   }
 
-  select = () => {
+  dispatch = () => {
+  };
+
+  select() {
     return Observable.of(this.state);
   }
 }

src/app/shared/testing/click-helper.ts renamed to src/app/shared/testing/click-helper.spec.ts

@@ -6,12 +6,11 @@ import { DashboardModule } from './dashboard.module';
 import createSpy = jasmine.createSpy;
 import { HoverflyService } from '../../shared/services/hoverfly.service';
 import { NgRedux } from '@angular-redux/store';
-import { createMockRedux } from '../../shared/testing/redux-helper';
 import { fromJS } from 'immutable';
 import { Subscription } from 'rxjs/Subscription';
 import { By } from '@angular/platform-browser';
-import { MockNgRedux } from '@angular-redux/store/lib/testing';
-import { click } from '../../shared/testing/click-helper';
+import { createMockRedux } from '../../shared/testing/redux-helper.spec';
+import { click } from '../../shared/testing/click-helper.spec';
 
 
 const mockState: Map<any, any> = fromJS(
@@ -51,7 +50,6 @@ describe('Component: Dashboard', () => {
   beforeEach(async(() => configureTestModule(mockState)));
 
   beforeEach(() => {
-    MockNgRedux.reset();  // This seem to be required to use our mock state
     fixture = TestBed.createComponent(DashboardComponent);
     component = fixture.componentInstance;
     hoverflyService = TestBed.get(HoverflyService);
@@ -89,7 +87,6 @@ describe('Component: Dashboard', () => {
     });
 
     configureTestModule(stateWithMiddleware).then(() => {
-      MockNgRedux.reset();
       fixture = TestBed.createComponent(DashboardComponent);
 
       const binaryField = fixture.debugElement.query(By.css('#hoverfly-middleware-details-binary code'));
@@ -137,7 +134,6 @@ describe('Component: Dashboard', () => {
     });
 
     configureTestModule(stateWithMiddleware).then(() => {
-      MockNgRedux.reset();
       fixture = TestBed.createComponent(DashboardComponent);
 
       const counters = fixture.debugElement.query(By.css('#hoverfly-counters'));

src/app/shared/testing/http-helper.ts renamed to src/app/shared/testing/http-helper.spec.ts

@@ -5,10 +5,6 @@ import { async, ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed
 import { LoginModule } from './login.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AuthService } from '../../shared/services/auth.service';
-import createSpy = jasmine.createSpy;
-import { By } from '@angular/platform-browser';
-import { click } from '../../shared/testing/click-helper';
-import { NgModel } from '@angular/forms';
 import { AlertModule } from 'ngx-bootstrap';
 import { MockAuthService } from '../../shared/testing/mock-helper.spec';