From 1661d58a4aa2dac5e4263e24504f37ee8e1ec9ba Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 9 Sep 2020 11:16:03 +0300
Subject: [PATCH] test: fix some errors

---
 ...eplaceable-route-container.component.spec.ts | 17 ++++++++---------
 .../replaceable-template.directive.spec.ts      | 11 +++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/tests/replaceable-route-container.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/replaceable-route-container.component.spec.ts
index 16973c17c8..9b8b62ef46 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/replaceable-route-container.component.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/replaceable-route-container.component.spec.ts
@@ -1,10 +1,8 @@
-import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest';
 import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngxs/store';
-import { of, Subject, BehaviorSubject } from 'rxjs';
+import { ActivatedRoute, Router } from '@angular/router';
+import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest';
+import { BehaviorSubject } from 'rxjs';
 import { ReplaceableRouteContainerComponent } from '../components/replaceable-route-container.component';
-import { ReplaceableComponentsState } from '../states';
 import { ReplaceableComponentsService } from '../services/replaceable-components.service';
 
 @Component({
@@ -33,15 +31,16 @@ const activatedRouteMock = {
 describe('ReplaceableRouteContainerComponent', () => {
   let spectator: SpectatorHost<ReplaceableRouteContainerComponent>;
   const get$Res = new BehaviorSubject(undefined);
-  const replaceableComponents = spectator.inject(ReplaceableComponentsService);
-  const spy = jest.spyOn(replaceableComponents, 'get$');
-  spy.mockReturnValue(get$Res as any);
 
   const createHost = createHostFactory({
     component: ReplaceableRouteContainerComponent,
-    providers: [{ provide: ActivatedRoute, useValue: activatedRouteMock }],
+    providers: [
+      { provide: ActivatedRoute, useValue: activatedRouteMock },
+      { provide: ReplaceableComponentsService, useValue: { get$: () => get$Res } },
+    ],
     declarations: [ExternalComponent, DefaultComponent],
     entryComponents: [DefaultComponent, ExternalComponent],
+    mocks: [Router],
   });
 
   beforeEach(() => {
diff --git a/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts
index 2923dd473b..2c1432e525 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/replaceable-template.directive.spec.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Inject, Input, OnInit, Optional, Output } from '@angular/core';
 import { createDirectiveFactory, SpectatorDirective } from '@ngneat/spectator/jest';
 import { Store } from '@ngxs/store';
-import { Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { ReplaceableTemplateDirective } from '../directives';
 import { ReplaceableComponents } from '../models';
 import { Router } from '@angular/router';
@@ -51,16 +51,14 @@ class ExternalComponent {
 
 describe('ReplaceableTemplateDirective', () => {
   let spectator: SpectatorDirective<ReplaceableTemplateDirective>;
-  const get$Res = new Subject();
+  const get$Res = new BehaviorSubject(undefined);
 
-  const replaceableComponents = spectator.inject(ReplaceableComponentsService);
-  const spy = jest.spyOn(replaceableComponents, 'get$');
-  spy.mockReturnValue(get$Res as any);
   const createDirective = createDirectiveFactory({
     directive: ReplaceableTemplateDirective,
     declarations: [DefaultComponent, ExternalComponent],
     entryComponents: [ExternalComponent],
     mocks: [Router],
+    providers: [{ provide: ReplaceableComponentsService, useValue: { get$: () => get$Res } }],
   });
 
   describe('without external component', () => {
@@ -76,7 +74,7 @@ describe('ReplaceableTemplateDirective', () => {
         `,
         { hostProps: { oneWay: { label: 'Test' }, twoWay: false, twoWayChange, someOutput } },
       );
-      get$Res.next(undefined);
+
       const component = spectator.query(DefaultComponent);
       spectator.directive.context.initTemplate(component);
       spectator.detectChanges();
@@ -118,6 +116,7 @@ describe('ReplaceableTemplateDirective', () => {
         `,
         { hostProps: { oneWay: { label: 'Test' }, twoWay: false, twoWayChange, someOutput } },
       );
+
       get$Res.next({ component: ExternalComponent, key: 'TestModule.TestComponent' });
     });