From e1bc77baccfec41bf56227e232ba587bb802fff6 Mon Sep 17 00:00:00 2001 From: MG Date: Sat, 2 Jan 2021 11:10:54 +0100 Subject: [PATCH] fix: grouping similarities --- lib/common/core.reflect.directive-resolve.ts | 5 ++++- lib/common/core.reflect.directive.ts | 5 ----- lib/common/core.reflect.module-resolve.ts | 5 ++++- lib/common/core.reflect.module.ts | 5 ----- lib/common/core.reflect.pipe-resolve.ts | 5 ++++- lib/common/core.reflect.pipe.ts | 5 ----- lib/mock-builder/promise/get-override-meta.ts | 6 +++--- lib/mock-module/mock-module.spec.ts | 10 +++++++--- tests/issue-145/components.spec.ts | 8 ++++---- tests/issue-145/directives.spec.ts | 8 ++++---- 10 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 lib/common/core.reflect.directive.ts delete mode 100644 lib/common/core.reflect.module.ts delete mode 100644 lib/common/core.reflect.pipe.ts diff --git a/lib/common/core.reflect.directive-resolve.ts b/lib/common/core.reflect.directive-resolve.ts index e70a8d54b0..d0e93f057d 100644 --- a/lib/common/core.reflect.directive-resolve.ts +++ b/lib/common/core.reflect.directive-resolve.ts @@ -1,6 +1,9 @@ +import { MockDirectiveResolver } from '@angular/compiler/testing'; import { Directive } from '@angular/core'; import coreReflectBodyCatch from './core.reflect.body-catch'; -import coreReflectDirective from './core.reflect.directive'; +import coreReflectBodyGlobal from './core.reflect.body-global'; + +const coreReflectDirective = coreReflectBodyGlobal(MockDirectiveResolver); export default (def: any): Directive => coreReflectBodyCatch((arg: any) => coreReflectDirective().resolve(arg))(def); diff --git a/lib/common/core.reflect.directive.ts b/lib/common/core.reflect.directive.ts deleted file mode 100644 index 319881d9ec..0000000000 --- a/lib/common/core.reflect.directive.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { MockDirectiveResolver } from '@angular/compiler/testing'; - -import coreReflectBodyGlobal from './core.reflect.body-global'; - -export default coreReflectBodyGlobal(MockDirectiveResolver); diff --git a/lib/common/core.reflect.module-resolve.ts b/lib/common/core.reflect.module-resolve.ts index 093eedc9f2..8e36274909 100644 --- a/lib/common/core.reflect.module-resolve.ts +++ b/lib/common/core.reflect.module-resolve.ts @@ -1,6 +1,9 @@ +import { MockNgModuleResolver } from '@angular/compiler/testing'; import { NgModule } from '@angular/core'; import coreReflectBodyCatch from './core.reflect.body-catch'; -import coreReflectModule from './core.reflect.module'; +import coreReflectBodyGlobal from './core.reflect.body-global'; + +const coreReflectModule = coreReflectBodyGlobal(MockNgModuleResolver); export default (def: any): NgModule => coreReflectBodyCatch((arg: any) => coreReflectModule().resolve(arg))(def); diff --git a/lib/common/core.reflect.module.ts b/lib/common/core.reflect.module.ts deleted file mode 100644 index d44de65614..0000000000 --- a/lib/common/core.reflect.module.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { MockNgModuleResolver } from '@angular/compiler/testing'; - -import coreReflectBodyGlobal from './core.reflect.body-global'; - -export default coreReflectBodyGlobal(MockNgModuleResolver); diff --git a/lib/common/core.reflect.pipe-resolve.ts b/lib/common/core.reflect.pipe-resolve.ts index 91d831a171..e9944ed299 100644 --- a/lib/common/core.reflect.pipe-resolve.ts +++ b/lib/common/core.reflect.pipe-resolve.ts @@ -1,6 +1,9 @@ +import { MockPipeResolver } from '@angular/compiler/testing'; import { Pipe } from '@angular/core'; import coreReflectBodyCatch from './core.reflect.body-catch'; -import coreReflectPipe from './core.reflect.pipe'; +import coreReflectBodyGlobal from './core.reflect.body-global'; + +const coreReflectPipe = coreReflectBodyGlobal(MockPipeResolver); export default (def: any): Pipe => coreReflectBodyCatch((arg: any) => coreReflectPipe().resolve(arg))(def); diff --git a/lib/common/core.reflect.pipe.ts b/lib/common/core.reflect.pipe.ts deleted file mode 100644 index 87c071792f..0000000000 --- a/lib/common/core.reflect.pipe.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { MockPipeResolver } from '@angular/compiler/testing'; - -import coreReflectBodyGlobal from './core.reflect.body-global'; - -export default coreReflectBodyGlobal(MockPipeResolver); diff --git a/lib/mock-builder/promise/get-override-meta.ts b/lib/mock-builder/promise/get-override-meta.ts index efd6d50170..cdf23d3e9f 100644 --- a/lib/mock-builder/promise/get-override-meta.ts +++ b/lib/mock-builder/promise/get-override-meta.ts @@ -1,14 +1,14 @@ import { Directive } from '@angular/core'; -import coreReflectDirective from '../../common/core.reflect.directive'; +import coreReflectDirectiveResolve from '../../common/core.reflect.directive-resolve'; import { isNgDef } from '../../common/func.is-ng-def'; export default (value: any): Directive | undefined => { if (isNgDef(value, 'c')) { - return coreReflectDirective().resolve(value); + return coreReflectDirectiveResolve(value); } if (isNgDef(value, 'd')) { - return coreReflectDirective().resolve(value); + return coreReflectDirectiveResolve(value); } return undefined; diff --git a/lib/mock-module/mock-module.spec.ts b/lib/mock-module/mock-module.spec.ts index 8a9e0e7758..d8b93aa61b 100644 --- a/lib/mock-module/mock-module.spec.ts +++ b/lib/mock-module/mock-module.spec.ts @@ -19,7 +19,7 @@ import { import { BrowserModule, By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import coreReflectModule from '../common/core.reflect.module'; +import coreReflectModuleResolve from '../common/core.reflect.module-resolve'; import ngMocksUniverse from '../common/ng-mocks-universe'; import { MockComponent } from '../mock-component/mock-component'; import { MockRender } from '../mock-render/mock-render'; @@ -242,7 +242,7 @@ describe('mockProvider', () => { it('should skip multi tokens in a mock module', () => { const mock = MockModule(CustomTokenModule); - const def = coreReflectModule().resolve(mock); + const def = coreReflectModuleResolve(mock); expect(def.providers).toEqual([ { deps: [Injector], @@ -250,7 +250,11 @@ describe('mockProvider', () => { useFactory: jasmine.anything(), }, ]); - expect(def.providers?.[0].useFactory()).toEqual(''); + + const provider: any = !Array.isArray(def.providers?.[0]) + ? def.providers?.[0] + : undefined; + expect(provider?.useFactory()).toEqual(''); }); it('should return undefined on any token', () => { diff --git a/tests/issue-145/components.spec.ts b/tests/issue-145/components.spec.ts index a376f76ab7..279a8d0ead 100644 --- a/tests/issue-145/components.spec.ts +++ b/tests/issue-145/components.spec.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from '@angular/forms'; import { MockComponent } from 'ng-mocks'; -import coreReflectDirective from 'ng-mocks/dist/lib/common/core.reflect.directive'; +import coreReflectDirectiveResolve from 'ng-mocks/dist/lib/common/core.reflect.directive-resolve'; @Component({ selector: 'component', @@ -38,7 +38,7 @@ export class ComponentValidator {} describe('issue-145:components', () => { it('does not add NG_VALUE_ACCESSOR to components', () => { const mock = MockComponent(ComponentDefault); - const { providers } = coreReflectDirective().resolve(mock); + const { providers } = coreReflectDirectiveResolve(mock); expect(providers).toEqual([ { provide: ComponentDefault, @@ -49,7 +49,7 @@ describe('issue-145:components', () => { it('adds NG_VALUE_ACCESSOR to components that provide it', () => { const mock = MockComponent(ComponentValueAccessor); - const { providers } = coreReflectDirective().resolve(mock); + const { providers } = coreReflectDirectiveResolve(mock); expect(providers).toEqual([ { provide: ComponentValueAccessor, @@ -65,7 +65,7 @@ describe('issue-145:components', () => { it('respects NG_VALIDATORS too', () => { const mock = MockComponent(ComponentValidator); - const { providers } = coreReflectDirective().resolve(mock); + const { providers } = coreReflectDirectiveResolve(mock); expect(providers).toEqual([ { provide: ComponentValidator, diff --git a/tests/issue-145/directives.spec.ts b/tests/issue-145/directives.spec.ts index 5695187e9c..43540646d8 100644 --- a/tests/issue-145/directives.spec.ts +++ b/tests/issue-145/directives.spec.ts @@ -1,7 +1,7 @@ import { Directive } from '@angular/core'; import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from '@angular/forms'; import { MockDirective } from 'ng-mocks'; -import coreReflectDirective from 'ng-mocks/dist/lib/common/core.reflect.directive'; +import coreReflectDirectiveResolve from 'ng-mocks/dist/lib/common/core.reflect.directive-resolve'; @Directive({ selector: 'directive', @@ -36,7 +36,7 @@ export class DirectiveValidator {} describe('issue-145:directives', () => { it('does not add NG_VALUE_ACCESSOR to directives', () => { const mock = MockDirective(DirectiveDefault); - const { providers } = coreReflectDirective().resolve(mock); + const { providers } = coreReflectDirectiveResolve(mock); expect(providers).toEqual([ { provide: DirectiveDefault, @@ -47,7 +47,7 @@ describe('issue-145:directives', () => { it('adds NG_VALUE_ACCESSOR to directives that provide it', () => { const mock = MockDirective(DirectiveValueAccessor); - const { providers } = coreReflectDirective().resolve(mock); + const { providers } = coreReflectDirectiveResolve(mock); expect(providers).toEqual([ { provide: DirectiveValueAccessor, @@ -63,7 +63,7 @@ describe('issue-145:directives', () => { it('respects NG_VALIDATORS too', () => { const mock = MockDirective(DirectiveValidator); - const { providers } = coreReflectDirective().resolve(mock); + const { providers } = coreReflectDirectiveResolve(mock); expect(providers).toEqual([ { provide: DirectiveValidator,