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 3d572b457c..c4a35c27c1 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,5 +1,4 @@ import { Injectable, Injector, OnDestroy } from '@angular/core'; -import { Actions } from '@ngxs/store'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { ABP } from '../models/common'; import { pushValueTo } from '../utils/array-utils'; @@ -137,7 +136,6 @@ export abstract class AbstractTreeService { export abstract class AbstractNavTreeService extends AbstractTreeService implements OnDestroy { - protected actions: Actions; private subscription: Subscription; private permissionService: PermissionService; readonly id = 'name'; 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 35d56dbf81..a9883c9e38 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 @@ -1,10 +1,19 @@ -import { Store } from '@ngxs/store'; import { Subject } from 'rxjs'; import { take } from 'rxjs/operators'; -import { GetAppConfiguration } from '../actions'; import { RoutesService } from '../services'; -import { mockRoutesService } from './utils'; -import { mockActions } from './utils/common.utils'; +import { DummyInjector, mockActions } from './utils/common.utils'; +import { mockPermissionService } from './utils/permission-service.spec.utils'; + +const updateStream$ = new Subject(); + +const mockRoutesService = (injectorPayload = {} as { [key: string]: any }) => { + const injector = new DummyInjector({ + PermissionService: mockPermissionService(), + ConfigStateService: { createOnUpdateStream: () => updateStream$ }, + ...injectorPayload, + }); + return new RoutesService(injector); +}; describe('Routes Service', () => { let service: RoutesService; @@ -16,7 +25,6 @@ describe('Routes Service', () => { { path: '/foo/x', name: 'x', parentName: 'foo', order: 1 }, ]; - beforeEach(() => { service = mockRoutesService(); }); @@ -160,7 +168,7 @@ describe('Routes Service', () => { it('should be called upon successful GetAppConfiguration action', () => { const refresh = jest.spyOn(service, 'refresh'); - mockActions.next({ action: new GetAppConfiguration(), status: 'SUCCESSFUL' }); + updateStream$.next(); expect(refresh).toHaveBeenCalledTimes(1); }); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/utils/index.ts b/npm/ng-packs/packages/core/src/lib/tests/utils/index.ts deleted file mode 100644 index 75de71af2f..0000000000 --- a/npm/ng-packs/packages/core/src/lib/tests/utils/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './routes-service.spec.utils'; diff --git a/npm/ng-packs/packages/core/src/lib/tests/utils/routes-service.spec.utils.ts b/npm/ng-packs/packages/core/src/lib/tests/utils/routes-service.spec.utils.ts deleted file mode 100644 index 303bfbba18..0000000000 --- a/npm/ng-packs/packages/core/src/lib/tests/utils/routes-service.spec.utils.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { RoutesService } from '../../services'; -import { mockPermissionService } from './permission-service.spec.utils'; -import { DummyInjector, mockActions } from './common.utils'; - -export const mockRoutesService = (injectorPayload = {} as { [key: string]: any }) => { - const injector = new DummyInjector({ - PermissionService: mockPermissionService(), - Actions: mockActions, - ...injectorPayload, - }); - return new RoutesService(injector); -};