From 84802e87664e0e71fe998f04fd193fdc82b76ef4 Mon Sep 17 00:00:00 2001 From: Nicole Garcia Date: Wed, 12 Oct 2022 08:49:47 -0500 Subject: [PATCH] fix: spinner test --- .../spinner-overlay/spinner-overlay.component.html | 1 - .../spinner-overlay/spinner-overlay.component.ts | 2 +- .../shared/interceptors/spinner.interceptor.ts | 12 ++++++++---- .../shared/services/spinner-overlay.service.spec.ts | 13 ++++++++++--- 4 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.html diff --git a/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.html b/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.html deleted file mode 100644 index 1d0d28f5..00000000 --- a/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.ts b/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.ts index bb997986..00bca451 100644 --- a/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.ts +++ b/src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-spinner-overlay', - templateUrl: './spinner-overlay.component.html', + template: '', styleUrls: ['./spinner-overlay.component.scss'], }) diff --git a/src/app/modules/shared/interceptors/spinner.interceptor.ts b/src/app/modules/shared/interceptors/spinner.interceptor.ts index 76825951..ce7ad773 100644 --- a/src/app/modules/shared/interceptors/spinner.interceptor.ts +++ b/src/app/modules/shared/interceptors/spinner.interceptor.ts @@ -17,9 +17,13 @@ export class SpinnerInterceptor implements HttpInterceptor { req: HttpRequest, next: HttpHandler ): Observable> { - const spinnerSubscription: Subscription = this.spinnerOverlayService.spinner$.subscribe(); - return next - .handle(req) - .pipe(finalize(() => spinnerSubscription.unsubscribe())); + if(req.url.endsWith('recent')) { + const spinnerSubscription: Subscription = this.spinnerOverlayService.spinner$.subscribe(); + return next + .handle(req) + .pipe(finalize(() => spinnerSubscription.unsubscribe())); + }else { + return next.handle(req); + } } } diff --git a/src/app/modules/shared/services/spinner-overlay.service.spec.ts b/src/app/modules/shared/services/spinner-overlay.service.spec.ts index c18a3e4d..5d2286e5 100644 --- a/src/app/modules/shared/services/spinner-overlay.service.spec.ts +++ b/src/app/modules/shared/services/spinner-overlay.service.spec.ts @@ -44,16 +44,23 @@ describe('SpinnerOverlayService test', () => { }); it('if request is made then spinnerService is show', () => { - const request = new HttpRequest('GET', '/foo'); + const request = new HttpRequest('GET', '/recent'); spyOn(spinnerService, 'show'); - spyOn(spinnerService, 'hide'); spinnerInterceptor.intercept(request, mockHttpHandler); expect(spinnerService.show).toHaveBeenCalled(); - expect(overlayRef).toBeUndefined(); expect(ComponentPortal).toBeTruthy(); + }); + + it('if request get response spinnerService is hide', () => { + const request = new HttpRequest('GET', '/recent'); + spyOn(spinnerService, 'hide'); + + spinnerInterceptor.intercept(request, mockHttpHandler); + expect(spinnerService.hide).toBeTruthy(); + expect(overlayRef).toBeUndefined(); }); });