From bfb3b0ccd9dbf674f4e79cadbb2cd9acacc447c3 Mon Sep 17 00:00:00 2001
From: masumulu28 <masum.ulu@hotmail.com>
Date: Fri, 24 Mar 2023 17:20:02 +0300
Subject: [PATCH] test refactored

---
 .../packages/core/src/lib/services/routes.service.ts      | 8 ++++++--
 .../packages/core/src/lib/tests/routes.service.spec.ts    | 6 +++---
 .../packages/core/src/lib/tests/utils/common.utils.ts     | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
index 74b76bb40d..20dc13ddfe 100644
--- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Injector, Inject, OnDestroy} from '@angular/core';
+import { Injectable, Injector, OnDestroy } from '@angular/core';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { ABP } from '../models/common';
 import { OTHERS_GROUP } from '../tokens';
@@ -182,9 +182,13 @@ export abstract class AbstractNavTreeService<T extends ABP.Nav>
 
 @Injectable({ providedIn: 'root' })
 export class RoutesService extends AbstractNavTreeService<ABP.Route> {
-  constructor(injector: Injector, @Inject(OTHERS_GROUP) private readonly othersGroup: string) {
+  private readonly othersGroup: string;
+
+  constructor(injector: Injector) {
     super(injector);
+    this.othersGroup = injector.get(OTHERS_GROUP);
   }
+
   get groupedVisible(): ABP.RouteGroup[] | undefined {
     const hasGroup = this.visible.some(node => !!node.group);
     if (!hasGroup) return;
diff --git a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts
index d4871108a3..ac79c193ac 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/routes.service.spec.ts
@@ -10,9 +10,10 @@ export const mockRoutesService = (injectorPayload = {} as { [key: string]: any }
   const injector = new DummyInjector({
     PermissionService: mockPermissionService(),
     ConfigStateService: { createOnUpdateStream: () => updateStream$ },
+    OTHERS_GROUP: 'OthersGroup',
     ...injectorPayload,
   });
-  return new RoutesService(injector, 'OthersGroup');
+  return new RoutesService(injector);
 };
 
 describe('Routes Service', () => {
@@ -71,9 +72,8 @@ describe('Routes Service', () => {
       expect(visible[0].children[0].name).toBe('x');
     });
   });
-
   describe('#groupedVisible', () => {
-    it('should have groups and items', async () => {
+    it('should return grouped route list', () => {
       service.add(groupedRoutes);
 
       const tree = service.groupedVisible;
diff --git a/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts b/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts
index e568b63a17..01612a987e 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/utils/common.utils.ts
@@ -14,6 +14,6 @@ export class DummyInjector extends Injector {
   ): T;
   get(token: any, notFoundValue?: any): any;
   get(token, notFoundValue?, flags?: InjectFlags): any {
-    return this.payload[token.name || token];
+    return this.payload[token.name || token._desc || token];
   }
 }