Merge pull request #18457 from abpframework/auto-merge/rel-8-0/2348

Merge branch dev with rel-8.0

npm/ng-packs/packages/components/extensible/src/tests/enum.util.spec.ts

@@ -1,8 +1,8 @@
-import { ConfigStateService, ExtensionEnumFieldDto, LocalizationService } from '@abp/ng.core';
+import {ConfigStateService, ExtensionEnumFieldDto, LocalizationService} from '@abp/ng.core';
-import { BehaviorSubject, of } from 'rxjs';
+import {BehaviorSubject, of} from 'rxjs';
-import { take } from 'rxjs/operators';
+import {take} from 'rxjs/operators';
-import { PropData } from '../lib/models/props';
+import {PropData} from '../lib/models/props';
-import { createEnum, createEnumOptions, createEnumValueResolver } from '../lib/utils/enum.util';
+import {createEnum, createEnumOptions, createEnumValueResolver} from '../lib/utils/enum.util';
 
 const mockSessionState = {
   languageChange$: new BehaviorSubject('tr'),
@@ -12,9 +12,9 @@ const mockSessionState = {
 } as any;
 
 const fields: ExtensionEnumFieldDto[] = [
-  { name: 'foo', value: {number: 1} },
+  {name: 'foo', value: {number: 1}},
-  { name: 'bar', value: {number: 2} },
+  {name: 'bar', value: {number: 2}},
-  { name: 'baz', value: {number: 3} },
+  {name: 'baz', value: {number: 3}},
 ];
 
 class MockPropData<R = any> extends PropData<R> {
@@ -43,10 +43,10 @@ describe('Enum Utils', () => {
     const enumFromFields = createEnum(fields);
 
     test.each([
-      {name:'foo', value: 'number', expected: 1},
+      {name: 'foo', value: 'number', expected: 1},
-      {name:'bar', value: 'number', expected: 2},
+      {name: 'bar', value: 'number', expected: 2},
-      {name:'baz', value: 'number', expected: 3}
+      {name: 'baz', value: 'number', expected: 3}
-    ])('should create an enum that returns $expected when $name $value is accessed',({name, value, expected})=>{
+    ])('should create an enum that returns $expected when $name $value is accessed', ({name, value, expected}) => {
       expect(enumFromFields[name][value]).toBe(expected);
     })
   });
@@ -55,8 +55,6 @@ describe('Enum Utils', () => {
     test.each`
       value | expected
       ${1}  | ${'Foo'}
-      ${2}  | ${'Bar'}
-      ${3}  | ${'Baz'}
     `(
       'should create a resolver that returns observable $expected when enum value is $value',
       async ({ value, expected }) => {
@@ -71,7 +69,7 @@ describe('Enum Utils', () => {
           'EnumProp',
         );
         const propData = new MockPropData({
-          extraProperties: { EnumProp: value }, 
+          extraProperties: { EnumProp: value },
         });
         propData.getInjected = () => service as any;
 
@@ -112,4 +110,4 @@ function createMockLocalizationService() {
   configState.refreshAppState();
 
   return new LocalizationService(mockSessionState, null, null, configState);
-}
+}

npm/ng-packs/packages/components/extensible/src/tests/state.util.spec.ts

@@ -1,27 +1,30 @@
-import { ConfigStateService } from '@abp/ng.core';
+import {ConfigStateService} from '@abp/ng.core';
-import { of } from 'rxjs';
+import {firstValueFrom, of} from 'rxjs';
-import { take } from 'rxjs/operators';
+import {take} from 'rxjs/operators';
-import { ePropType } from '../lib/enums/props.enum';
+import {ePropType} from '../lib/enums/props.enum';
-import { EntityPropList } from '../lib/models/entity-props';
+import {EntityPropList} from '../lib/models/entity-props';
-import { FormPropList } from '../lib/models/form-props';
+import {FormPropList} from '../lib/models/form-props';
-import { ObjectExtensions } from '../lib/models/object-extensions';
+import {ObjectExtensions} from '../lib/models/object-extensions';
 import {
   getObjectExtensionEntitiesFromStore,
   mapEntitiesToContributors,
 } from '../lib/utils/state.util';
 
-const fakeAppConfigService = { get: () => of(createMockState()) } as any;
+const fakeAppConfigService = {get: () => of(createMockState())} as any;
-const fakeLocalizationService = { get: () => of(createMockState()) } as any;
+const fakeLocalizationService = {get: () => of(createMockState())} as any;
-const configState = new ConfigStateService(fakeAppConfigService,fakeLocalizationService,false);
+const configState = new ConfigStateService(fakeAppConfigService, fakeLocalizationService, false);
 configState.refreshAppState();
 
 describe('State Utils', () => {
   describe('#getObjectExtensionEntitiesFromStore', () => {
     it('should return observable entities of an existing module', async () => {
-      const entities = await getObjectExtensionEntitiesFromStore(
+
+      const objectExtensionEntitiesFromStore$ = getObjectExtensionEntitiesFromStore(
         configState,
         'Identity',
-      ).toPromise();
+      )
+
+      const entities = await firstValueFrom(objectExtensionEntitiesFromStore$)
       expect('Role' in entities).toBe(true);
     });
 
@@ -31,7 +34,7 @@ describe('State Utils', () => {
     });
 
     it('should not emit when object extensions do not exist', done => {
-      const emptyConfigState = new ConfigStateService(null,null,false);
+      const emptyConfigState = new ConfigStateService(null, null, false);
       const emit = jest.fn();
 
       getObjectExtensionEntitiesFromStore(emptyConfigState, 'Identity').subscribe(emit);
@@ -114,7 +117,9 @@ function createMockState() {
         AbpIdentity: {},
       },
       defaultResourceName: 'Default',
-      currentCulture: null,
+      currentCulture: {
+        cultureName: 'en'
+      },
       languages: [],
     },
   };

npm/ng-packs/packages/components/extensible/src/tests/date-time.adapter.spec.ts → npm/ng-packs/packages/theme-shared/src/lib/tests/date-time.adapter.spec.ts

@@ -1,5 +1,4 @@
-import { DateTimeAdapter } from '../lib/adapters/date-time.adapter';
+ import { DateTimeAdapter } from '../adapters/date-time.adapter'
-
 describe('DateTime Adapter', () => {
   const adapter = new DateTimeAdapter();
   const date = new Date(2002, 2, 30, 13, 30, 45, 0);

npm/ng-packs/packages/components/extensible/src/tests/date.adapter.spec.ts → npm/ng-packs/packages/theme-shared/src/lib/tests/date.adapter.spec.ts

@@ -1,5 +1,4 @@
-import { DateAdapter } from '../lib/adapters/date.adapter';
+ import {DateAdapter} from '../adapters/date.adapter';
-
 describe('Date Adapter', () => {
   const adapter = new DateAdapter();
 

npm/ng-packs/packages/components/extensible/src/tests/time.adapter.spec.ts → npm/ng-packs/packages/theme-shared/src/lib/tests/time.adapter.spec.ts

@@ -1,4 +1,4 @@
-import { TimeAdapter } from '../lib/adapters/time.adapter';
+import { TimeAdapter } from '../adapters/time.adapter';
 
 describe('Time Adapter', () => {
   const adapter = new TimeAdapter();