fix(): fix tests

Author: NetanelBasal

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

@@ -1,6 +1,6 @@
-import { TRANSLOCO_PARSER, DefaultParser } from '../transloco.parser';
+import { DefaultParser, TRANSLOCO_PARSER } from '../transloco.parser';
 import { TRANSLOCO_LOADER } from '../transloco.loader';
-import { TRANSLOCO_CONFIG, defaultConfig } from '../transloco.config';
+import { defaultConfig, TRANSLOCO_CONFIG } from '../transloco.config';
 import { timer } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { DefaultHandler, TRANSLOCO_MISSING_HANDLER } from '../transloco-missing-handler';

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

@@ -1,12 +1,10 @@
-import { TranslocoService, TranslocoPipe, DefaultParser } from '../../public-api';
+import { DefaultParser, TranslocoPipe, TranslocoService } from '../../public-api';
 import { Mock } from 'ts-mocks';
 import { ChangeDetectorRef } from '@angular/core';
 import { load, runLoader } from './transloco.mocks';
-import {fakeAsync, tick} from '@angular/core/testing';
+import { fakeAsync } from '@angular/core/testing';
 import { DefaultHandler } from '../transloco-missing-handler';
-import Spy = jasmine.Spy;
-import {of} from "rxjs";
-import createSpy = jasmine.createSpy;
+import { of } from "rxjs";
 
 describe('TranslocoPipe', () => {
   let translateServiceMock;
@@ -17,7 +15,10 @@ describe('TranslocoPipe', () => {
     translateServiceMock = new Mock<TranslocoService>(
       new TranslocoService(load, new DefaultParser(), new DefaultHandler(), {})
     ).Object;
-    cdrMock = new Mock<ChangeDetectorRef>({ markForCheck: () => {} }).Object;
+    cdrMock = new Mock<ChangeDetectorRef>({
+      markForCheck: () => {
+      }
+    }).Object;
     pipe = new TranslocoPipe(translateServiceMock, {}, cdrMock);
     spyOn(pipe, 'updateValue').and.callThrough();
   });
@@ -45,13 +46,11 @@ describe('TranslocoPipe', () => {
 
   describe('transform', () => {
     it('should unsubscribe after one emit when not in runtime mode', fakeAsync(() => {
-      pipe = new TranslocoPipe(translateServiceMock, {runtime: false}, cdrMock);
+      pipe = new TranslocoPipe(translateServiceMock, { runtime: false }, cdrMock);
+      const spy = spyOn(pipe as any, 'takeOne').and.callThrough();
       pipe.transform('home');
-      const spy = createSpy().and.callThrough();
-      pipe.subscription.unsubscribe = spy;
       runLoader();
-      expect(spy).toHaveBeenCalled();
-      expect(pipe.subscription).toBe(null);
+      expect(spy).toHaveBeenCalledTimes(1);
     }));
 
     it('should return the key when the key is falsy', () => {
@@ -75,23 +74,21 @@ describe('TranslocoPipe', () => {
     it('should return the value from the cache', fakeAsync(() => {
       pipe.transform('home');
       runLoader();
-      expect(pipe.updateValue).toHaveBeenCalled();
-      (pipe.updateValue as Spy).calls.reset();
+      expect(pipe.updateValue).toHaveBeenCalledTimes(1);
       pipe.transform('home');
-      expect(pipe.updateValue).not.toHaveBeenCalled();
+      expect(pipe.updateValue).toHaveBeenCalledTimes(1);
       pipe.transform('a.b.c');
-      expect(pipe.updateValue).toHaveBeenCalled();
+      expect(pipe.updateValue).toHaveBeenCalledTimes(2);
     }));
 
-    fit('should return the value from the cache with params', fakeAsync(() => {
+    it('should return the value from the cache with params', fakeAsync(() => {
       pipe.transform('alert', { value: 'value' });
       runLoader();
-      expect(pipe.updateValue).toHaveBeenCalled();
-      (pipe.updateValue as Spy).calls.reset();
+      expect(pipe.updateValue).toHaveBeenCalledTimes(1);
       pipe.transform('alert', { value: 'value' });
-      expect(pipe.updateValue).not.toHaveBeenCalled();
+      expect(pipe.updateValue).toHaveBeenCalledTimes(1);
       pipe.transform('alert', { value: 'bla' });
-      expect(pipe.updateValue).toHaveBeenCalled();
+      expect(pipe.updateValue).toHaveBeenCalledTimes(2);
     }));
   });
 

projects/transloco/src/lib/transloco.directive.ts

@@ -12,7 +12,7 @@ import {
   TemplateRef,
   ViewContainerRef
 } from '@angular/core';
-import { switchMap } from 'rxjs/operators';
+import { switchMap, take } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { TranslocoService } from './transloco.service';
 import { HashMap } from './types';
@@ -37,22 +37,21 @@ export class TranslocoDirective implements OnInit, OnDestroy, OnChanges {
     private vcr: ViewContainerRef,
     private cdr: ChangeDetectorRef,
     private host: ElementRef
-  ) {}
+  ) {
+  }
 
   ngOnInit() {
     this.hasLoadingTpl() && this.vcr.createEmbeddedView(this.loadingTpl);
 
     const { runtime } = this.translocoService.config;
     this.subscription = this.translocoService.lang$
-      .pipe(switchMap(lang => this.translocoService._load(this.getScope() ? `${lang}-${this.getScope()}` : lang)))
+      .pipe(
+        switchMap(lang => this.translocoService._load(this.getScope() ? `${lang}-${this.getScope()}` : lang)),
+        runtime ? source => source : take(1)
+      )
       .subscribe(data => {
         this.tpl === null ? this.simpleStrategy() : this.structuralStrategy(data);
         this.cdr.markForCheck();
-
-        if (!runtime) {
-          this.subscription.unsubscribe();
-          this.subscription = null;
-        }
       });
   }
 
@@ -68,7 +67,7 @@ export class TranslocoDirective implements OnInit, OnDestroy, OnChanges {
   }
 
   private structuralStrategy(data) {
-    if (this.view) {
+    if( this.view ) {
       this.view.context['$implicit'] = data;
     } else {
       this.hasLoadingTpl() && this.vcr.clear();

projects/transloco/src/lib/transloco.pipe.ts

@@ -2,7 +2,7 @@ import { ChangeDetectorRef, Inject, OnDestroy, Pipe, PipeTransform } from '@angu
 import { TranslocoService } from './transloco.service';
 import { HashMap } from './types';
 import { defaultConfig, TRANSLOCO_CONFIG, TranslocoConfig } from './transloco.config';
-import { switchMap } from 'rxjs/operators';
+import { finalize, switchMap, take, tap } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 
 @Pipe({
@@ -32,11 +32,11 @@ export class TranslocoPipe implements PipeTransform, OnDestroy {
   }
 
   transform(key: string, params: HashMap = {}): string {
-    if (!key) {
+    if( !key ) {
       return key;
     }
 
-    if (key === this.lastKey && JSON.stringify(params) === JSON.stringify(this.lastParams)) {
+    if( key === this.lastKey && JSON.stringify(params) === JSON.stringify(this.lastParams) ) {
       return this.value;
     }
 
@@ -48,14 +48,12 @@ export class TranslocoPipe implements PipeTransform, OnDestroy {
     this.subscription && this.subscription.unsubscribe();
 
     this.subscription = this.translocoService.lang$
-      .pipe(switchMap(lang => this.translocoService._load(lang)))
-      .subscribe(data => {
+      .pipe(
+        switchMap(lang => this.translocoService._load(lang)),
+        this.runtime ? source => source : this.takeOne()
+      )
+      .subscribe(() => {
         this.updateValue(key, params);
-
-        if (!this.runtime) {
-          this.subscription.unsubscribe();
-          this.subscription = null;
-        }
       });
 
     return this.value;
@@ -64,4 +62,8 @@ export class TranslocoPipe implements PipeTransform, OnDestroy {
   ngOnDestroy() {
     this.subscription && this.subscription.unsubscribe();
   }
+
+  private takeOne() {
+    return take(1);
+  }
 }

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

@@ -98,7 +98,7 @@ export class TranslocoService {
           this.langs.set(lang, value);
           this.translationLoaded.next({ lang });
         }),
-        shareReplay({ refCount: true, bufferSize: 1 })
+        shareReplay({ refCount: false, bufferSize: 1 })
       );
       this.cache.set(lang, load$);
     }