Merge pull request #5 from alisaduncan/update-error-handling

Update error handling

Author: alisaduncan

Diff for: src/app/app.component.spec.ts

@@ -1,4 +1,4 @@
-import { inject, TestBed, async } from '@angular/core/testing';
+import { TestBed, async } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 import { AppComponent } from './app.component';

Diff for: src/app/user.service.spec.ts

@@ -1,7 +1,6 @@
 import { TestBed, getTestBed, inject } from '@angular/core/testing';
-import { HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { Observable, of } from 'rxjs';
 
 import { UserService } from './user.service';
 import { User } from './user';
@@ -90,13 +89,13 @@ describe('UserService', () => {
     it('should throw with an error message when API returns an error',
       inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
         const userService = getTestBed().get(UserService);
-        userService.getUsers().subscribe({
-          error(actualError) {
-            expect(of(actualError)).toBeTruthy();
-            expect(actualError).not.toBeNull();
-            expect(actualError).not.toBeUndefined();
+        userService.getUsers().subscribe(
+          response => fail('should have failed with 500 status'),
+          error => {
+            expect(error).toBeTruthy();
+            expect(error.status).toEqual(500);
           }
-        });
+        );
 
         const req = httpMock.expectOne(userService.apiEndpoint);
         expect(req.request.method).toEqual('GET');
@@ -151,12 +150,13 @@ describe('UserService', () => {
 
         const userService = getTestBed().get(UserService);
         userService.addUser(expectedResult)
-          .subscribe({
-            error(actualError) {
-              expect(of(actualError)).toBeTruthy();
-              expect(actualError).toBeTruthy();
+          .subscribe(
+            response => fail('should fail with status 500 error'),
+            (error: HttpErrorResponse) => {
+              expect(error).toBeTruthy();
+              expect(error.status).toEqual(500);
             }
-          });
+          );
 
         const req = httpMock.expectOne(r => r.url === userService.apiEndpoint && r.headers.has('Content-Type'));
         expect(req.request.method).toEqual('POST');

Diff for: src/app/user.service.ts

@@ -1,9 +1,9 @@
 
-import { throwError as observableThrowError, Observable } from 'rxjs';
+import { throwError, Observable } from 'rxjs';
 
 import { catchError, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 
 
 import { User } from './user';
@@ -22,7 +22,7 @@ export class UserService {
     }).pipe(
       map(this.mapUsers),
       catchError(error => {
-        return observableThrowError('An error occurred');
+        return throwError(error);
       }),
     );
   }
@@ -46,7 +46,7 @@ export class UserService {
         };
       }),
       catchError(error => {
-        return observableThrowError('An error occurred');
+        return throwError(error);
       }),
     );
   }

Diff for: src/app/users/dialog/dialog.component.ts

@@ -1,5 +1,5 @@
-import { Component, Inject } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+import { Component } from '@angular/core';
+import { MatDialogRef } from '@angular/material';
 
 @Component({
   selector: 'app-dialog',