Skip to content

Commit fe31516

Browse files
committed
Explicitly import rxjs operators and enforce type in tests
1 parent 74b4be4 commit fe31516

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

src/app/http-interceptor.service.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ import {
1717
Response,
1818
XHRBackend
1919
} from '@angular/http';
20-
import { Observable, Subject } from 'rxjs/Rx';
20+
import { Subject } from 'rxjs/Subject';
21+
import { Observable } from 'rxjs/Observable';
22+
import 'rxjs/add/operator/map';
23+
import 'rxjs/add/operator/catch';
24+
import 'rxjs/add/operator/finally';
25+
import 'rxjs/add/observable/throw';
2126

2227
/**
2328
* @deprecated Prefer the new HttpClientModule.

src/app/pending-interceptor.service.spec.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
import { async, inject, TestBed } from '@angular/core/testing';
1111
import { PendingInterceptorService } from './pending-interceptor.service';
1212
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
13-
import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
13+
import { HTTP_INTERCEPTORS, HttpClient, HttpErrorResponse } from '@angular/common/http';
1414
import { Observable } from 'rxjs/Observable';
15+
import 'rxjs/add/observable/forkJoin';
1516

1617
describe('PendingInterceptorService', () => {
1718

@@ -66,8 +67,8 @@ describe('PendingInterceptorService', () => {
6667

6768
pendingRequestsStatus
6869
.subscribe(
69-
next => expect(next).toBeTruthy(),
70-
error => expect(1).toBe(2)
70+
(next: boolean) => expect(next).toBeTruthy(),
71+
(error: HttpErrorResponse) => expect(1).toBe(2)
7172
);
7273

7374
http.get('/fake').subscribe();
@@ -83,8 +84,8 @@ describe('PendingInterceptorService', () => {
8384
const statusText = 'NOT FOUND';
8485

8586
http.get('/fake').subscribe(
86-
next => expect(1).toBe(2),
87-
(error: Response) => expect(error.statusText).toBe(statusText)
87+
(next: boolean) => expect(true).toBe(false),
88+
(error: HttpErrorResponse) => expect(error.statusText).toBe(statusText)
8889
);
8990

9091
const testRequest = httpMock.expectOne('/fake');

src/app/spinner/spinner.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import { Component, Input, OnDestroy } from '@angular/core';
1111
import { HttpInterceptorService } from '../http-interceptor.service';
12-
import { Subscription } from 'rxjs/Rx';
12+
import { Subscription } from 'rxjs/Subscription';
1313
import { Spinkit } from '../spinkits';
1414
import { PendingInterceptorService } from '../pending-interceptor.service';
1515

0 commit comments

Comments
 (0)