CS + cleanup

Author: mpalourdio

src/test/components/ng-http-loader.component.spec.ts

@@ -129,12 +129,8 @@ describe('NgHttpLoaderComponent', () => {
     });
 
     it('should show and hide the spinner according to the pending HTTP requests', fakeAsync(() => {
-        function runQuery$(url: string): Observable<any> {
-            return http.get(url);
-        }
-
+        const runQuery$ = (url: string): Observable<any> => http.get(url);
         forkJoin([runQuery$('/fake'), runQuery$('/fake2')]).subscribe();
-
         const firstRequest = httpMock.expectOne('/fake');
         const secondRequest = httpMock.expectOne('/fake2');
 
@@ -397,13 +393,8 @@ describe('NgHttpLoaderComponent', () => {
 
     it('should correctly handle the debounce delay for multiple HTTP requests', fakeAsync(() => {
         component.debounceDelay = 2000;
-
-        function runQuery$(url: string): Observable<any> {
-            return http.get(url);
-        }
-
+        const runQuery$ = (url: string): Observable<any> => http.get(url);
         forkJoin([runQuery$('/fake'), runQuery$('/fake2')]).subscribe();
-
         const firstRequest = httpMock.expectOne('/fake');
         const secondRequest = httpMock.expectOne('/fake2');
 
@@ -544,13 +535,8 @@ describe('NgHttpLoaderComponent', () => {
 
     it('should correctly handle the minimum spinner duration for multiple HTTP requests', fakeAsync(() => {
         component.minDuration = 5000;
-
-        function runQuery$(url: string): Observable<any> {
-            return http.get(url);
-        }
-
+        const runQuery$ = (url: string): Observable<any> => http.get(url);
         forkJoin([runQuery$('/fake'), runQuery$('/fake2')]).subscribe();
-
         const firstRequest = httpMock.expectOne('/fake');
         const secondRequest = httpMock.expectOne('/fake2');
 
@@ -587,13 +573,8 @@ describe('NgHttpLoaderComponent', () => {
 
     it('should correctly handle the extra spinner duration for multiple HTTP requests', fakeAsync(() => {
         component.extraDuration = 5000;
-
-        function runQuery$(url: string): Observable<any> {
-            return http.get(url);
-        }
-
+        const runQuery$ = (url: string): Observable<any> => http.get(url);
         forkJoin([runQuery$('/fake'), runQuery$('/fake2')]).subscribe();
-
         const firstRequest = httpMock.expectOne('/fake');
         const secondRequest = httpMock.expectOne('/fake2');
 
@@ -634,7 +615,6 @@ describe('NgHttpLoaderComponent', () => {
 
     it('should correctly handle the minimum spinner duration for multiple HTTP requests ran one after the others', fakeAsync(() => {
         component.minDuration = 2000;
-
         http.get('/fake').subscribe();
         const firstRequest = httpMock.expectOne('/fake');
 
@@ -667,11 +647,7 @@ describe('NgHttpLoaderComponent', () => {
 
     it('should handle the extra spinner duration for multiple HTTP requests ran one after the others', fakeAsync(() => {
         component.extraDuration = 10;
-
-        function runQuery$(url: string): Observable<any> {
-            return http.get(url);
-        }
-
+        const runQuery$ = (url: string): Observable<any> => http.get(url);
         runQuery$('/fake').subscribe();
         const firstRequest = httpMock.expectOne('/fake');
 

src/test/services/pending-requests-interceptor.service.spec.ts

@@ -37,9 +37,7 @@ describe('PendingRequestsInterceptor', () => {
     });
 
     it('should be aware of the pending HTTP requests', () => {
-        function runQuery$(url: string): Observable<any> {
-            return http.get(url);
-        }
+        const runQuery$ = (url: string): Observable<any> => http.get(url);
 
         forkJoin([runQuery$('/fake'), runQuery$('/fake2')]).subscribe();
 
@@ -58,37 +56,34 @@ describe('PendingRequestsInterceptor', () => {
     });
 
     it('should correctly notify the pendingRequestsStatus observable', async(() => {
-        const pendingRequestsStatus$ = pendingRequestsInterceptor.pendingRequestsStatus$;
-
-        pendingRequestsStatus$
+        pendingRequestsInterceptor
+            .pendingRequestsStatus$
             .subscribe(
                 (next: boolean) => expect(next).toBeTruthy(),
-                (error: HttpErrorResponse) => expect(1).toBe(2)
+                () => expect(1).toBe(2)
             );
 
         http.get('/fake').subscribe();
         httpMock.expectOne('/fake');
     }));
 
     it('should correctly notify the pendingRequestsStatus observable, even if subscribed after', async(() => {
-        const pendingRequestsStatus$ = pendingRequestsInterceptor.pendingRequestsStatus$;
-
-
         http.get('/fake').subscribe();
         httpMock.expectOne('/fake');
 
-        pendingRequestsStatus$
+        pendingRequestsInterceptor
+            .pendingRequestsStatus$
             .subscribe(
                 (next: boolean) => expect(next).toBeTruthy(),
-                (error: HttpErrorResponse) => expect(1).toBe(2)
+                () => expect(1).toBe(2)
             );
     }));
 
     it('should fail correctly', () => {
         const statusText = 'NOT FOUND';
 
         http.get('/fake').subscribe(
-            (next: boolean) => expect(true).toBe(false),
+            () => expect(true).toBe(false),
             (error: HttpErrorResponse) => expect(error.statusText).toBe(statusText)
         );
 

src/test/services/spinner-visibility.service.spec.ts

@@ -28,21 +28,19 @@ describe('SpinnerVisibilityService', () => {
 
     it('should pipe \'true\' when calling show()', () => {
         spinnerVisibilityService.show();
-        spinnerVisibilityService.visibility$.subscribe(result => {
-                expect(result).toBeTruthy();
-            },
-            error => {
-                expect(true).toBeFalsy();
-            });
+        spinnerVisibilityService.visibility$
+            .subscribe(
+                result => expect(result).toBeTruthy(),
+                () => expect(true).toBeFalsy()
+            );
     });
 
     it('should pipe \'false\' when calling hide()', () => {
         spinnerVisibilityService.hide();
-        spinnerVisibilityService.visibility$.subscribe(result => {
-                expect(result).toBeFalsy();
-            },
-            error => {
-                expect(true).toBeFalsy();
-            });
+        spinnerVisibilityService.visibility$
+            .subscribe(
+                result => expect(result).toBeFalsy(),
+                () => expect(true).toBeFalsy()
+            );
     });
 });