fix(keepalive): return actual response or error in onPingResponse

fixes #118
grbsk · Mar 12, 2019 · 0741ae2 · 0741ae2
1 parent f3e1e17
commit 0741ae2
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 9 deletions.
diff --git a/modules/keepalive/src/keepalive.spec.ts b/modules/keepalive/src/keepalive.spec.ts
@@ -106,9 +106,13 @@ describe('keepalive/Keepalive', () => {
     it('ping() should fire request and emit onPingResponse event', () => {
       let actualResponse: HttpResponse<{}>;
 
-      instance.onPingResponse.subscribe((response: HttpResponse<{}>) => {
-        actualResponse = response;
-      });
+      instance.onPingResponse.subscribe(
+        (response: HttpResponse<{}>) => {
+          actualResponse = response;
+        },
+        (error: HttpResponse<{}>) => {
+          actualResponse = error;
+        });
 
       instance.ping();
 
@@ -117,6 +121,37 @@ describe('keepalive/Keepalive', () => {
     });
   });
 
+  describe('using an HTTP request that results in error', () => {
+
+    let request = new HttpRequest('GET', 'https://test.com/404');
+
+    beforeEach(() => {
+      instance = TestBed.get(Keepalive);
+      instance.request(request);
+    });
+
+    afterEach(() => {
+      httpMock.verify();
+    });
+
+    it('ping() should fire request and emit onPingResponse event', () => {
+      let actualResponse: HttpResponse<{}>;
+
+      instance.onPingResponse.subscribe(
+        (response: HttpResponse<{}>) => {
+          actualResponse = response;
+        },
+        (error: HttpResponse<{}>) => {
+          actualResponse = error;
+        });
+
+      instance.ping();
+
+      httpMock.expectOne(request.url).flush(null, {status: 404, statusText: 'Error'});
+      expect(actualResponse.status).toBe(404);
+    });
+  });
+
   describe('on an interval', () => {
     beforeEach(() => {
       instance.interval(5);

diff --git a/modules/keepalive/src/keepalive.ts b/modules/keepalive/src/keepalive.ts
@@ -1,6 +1,6 @@
-import {EventEmitter, Injectable, OnDestroy} from '@angular/core';
-import {HttpClient, HttpRequest, HttpResponse} from '@angular/common/http';
-import {KeepaliveSvc} from '@ng-idle/core';
+import { EventEmitter, Injectable, OnDestroy } from '@angular/core';
+import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http';
+import { KeepaliveSvc } from '@ng-idle/core';
 
 
 /**
@@ -70,9 +70,14 @@ export class Keepalive extends KeepaliveSvc implements OnDestroy {
   ping(): void {
     this.onPing.emit(null);
     if (this.pingRequest) {
-      this.http.request(this.pingRequest).subscribe((response: HttpResponse<any>) => {
-        this.onPingResponse.emit(response);
-      });
+      this.http.request(this.pingRequest).subscribe(
+        (response: HttpResponse<any>) => {
+          this.onPingResponse.emit(response);
+        },
+        (error: HttpResponse<any>) => {
+          this.onPingResponse.emit(error);
+        }
+      );
     }
   }