Merge pull request #17786 from abpframework/auto-merge/rel-7-4/2216

Merge branch dev with rel-7.4

npm/ng-packs/packages/core/src/lib/tests/capsLock.directive.spec.ts

@@ -11,7 +11,7 @@ import { By } from '@angular/platform-browser';
   imports:[TrackCapsLockDirective]
 })
 class TestComponent {
-  capsLock:boolean = false
+  capsLock = false
 }
 
 describe('TrackCapsLockDirective',()=>{

npm/ng-packs/packages/core/src/lib/tests/show-password-directive.spec.ts

@@ -13,7 +13,7 @@ import { By } from '@angular/platform-browser';
   imports:[ShowPasswordDirective]
 })
 class TestComponent {
-  showPassword:boolean = false
+  showPassword = false
 }
 
 describe('ShowPasswordDirective',()=>{
@@ -46,7 +46,7 @@ describe('ShowPasswordDirective',()=>{
     });
 
     it('should have three input has ShowPasswordDirective elements', () => {
-      let input = des[2].nativeElement
+      const input = des[2].nativeElement
       expect(input.type).toBe('password')
       fixture.componentInstance.showPassword = true
       fixture.detectChanges()

npm/ng-packs/packages/core/src/lib/tests/utils/mock-compare-function.ts

@@ -1,5 +1,6 @@
-import { ABP } from '@abp/ng.core';
+import { ABP } from "../../models";
 
+ 
 export const mockCompareFunction = (a: ABP.Route, b: ABP.Route) => {
   const aName = a.name;
   const bName = b.name;

npm/ng-packs/packages/oauth/src/lib/tests/auth.guard.spec.ts

@@ -7,8 +7,8 @@ import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 describe('AuthGuard', () => {
   let spectator: SpectatorService<AbpOAuthGuard>;
   let guard : AbpOAuthGuard;
-  let route = createSpyObject<ActivatedRouteSnapshot>(ActivatedRouteSnapshot)
-  let state = createSpyObject<RouterStateSnapshot>(RouterStateSnapshot)
+  const route = createSpyObject<ActivatedRouteSnapshot>(ActivatedRouteSnapshot)
+  const state = createSpyObject<RouterStateSnapshot>(RouterStateSnapshot)
 
   const createService = createServiceFactory({
     service: AbpOAuthGuard,