fix(ngMocks.faster): support of angular 14.2.0 #3466

help-me-mom · Sep 5, 2022 · 8dac2b5 · 8dac2b5
1 parent b1922df
commit 8dac2b5
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 28 deletions.
diff --git a/libs/ng-mocks/src/lib/common/core.helpers.ts b/libs/ng-mocks/src/lib/common/core.helpers.ts
@@ -8,6 +8,7 @@ import funcGetName from './func.get-name';
 
 /**
  * It will be removed from public interface with the next release: A14
+ * Use ngMocks.get(token) instead.
  *
  * @deprecated
  * @internal

diff --git a/libs/ng-mocks/src/lib/common/ng-mocks-global-overrides.ts b/libs/ng-mocks/src/lib/common/ng-mocks-global-overrides.ts
@@ -176,7 +176,7 @@ const applyPlatformOverrides = (testBed: TestBed, touches: Set<any>) => {
 };
 
 const configureTestingModule =
-  (original: TestBedStatic['configureTestingModule']): TestBedStatic['configureTestingModule'] =>
+  (original: TestBedStatic['configureTestingModule'], instance: TestBed): TestBedStatic['configureTestingModule'] =>
   (moduleDef: TestModuleMetadata) => {
     initTestBed();
 
@@ -202,18 +202,18 @@ const configureTestingModule =
       applyPlatformOverrides(testBed, touches);
     }
 
-    return original.call(TestBed, moduleDef);
+    return original.call(instance, moduleDef);
   };
 
 const resetTestingModule =
-  (original: TestBedStatic['resetTestingModule']): TestBedStatic['resetTestingModule'] =>
+  (original: TestBedStatic['resetTestingModule'], instance: TestBed): TestBedStatic['resetTestingModule'] =>
   () => {
     ngMocksUniverse.global.delete('builder:config');
     ngMocksUniverse.global.delete('builder:module');
     (TestBed as any).ngMocksSelectors = undefined;
     applyNgMocksOverrides(TestBed);
 
-    return original.call(TestBed);
+    return original.call(instance);
   };
 
 const viewContainerInstall = () => {

diff --git a/libs/ng-mocks/src/lib/mock-builder/mock-builder.promise.spec.ts b/libs/ng-mocks/src/lib/mock-builder/mock-builder.promise.spec.ts
@@ -8,8 +8,8 @@ import {
   PipeTransform,
 } from '@angular/core';
 
-import { getTestBedInjection } from '../common/core.helpers';
 import mockHelperConsoleThrow from '../mock-helper/mock-helper.console-throw';
+import mockHelperGet from '../mock-helper/mock-helper.get';
 
 import { MockBuilder } from './mock-builder';
 
@@ -50,24 +50,28 @@ describe('MockBuilderPromise', () => {
 
   it('skips dependencies in kept providers', async () => {
     await MockBuilder().keep(TargetService, { dependency: true });
-    expect(getTestBedInjection(TargetService)).toBeFalsy();
+    expect(() => mockHelperGet(TargetService)).toThrowError(
+      /Cannot find an instance/,
+    );
   });
 
   it('adds non dependencies in kept providers', async () => {
     await MockBuilder().keep(TargetService);
-    expect(getTestBedInjection(TargetService)).toBeTruthy();
+    expect(mockHelperGet(TargetService)).toBeTruthy();
   });
 
   it('skips dependencies in mock providers', async () => {
     await MockBuilder().mock(TargetService, TargetService, {
       dependency: true,
     });
-    expect(getTestBedInjection(TargetService)).toBeFalsy();
+    expect(() => mockHelperGet(TargetService)).toThrowError(
+      /Cannot find an instance/,
+    );
   });
 
   it('adds non dependencies in mock providers', async () => {
     await MockBuilder().mock(TargetService);
-    expect(getTestBedInjection(TargetService)).toBeTruthy();
+    expect(mockHelperGet(TargetService)).toBeTruthy();
   });
 
   it('respects several kept overloads', async () => {
@@ -92,7 +96,7 @@ describe('MockBuilderPromise', () => {
           },
         ],
       });
-    expect(getTestBedInjection(TARGET_TOKEN)).toEqual([1, 2]);
+    expect(mockHelperGet(TARGET_TOKEN)).toEqual([1, 2]);
   });
 
   it('respects several mock overloads', async () => {
@@ -117,7 +121,9 @@ describe('MockBuilderPromise', () => {
           },
         ],
       });
-    expect(getTestBedInjection(TARGET_TOKEN)).toBeUndefined();
+    expect(() => mockHelperGet(TARGET_TOKEN)).toThrowError(
+      /Cannot find an instance/,
+    );
   });
 
   it('throws an error on a services replacement', () => {

diff --git a/libs/ng-mocks/src/lib/mock-builder/mock-builder.promise.ts b/libs/ng-mocks/src/lib/mock-builder/mock-builder.promise.ts
@@ -188,7 +188,7 @@ export class MockBuilderPromise implements IMockBuilder {
     reject?: ((reason: any) => PromiseLike<any>) | undefined | null,
   ): Promise<TResult1> {
     const promise = new Promise((resolve: (value: IMockBuilderResult) => void): void => {
-      const testBed = TestBed.configureTestingModule(this.build());
+      const testBed: TestBedStatic = TestBed.configureTestingModule(this.build()) as never;
       for (const callback of mapValues(this.beforeCC)) {
         callback(testBed);
       }

diff --git a/libs/ng-mocks/src/lib/mock-helper/mock-helper.faster-install.ts b/libs/ng-mocks/src/lib/mock-helper/mock-helper.faster-install.ts
@@ -1,56 +1,68 @@
-import { TestBed, TestBedStatic, TestModuleMetadata } from '@angular/core/testing';
+import { getTestBed, TestBed, TestBedStatic, TestModuleMetadata } from '@angular/core/testing';
 
 import coreDefineProperty from '../common/core.define-property';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 const hooks: {
-  after: Array<(original: TestBedStatic['resetTestingModule']) => TestBedStatic['resetTestingModule']>;
-  before: Array<(original: TestBedStatic['configureTestingModule']) => TestBedStatic['configureTestingModule']>;
+  after: Array<
+    (original: TestBedStatic['resetTestingModule'], instance: TestBed) => TestBedStatic['resetTestingModule']
+  >;
+  before: Array<
+    (original: TestBedStatic['configureTestingModule'], instance: TestBed) => TestBedStatic['configureTestingModule']
+  >;
 } = ngMocksUniverse.global.get('faster-hooks') || {
   after: [],
   before: [],
 };
 ngMocksUniverse.global.set('faster-hooks', hooks);
 
 const configureTestingModule =
-  (original: TestBedStatic['configureTestingModule']): TestBedStatic['configureTestingModule'] =>
+  (original: TestBedStatic['configureTestingModule'], instance: TestBed): TestBedStatic['configureTestingModule'] =>
   (moduleDef: TestModuleMetadata) => {
     ngMocksUniverse.global.set('bullet:customized', true);
 
     let final = original;
     for (const callback of hooks.before) {
-      final = callback(final);
+      final = callback(final, instance);
     }
 
-    return final.call(TestBed, moduleDef);
+    return final.call(instance, moduleDef);
   };
 
 const resetTestingModule =
-  (original: TestBedStatic['resetTestingModule']): TestBedStatic['resetTestingModule'] =>
+  (original: TestBedStatic['resetTestingModule'], instance: TestBed): TestBedStatic['resetTestingModule'] =>
   () => {
     if (ngMocksUniverse.global.has('bullet')) {
       if (ngMocksUniverse.global.has('bullet:customized')) {
         ngMocksUniverse.global.set('bullet:reset', true);
       }
 
-      return TestBed;
+      return instance;
     }
     ngMocksUniverse.global.delete('bullet:customized');
     ngMocksUniverse.global.delete('bullet:reset');
+
     let final = original;
     for (const callback of hooks.after) {
-      final = callback(final);
+      final = callback(final, instance);
     }
 
-    return final.call(TestBed);
+    return final.call(instance);
   };
 
 export default () => {
   if (!(TestBed as any).ngMocksFasterInstalled) {
-    TestBed.configureTestingModule = configureTestingModule(TestBed.configureTestingModule);
-    TestBed.resetTestingModule = resetTestingModule(TestBed.resetTestingModule);
+    TestBed.configureTestingModule = configureTestingModule(TestBed.configureTestingModule, TestBed);
+    TestBed.resetTestingModule = resetTestingModule(TestBed.resetTestingModule, TestBed);
     coreDefineProperty(TestBed, 'ngMocksFasterInstalled', true);
   }
 
+  const testBed = getTestBed();
+  if (!(testBed as any).ngMocksFasterInstalled) {
+    testBed.configureTestingModule = configureTestingModule(testBed.configureTestingModule, testBed);
+    testBed.resetTestingModule = resetTestingModule(testBed.resetTestingModule, testBed);
+    coreDefineProperty(testBed, 'ngMocksFasterInstalled', true);
+  }
+
   return hooks;
 };
diff --git a/tests/abstract-methods-provider/test.spec.ts b/tests/abstract-methods-provider/test.spec.ts
@@ -1,6 +1,6 @@
 import { Injectable, NgModule } from '@angular/core';
 
-import { getTestBedInjection, MockBuilder } from 'ng-mocks';
+import { MockBuilder, ngMocks } from 'ng-mocks';
 
 @Injectable()
 abstract class LoggerInterface {
@@ -30,7 +30,7 @@ describe('abstract-methods-provider', () => {
   beforeEach(() => MockBuilder().mock(TargetModule));
 
   it('provides a mock copy with an implemented abstract method', () => {
-    const actual = getTestBedInjection(LoggerInterface);
+    const actual = ngMocks.get(LoggerInterface);
     expect(actual && actual.log).toBeDefined();
   });
 });
diff --git a/tests/ng-mocks-faster/idea.spec.ts b/tests/ng-mocks-faster/idea.spec.ts
@@ -0,0 +1,82 @@
+import { InjectionToken } from '@angular/core';
+import { getTestBed, TestBed } from '@angular/core/testing';
+
+import { ngMocks } from 'ng-mocks';
+
+const TOKEN = new InjectionToken('TOKEN');
+
+describe('ngMocks.faster:idea', () => {
+  it('does have access to token before optimization', () => {
+    expect(() => ngMocks.get(TOKEN)).toThrowError(
+      /Cannot find an instance/,
+    );
+  });
+
+  describe('optimization', () => {
+    const backup: Partial<TestBed> = {};
+    const backupInstance: Partial<TestBed> = {};
+
+    beforeAll(() => {
+      backup.configureTestingModule = TestBed.configureTestingModule;
+      backup.resetTestingModule = TestBed.resetTestingModule;
+
+      const testBed = getTestBed();
+      backupInstance.configureTestingModule =
+        testBed.configureTestingModule;
+      backupInstance.resetTestingModule = testBed.resetTestingModule;
+    });
+
+    afterAll(() => {
+      if (backup.configureTestingModule) {
+        TestBed.configureTestingModule =
+          backup.configureTestingModule as never;
+      }
+      if (backup.resetTestingModule) {
+        TestBed.resetTestingModule =
+          backup.resetTestingModule as never;
+      }
+
+      const testBed = getTestBed();
+      if (backupInstance.configureTestingModule) {
+        testBed.configureTestingModule =
+          backupInstance.configureTestingModule;
+      }
+      if (backupInstance.resetTestingModule) {
+        testBed.resetTestingModule =
+          backupInstance.resetTestingModule;
+      }
+      TestBed.resetTestingModule();
+    });
+
+    describe('suite with faster logic', () => {
+      beforeAll(() => {
+        TestBed.resetTestingModule = () => getTestBed() as never;
+        const testBed = getTestBed();
+        testBed.resetTestingModule = () => getTestBed() as never;
+
+        return TestBed.configureTestingModule({
+          providers: [
+            {
+              provide: TOKEN,
+              useValue: true,
+            },
+          ],
+        }).compileComponents();
+      });
+
+      it('has access to token after configuration', () => {
+        expect(ngMocks.get(TOKEN)).toEqual(true);
+      });
+
+      it('has access to token after supressed reset', () => {
+        expect(ngMocks.get(TOKEN)).toEqual(true);
+      });
+    });
+  });
+
+  it('does have access to token after optimization', () => {
+    expect(() => ngMocks.get(TOKEN)).toThrowError(
+      /Cannot find an instance/,
+    );
+  });
+});
diff --git a/tests/ng-mocks-faster/test.spec.ts b/tests/ng-mocks-faster/test.spec.ts
@@ -1,7 +1,7 @@
 import { InjectionToken } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
-import { getTestBedInjection, ngMocks } from 'ng-mocks';
+import { ngMocks } from 'ng-mocks';
 
 const TOKEN = new InjectionToken('TOKEN');
 
@@ -33,7 +33,9 @@ describe('ngMocks.faster', () => {
       ngMocks.faster();
 
       it('works in clear reset', () => {
-        expect(getTestBedInjection(TOKEN)).toBeUndefined();
+        expect(() => ngMocks.get(TOKEN)).toThrowError(
+          /Cannot find an instance/,
+        );
       });
     });
   });