test(transloco-service): fix pr

Author: shaharkazaz

projects/transloco/src/lib/tests/transloco.mocks.ts

@@ -39,6 +39,6 @@ export function load(lang: string): any {
   return timer(1000).pipe(map(() => langs[lang])) as any;
 }
 
-export function runLoader() {
-  tick(1001);
+export function runLoader(times = 1) {
+  tick(times * 1001);
 }

projects/transloco/src/lib/tests/transloco.service.spec.ts

@@ -5,7 +5,7 @@ import createSpy = jasmine.createSpy;
 import { fakeAsync } from '@angular/core/testing';
 import en from '../../../../../src/assets/langs/en.json';
 import { TRANSLOCO_MISSING_HANDLER, TranslocoMissingHandler } from '../transloco-missing-handler';
-import { of, timer } from 'rxjs';
+import { of, throwError, timer } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 describe('TranslocoService', () => {
@@ -33,31 +33,27 @@ describe('TranslocoService', () => {
           })
         );
     };
-    it('should retry loading if initial loading failed', fakeAsync(() => {
+
+    it('should return the default lang if the load fails', fakeAsync(() => {
+      loadLang();
       (spectator.service as any).loader = createSpy().and.callFake(failLoad(1));
-      spectator.service.load('en').subscribe();
-      runLoader();
-      expect((spectator.service as any).loader).toHaveBeenCalledTimes(2);
-      /* We need to run the loader again since it's retrying */
-      runLoader();
+      spectator.service.load('es').subscribe();
+      runLoader(2);
+      /* Once since en is in cache */
+      expect((spectator.service as any).loader).toHaveBeenCalledTimes(1);
     }));
 
-    it('should stop retrying to load when reaching 3 tries', fakeAsync(() => {
+    it('should stop retrying to load the default lang when reaching 3 tries', fakeAsync(() => {
       const spy = createSpy().and.returnValue(of());
       (spectator.service as any).loader = createSpy().and.callFake(failLoad(5));
       const loader = (spectator.service as any).loader;
       spectator.service
         .load('en')
         .pipe(catchError(spy))
         .subscribe();
-      runLoader();
-      expect(loader).toHaveBeenCalledTimes(2);
-      runLoader();
-      expect(loader).toHaveBeenCalledTimes(3);
-      runLoader();
-      expect(loader).toHaveBeenCalledTimes(3);
-      runLoader();
-      expect(loader).toHaveBeenCalledTimes(3);
+      /* 4 times - first try + 3 retries */
+      runLoader(4);
+      expect(loader).toHaveBeenCalledTimes(1);
       const expectedMsg = 'Unable to load the default translation file (en), reached maximum retries';
       const givenMsg = (spy.calls.argsFor(0)[0] as any).message;
       expect(givenMsg).toEqual(expectedMsg);

projects/transloco/src/lib/transloco.service.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
-import { BehaviorSubject, from, Observable, Subject } from 'rxjs';
-import { catchError, distinctUntilChanged, map, shareReplay, tap } from 'rxjs/operators';
+import { BehaviorSubject, from, Observable, Subject, throwError } from 'rxjs';
+import { catchError, distinctUntilChanged, map, retry, shareReplay, tap } from 'rxjs/operators';
 import { Lang, TRANSLOCO_LOADER, TranslocoLoader } from './transloco.loader';
 import { TRANSLOCO_PARSER, TranslocoParser } from './transloco.parser';
 import { HashMap } from './types';
@@ -23,8 +23,6 @@ export class TranslocoService {
   private translationLoaded = new Subject<{ lang: string }>();
   translationLoaded$ = this.translationLoaded.asObservable();
 
-  private loadRetries = 0;
-
   constructor(
     @Inject(TRANSLOCO_LOADER) private loader: TranslocoLoader,
     @Inject(TRANSLOCO_PARSER) private parser: TranslocoParser,
@@ -64,22 +62,17 @@ export class TranslocoService {
    * @internal
    */
   load(lang: string): Observable<Lang> {
-    if (this.loadRetries > 2) {
-      this.loadRetries = 0;
-      throw new Error(`Unable to load the default translation file (${lang}), reached maximum retries`);
-    }
-
     if (this.cache.has(lang) === false) {
       const load$ = from(this.loader(lang)).pipe(
+        retry(3),
         catchError(() => {
-          if (this.cache.has(this.defaultLang)) {
-            this.cache.delete(this.defaultLang);
+          if (lang === this.defaultLang) {
+            const errMsg = `Unable to load the default translation file (${lang}), reached maximum retries`;
+            throw new Error(errMsg);
           }
-          this.loadRetries++;
           return this.load(this.defaultLang);
         }),
         tap(value => {
-          this.loadRetries = 0;
           this.langs.set(lang, value);
           this.translationLoaded.next({ lang });
         }),