From 380586ac7fe5077e09f6523e4d10dc7258d19673 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 17 Jul 2020 15:46:45 +0300 Subject: [PATCH] fix: linter warnings --- .../account/src/lib/tests/account.service.spec.ts | 4 ++-- .../packages/core/src/lib/tests/api.interceptor.spec.ts | 4 ++-- .../lib/tests/application-configuration.service.spec.ts | 2 +- .../packages/core/src/lib/tests/auth.guard.spec.ts | 6 +++--- .../core/src/lib/tests/config-state.service.spec.ts | 2 +- .../packages/core/src/lib/tests/config.state.spec.ts | 6 +++--- .../core/src/lib/tests/dynamic-layout.component.spec.ts | 4 ++-- .../packages/core/src/lib/tests/locale.provider.spec.ts | 6 +++--- .../core/src/lib/tests/localization.pipe.spec.ts | 4 ++-- .../core/src/lib/tests/localization.service.spec.ts | 4 ++-- .../core/src/lib/tests/permission.directive.spec.ts | 2 +- .../packages/core/src/lib/tests/permission.guard.spec.ts | 2 +- .../core/src/lib/tests/profile-state.service.spec.ts | 2 +- .../packages/core/src/lib/tests/profile.service.spec.ts | 6 +++--- .../packages/core/src/lib/tests/profile.state.spec.ts | 2 +- .../src/lib/tests/replaceable-components.state.spec.ts | 6 +++--- .../packages/core/src/lib/tests/rest.service.spec.ts | 2 +- .../core/src/lib/tests/session-state.service.spec.ts | 2 +- .../lib/tests/feature-management-state.service.spec.ts | 2 +- .../src/lib/tests/identity-state.service.spec.ts | 2 +- .../tests/permission-management-state.service.spec.ts | 2 +- .../lib/tests/tenant-management-state.service.spec.ts | 2 +- .../extensions/src/tests/form-props.util.spec.ts | 4 ++-- .../src/lib/tests/append-content.token.spec.ts | 6 +++--- .../src/lib/tests/breadcrumb.component.spec.ts | 4 ++-- .../theme-shared/src/lib/tests/error.handler.spec.ts | 6 +++--- .../src/lib/tests/loader-bar.component.spec.ts | 8 ++++---- .../src/lib/tests/modal-container.component.spec.ts | 2 +- .../theme-shared/src/lib/tests/modal.component.spec.ts | 4 ++-- .../theme-shared/src/lib/tests/validation-utils.spec.ts | 2 +- npm/ng-packs/yarn.lock | 9 ++++++++- 31 files changed, 63 insertions(+), 56 deletions(-) diff --git a/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts b/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts index aa7d7f90a4..b538713bb7 100644 --- a/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts +++ b/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts @@ -15,7 +15,7 @@ describe('AccountService', () => { beforeEach(() => (spectator = createHttp())); it('should send a GET to find tenant', () => { - spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.inject(Store).selectSnapshot.andReturn('https://abp.io'); spectator.service.findTenant('test').subscribe(); spectator.expectOne( 'https://abp.io/api/abp/multi-tenancy/tenants/by-name/test', @@ -30,7 +30,7 @@ describe('AccountService', () => { password: 'test1234', appName: 'Angular', } as RegisterRequest; - spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.inject(Store).selectSnapshot.andReturn('https://abp.io'); spectator.service.register(mock).subscribe(); const req = spectator.expectOne('https://abp.io/api/account/register', HttpMethod.POST); expect(req.request.body).toEqual(mock); diff --git a/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts index b4f1dcd408..8285a6a9f4 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/api.interceptor.spec.ts @@ -21,8 +21,8 @@ describe('ApiInterceptor', () => { beforeEach(() => { spectator = createService(); interceptor = spectator.service; - store = spectator.get(Store); - oauthService = spectator.get(OAuthService); + store = spectator.inject(Store); + oauthService = spectator.inject(OAuthService); }); it('should add headers to http request', done => { diff --git a/npm/ng-packs/packages/core/src/lib/tests/application-configuration.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/application-configuration.service.spec.ts index 1fccc14c8f..8bbdabda80 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/application-configuration.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/application-configuration.service.spec.ts @@ -14,7 +14,7 @@ describe('ApplicationConfigurationService', () => { beforeEach(() => (spectator = createHttp())); it('should send a GET to application-configuration API', () => { - spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.inject(Store).selectSnapshot.andReturn('https://abp.io'); spectator.service.getConfiguration().subscribe(); spectator.expectOne('https://abp.io/api/abp/application-configuration', HttpMethod.GET); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/auth.guard.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/auth.guard.spec.ts index 1e7f5bf585..5e20d7f568 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/auth.guard.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/auth.guard.spec.ts @@ -22,13 +22,13 @@ describe('AuthGuard', () => { }); it('should return true when user logged in', () => { - spectator.get(OAuthService).hasValidAccessToken.andReturn(true); + spectator.inject(OAuthService).hasValidAccessToken.andReturn(true); expect(guard.canActivate(null, null)).toBe(true); }); it('should return navigate to login page with redirectUrl state', () => { - const router = spectator.get(Router); - spectator.get(OAuthService).hasValidAccessToken.andReturn(false); + const router = spectator.inject(Router); + spectator.inject(OAuthService).hasValidAccessToken.andReturn(false); expect(guard.canActivate(null, { url: '/' } as any)).toBe(true); expect(router.navigate).toHaveBeenCalledWith(['/account/login'], { diff --git a/npm/ng-packs/packages/core/src/lib/tests/config-state.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/config-state.service.spec.ts index 4b0c9aa682..9a8f9b651e 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/config-state.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/config-state.service.spec.ts @@ -102,7 +102,7 @@ describe('ConfigStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all ConfigState static methods', () => { const reg = /(?<=static )(.*)(?=\()/gm; diff --git a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts index 0f9aa08c1a..d48fd4dde2 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts @@ -110,9 +110,9 @@ describe('ConfigState', () => { beforeEach(() => { spectator = createService(); - store = spectator.get(Store); + store = spectator.inject(Store); service = spectator.service; - state = new ConfigState(spectator.get(HttpClient), store); + state = new ConfigState(spectator.inject(HttpClient), store); }); describe('#getAll', () => { @@ -250,7 +250,7 @@ describe('ConfigState', () => { dispatchArg = a; return of(a); }); - const httpClient = spectator.get(HttpClient); + const httpClient = spectator.inject(HttpClient); httpClient.get.andReturn(res$); state.addData({ patchState, dispatch } as any).subscribe(); diff --git a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts index 216df7b681..4d5f53a9ba 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts @@ -167,8 +167,8 @@ describe('DynamicLayoutComponent', () => { beforeEach(async () => { spectator = createComponent(); - store = spectator.get(Store); - const routesService = spectator.get(RoutesService); + store = spectator.inject(Store); + const routesService = spectator.inject(RoutesService); routesService.add(routes); store.reset(storeData); diff --git a/npm/ng-packs/packages/core/src/lib/tests/locale.provider.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/locale.provider.spec.ts index b5c788635d..b07006a04d 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/locale.provider.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/locale.provider.spec.ts @@ -26,12 +26,12 @@ describe('LocaleProvider', () => { describe('#LOCALE_ID', () => { test('should equal to currentLang', async () => { spectator = createComponent(); - const localizationService = spectator.get(LocalizationService); + const localizationService = spectator.inject(LocalizationService); - expect(spectator.get(LOCALE_ID).valueOf()).toBe(localesMapping['en-US'] || 'en-US'); + expect(spectator.inject(LOCALE_ID).valueOf()).toBe(localesMapping['en-US'] || 'en-US'); (localizationService as any).currentLang = 'tr'; - expect(spectator.get(LOCALE_ID).valueOf()).toBe(localesMapping['tr'] || 'tr'); + expect(spectator.inject(LOCALE_ID).valueOf()).toBe(localesMapping['tr'] || 'tr'); }); }); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/localization.pipe.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/localization.pipe.spec.ts index 7444265e35..a062d2c18a 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/localization.pipe.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/localization.pipe.spec.ts @@ -12,8 +12,8 @@ describe('LocalizationPipe', () => { beforeEach(() => { spectator = createService(); - pipe = spectator.get(LocalizationPipe); - store = spectator.get(Store); + pipe = spectator.inject(LocalizationPipe); + store = spectator.inject(Store); }); it('should call getLocalization selector', () => { diff --git a/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts index 9d6f6ba3bf..4dc9d51771 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/localization.service.spec.ts @@ -18,7 +18,7 @@ describe('LocalizationService', () => { beforeEach(() => { spectator = createService(); - store = spectator.get(Store); + store = spectator.inject(Store); service = spectator.service; }); @@ -52,7 +52,7 @@ describe('LocalizationService', () => { describe('#registerLocale', () => { it('should return registerLocale and then call setRouteReuse', () => { - const router = spectator.get(Router); + const router = spectator.inject(Router); const shouldReuseRoute = () => true; router.routeReuseStrategy = { shouldReuseRoute } as any; diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts index 1b6dabf05b..4c6356634b 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts @@ -42,7 +42,7 @@ describe('PermissionDirective', () => { }); it('should do nothing when condition is undefined', () => { - const spy = jest.spyOn(spectator.get(Store), 'select'); + const spy = jest.spyOn(spectator.inject(Store), 'select'); grantedPolicy$.next(false); expect(spy.mock.calls).toHaveLength(0); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts index dcfd27ab69..cd9108ec87 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts @@ -52,7 +52,7 @@ describe('PermissionGuard', () => { spectator = createService(); guard = spectator.service; routes = spectator.inject(RoutesService); - store = spectator.get(Store); + store = spectator.inject(Store); }); it('should return true when the grantedPolicy is true', done => { diff --git a/npm/ng-packs/packages/core/src/lib/tests/profile-state.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/profile-state.service.spec.ts index 10db71f6c6..967957b537 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/profile-state.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/profile-state.service.spec.ts @@ -13,7 +13,7 @@ describe('ProfileStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all ProfileState static methods', () => { const reg = /(?<=static )(.*)(?=\()/gm; diff --git a/npm/ng-packs/packages/core/src/lib/tests/profile.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/profile.service.spec.ts index 6f4d7f3041..4c7b7ba3c1 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/profile.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/profile.service.spec.ts @@ -14,14 +14,14 @@ describe('ProfileService', () => { beforeEach(() => (spectator = createHttp())); it('should send a GET to my-profile API', () => { - spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.inject(Store).selectSnapshot.andReturn('https://abp.io'); spectator.service.get().subscribe(); spectator.expectOne('https://abp.io/api/identity/my-profile', HttpMethod.GET); }); it('should send a POST to change-password API', () => { const mock = { currentPassword: 'test', newPassword: 'test' }; - spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.inject(Store).selectSnapshot.andReturn('https://abp.io'); spectator.service.changePassword(mock).subscribe(); const req = spectator.expectOne( 'https://abp.io/api/identity/my-profile/change-password', @@ -38,7 +38,7 @@ describe('ProfileService', () => { surname: 'Doe', phoneNumber: '+123456', }; - spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.inject(Store).selectSnapshot.andReturn('https://abp.io'); spectator.service.update(mock).subscribe(); const req = spectator.expectOne('https://abp.io/api/identity/my-profile', HttpMethod.PUT); expect(req.request.body).toEqual(mock); diff --git a/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts index 380ea53b1c..2ab5f1dff2 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts @@ -26,7 +26,7 @@ describe('ProfileState', () => { beforeEach(() => { spectator = createService(); - profileService = spectator.get(ProfileService); + profileService = spectator.inject(ProfileService); state = new ProfileState(profileService); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts index dc113c433c..be063c4844 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts @@ -25,7 +25,7 @@ describe('ReplaceableComponentsState', () => { }); it('should add a component to the state', () => { - const store = spectator.get(Store); + const store = spectator.inject(Store); expect(store.selectSnapshot(ReplaceableComponentsState.getAll)).toEqual([]); store.dispatch(new AddReplaceableComponent({ component: DummyComponent, key: 'Dummy' })); expect(store.selectSnapshot(ReplaceableComponentsState.getComponent('Dummy'))).toEqual({ @@ -35,7 +35,7 @@ describe('ReplaceableComponentsState', () => { }); it('should replace a exist component', () => { - const store = spectator.get(Store); + const store = spectator.inject(Store); store.dispatch(new AddReplaceableComponent({ component: DummyComponent, key: 'Dummy' })); store.dispatch(new AddReplaceableComponent({ component: null, key: 'Dummy' })); expect(store.selectSnapshot(ReplaceableComponentsState.getComponent('Dummy'))).toEqual({ @@ -47,7 +47,7 @@ describe('ReplaceableComponentsState', () => { it('should call reloadRoute when reload parameter is given as true to AddReplaceableComponent', async () => { const spy = jest.spyOn(router, 'navigateByUrl'); - const store = spectator.get(Store); + const store = spectator.inject(Store); store.dispatch(new AddReplaceableComponent({ component: DummyComponent, key: 'Dummy' })); store.dispatch(new AddReplaceableComponent({ component: null, key: 'Dummy' }, true)); diff --git a/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts index 96bbc197d0..601c9dd6d2 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts @@ -20,7 +20,7 @@ describe('HttpClient testing', () => { beforeEach(() => { spectator = createHttp(); - store = spectator.get(Store); + store = spectator.inject(Store); store.reset({ ConfigState: { environment: { diff --git a/npm/ng-packs/packages/core/src/lib/tests/session-state.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/session-state.service.spec.ts index cff6f9e239..d1c4dd5024 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/session-state.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/session-state.service.spec.ts @@ -17,7 +17,7 @@ describe('SessionStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all SessionState static methods', () => { const reg = /(?<=static )(.*)(?=\()/gm; diff --git a/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts b/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts index 59dc3701a2..5d59755cbd 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts @@ -16,7 +16,7 @@ describe('FeatureManagementStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all FeatureManagementState static methods', () => { diff --git a/npm/ng-packs/packages/identity/src/lib/tests/identity-state.service.spec.ts b/npm/ng-packs/packages/identity/src/lib/tests/identity-state.service.spec.ts index dcf3193eea..ac0952d9c0 100644 --- a/npm/ng-packs/packages/identity/src/lib/tests/identity-state.service.spec.ts +++ b/npm/ng-packs/packages/identity/src/lib/tests/identity-state.service.spec.ts @@ -13,7 +13,7 @@ describe('IdentityStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all IdentityState static methods', () => { diff --git a/npm/ng-packs/packages/permission-management/src/lib/tests/permission-management-state.service.spec.ts b/npm/ng-packs/packages/permission-management/src/lib/tests/permission-management-state.service.spec.ts index f1d344c7ac..bdc2c9d490 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/tests/permission-management-state.service.spec.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/tests/permission-management-state.service.spec.ts @@ -16,7 +16,7 @@ describe('PermissionManagementStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all PermissionManagementState static methods', () => { const reg = /(?<=static )(.*)(?=\()/gm; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tests/tenant-management-state.service.spec.ts b/npm/ng-packs/packages/tenant-management/src/lib/tests/tenant-management-state.service.spec.ts index bd9017a2c7..befd819b70 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tests/tenant-management-state.service.spec.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tests/tenant-management-state.service.spec.ts @@ -16,7 +16,7 @@ describe('TenantManagementStateService', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); }); test('should have the all TenantManagementState static methods', () => { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.util.spec.ts b/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.util.spec.ts index af1edbb9fb..123912cb9a 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.util.spec.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/tests/form-props.util.spec.ts @@ -126,8 +126,8 @@ describe('Form Prop Utils', () => { function* getInjected(spectator: SpectatorService) { yield spectator.service; - yield spectator.get(EXTENSIONS_IDENTIFIER); - yield spectator.get(LocalizationService); + yield spectator.inject(EXTENSIONS_IDENTIFIER); + yield spectator.inject(LocalizationService); } interface Foo { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/append-content.token.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/append-content.token.spec.ts index bcf48a0125..fe3b0ac37c 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/append-content.token.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/append-content.token.spec.ts @@ -15,8 +15,8 @@ describe('AppendContentToken', () => { beforeEach(() => (spectator = createComponent())); it('should insert a style element to the DOM', () => { - spectator.get(THEME_SHARED_APPEND_CONTENT); - expect(spectator.get(DomInsertionService).has(styles)).toBe(true); + spectator.inject(THEME_SHARED_APPEND_CONTENT); + expect(spectator.inject(DomInsertionService).has(styles)).toBe(true); }); it('should be loaded the chart.js', done => { @@ -25,6 +25,6 @@ describe('AppendContentToken', () => { done(); }); - spectator.get(THEME_SHARED_APPEND_CONTENT); + spectator.inject(THEME_SHARED_APPEND_CONTENT); }); }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts index bb8522c4a5..1712baef99 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts @@ -54,8 +54,8 @@ describe('BreadcrumbComponent', () => { beforeEach(() => { spectator = createRouting(); - routes = spectator.get(RoutesService); - store = spectator.get(Store); + routes = spectator.inject(RoutesService); + store = spectator.inject(Store); }); it('should display the breadcrumb', async () => { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts index bacbb93ed0..89e9239b6e 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts @@ -52,7 +52,7 @@ describe('ErrorHandler', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); store.selectSnapshot = jest.fn(() => '/x'); }); @@ -189,7 +189,7 @@ describe('ErrorHandler', () => { test('should call error method of ConfirmationService when authenticated error occurs with _AbpErrorFormat header', done => { spectator - .get(Actions) + .inject(Actions) .pipe(ofActionDispatched(Navigate)) .subscribe(({ path, queryParams, extras }) => { expect(path).toEqual(['/account/login']); @@ -281,7 +281,7 @@ describe('ErrorHandler with custom error component', () => { beforeEach(() => { spectator = createService(); service = spectator.service; - store = spectator.get(Store); + store = spectator.inject(Store); store.selectSnapshot = jest.fn(() => '/x'); }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts index e363dacfd1..2ae7c6aedf 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts @@ -22,7 +22,7 @@ describe('LoaderBarComponent', () => { spectator = createHost(''); spectator.component.intervalPeriod = 1; spectator.component.stopDelay = 1; - router = spectator.get(Router); + router = spectator.inject(Router); (router as any).events = events$; }); @@ -34,7 +34,7 @@ describe('LoaderBarComponent', () => { it('should increase the progressLevel', done => { spectator.detectChanges(); - spectator.get(Store).dispatch(new StartLoader(new HttpRequest('GET', 'test'))); + spectator.inject(Store).dispatch(new StartLoader(new HttpRequest('GET', 'test'))); spectator.detectChanges(); setTimeout(() => { expect(spectator.component.progressLevel > 0).toBeTruthy(); @@ -44,7 +44,7 @@ describe('LoaderBarComponent', () => { test.skip('should be interval unsubscribed', done => { spectator.detectChanges(); - spectator.get(Store).dispatch(new StartLoader(new HttpRequest('GET', 'test'))); + spectator.inject(Store).dispatch(new StartLoader(new HttpRequest('GET', 'test'))); expect(spectator.component.interval.closed).toBe(false); timer(400).subscribe(() => { @@ -73,7 +73,7 @@ describe('LoaderBarComponent', () => { (router as any).events.next(new NavigationStart(1, 'test')); expect(spectator.component.interval.closed).toBe(false); - spectator.get(Store).dispatch(new StopLoader(new HttpRequest('GET', 'test'))); + spectator.inject(Store).dispatch(new StopLoader(new HttpRequest('GET', 'test'))); expect(spectator.component.progressLevel).toBe(100); timer(2).subscribe(() => { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal-container.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal-container.component.spec.ts index 4ee654e9bd..9cb45127e5 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal-container.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal-container.component.spec.ts @@ -23,7 +23,7 @@ describe('ModalContainerComponent', () => { let foo = document.querySelector('div.foo'); expect(foo).toBeNull(); - const cfResolver = spectator.get(ComponentFactoryResolver); + const cfResolver = spectator.inject(ComponentFactoryResolver); const factory = cfResolver.resolveComponentFactory(TestComponent); componentRef = spectator.component.container.createComponent(factory); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts index 00562c4780..b321ee4542 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts @@ -78,7 +78,7 @@ describe('ModalComponent', () => { }); afterEach(() => { - const modalService = spectator.get(ModalService); + const modalService = spectator.inject(ModalService); modalService.clearModal(); }); @@ -120,7 +120,7 @@ describe('ModalComponent', () => { }); it('should open the confirmation popup and works correct', async () => { - const confirmationService = spectator.get(ConfirmationService); + const confirmationService = spectator.inject(ConfirmationService); const warnSpy = jest.spyOn(confirmationService, 'warn'); await wait0ms(); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts index 3cda3b5403..35a46e1ae9 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/validation-utils.spec.ts @@ -22,7 +22,7 @@ describe('ValidationUtils', () => { describe('#getPasswordValidators', () => { it('should return password valdiators', () => { - const store = spectator.get(Store); + const store = spectator.inject(Store); store.reset({ ConfigState: { setting: { diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index 6c27814650..fcdca8c3c7 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2319,13 +2319,20 @@ rxjs "6.5.5" webpack-sources "1.4.3" -"@ngx-validate/core@^0.0.8", "@ngx-validate/core@^0.0.9": +"@ngx-validate/core@^0.0.8": version "0.0.8" resolved "https://registry.yarnpkg.com/@ngx-validate/core/-/core-0.0.8.tgz#8577405eb1af0f5002cdda7a86fbcda56280f116" integrity sha512-caIG5ao76Xhf7T+pNA8crnpAwK0yqj3i0OAUGZRUq1W+kNgz+ZnrSd4F9an/W4g+38u/8gfUVvsfsm07ju6qYA== dependencies: tslib "^1.9.0" +"@ngx-validate/core@^0.0.9": + version "0.0.9" + resolved "https://registry.yarnpkg.com/@ngx-validate/core/-/core-0.0.9.tgz#c5baea9e6f2f28c70d1adaf1edde5a9bcc8929c0" + integrity sha512-bvgwGr3l47gyxqsfKkI8c7UNMlv8ct/OvwYVDjYI7GBt0A+nhBb+xFmirWbBkMT64bUI0Y8pWIiB5qiewPG1WA== + dependencies: + tslib "^1.9.0" + "@ngxs/devtools-plugin@^3.6.2": version "3.6.2" resolved "https://registry.yarnpkg.com/@ngxs/devtools-plugin/-/devtools-plugin-3.6.2.tgz#aa0a4835f90fb905951d7712dc3ce508cbc15a2c"