Skip to content

Commit 84802e8

Browse files
author
Nicole Garcia
committed
fix: spinner test
1 parent 91d1e2e commit 84802e8

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/app/modules/shared/components/spinner-overlay/spinner-overlay.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
22

33
@Component({
44
selector: 'app-spinner-overlay',
5-
templateUrl: './spinner-overlay.component.html',
5+
template: '<mat-spinner diameter="80"></mat-spinner>',
66
styleUrls: ['./spinner-overlay.component.scss'],
77
})
88

src/app/modules/shared/interceptors/spinner.interceptor.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ export class SpinnerInterceptor implements HttpInterceptor {
1717
req: HttpRequest<any>,
1818
next: HttpHandler
1919
): Observable<HttpEvent<any>> {
20-
const spinnerSubscription: Subscription = this.spinnerOverlayService.spinner$.subscribe();
21-
return next
22-
.handle(req)
23-
.pipe(finalize(() => spinnerSubscription.unsubscribe()));
20+
if(req.url.endsWith('recent')) {
21+
const spinnerSubscription: Subscription = this.spinnerOverlayService.spinner$.subscribe();
22+
return next
23+
.handle(req)
24+
.pipe(finalize(() => spinnerSubscription.unsubscribe()));
25+
}else {
26+
return next.handle(req);
27+
}
2428
}
2529
}

src/app/modules/shared/services/spinner-overlay.service.spec.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,23 @@ describe('SpinnerOverlayService test', () => {
4444
});
4545

4646
it('if request is made then spinnerService is show', () => {
47-
const request = new HttpRequest('GET', '/foo');
47+
const request = new HttpRequest('GET', '/recent');
4848
spyOn(spinnerService, 'show');
49-
spyOn(spinnerService, 'hide');
5049

5150
spinnerInterceptor.intercept(request, mockHttpHandler);
5251

5352
expect(spinnerService.show).toHaveBeenCalled();
54-
expect(overlayRef).toBeUndefined();
5553
expect(ComponentPortal).toBeTruthy();
54+
});
55+
56+
it('if request get response spinnerService is hide', () => {
57+
const request = new HttpRequest('GET', '/recent');
58+
spyOn(spinnerService, 'hide');
59+
60+
spinnerInterceptor.intercept(request, mockHttpHandler);
61+
5662
expect(spinnerService.hide).toBeTruthy();
63+
expect(overlayRef).toBeUndefined();
5764
});
5865

5966
});

0 commit comments

Comments
 (0)