Merge pull request #1993 from satanTime/issues/1256

feat(MockInstance): resets root overrides likewise properties #1256
help-me-mom · Mar 6, 2022 · 65da18d · 65da18d
2 parents 90acfa5 + a903556
commit 65da18d
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 77 deletions.
diff --git a/libs/ng-mocks/src/lib/common/ng-mocks-universe.ts b/libs/ng-mocks/src/lib/common/ng-mocks-universe.ts
@@ -54,14 +54,6 @@ ngMocksUniverse.global.set('flags', {
   onTestBedFlushNeed: coreConfig.onTestBedFlushNeed,
 });
 
-ngMocksUniverse.getLocalMocks = () => {
-  if (!ngMocksUniverse.global.has('local-mocks')) {
-    ngMocksUniverse.global.set('local-mocks', []);
-  }
-
-  return ngMocksUniverse.global.get('local-mocks');
-};
-
 ngMocksUniverse.getOverrides = globalMap('overrides');
 ngMocksUniverse.getDefaults = globalMap('defaults');
 

diff --git a/libs/ng-mocks/src/lib/mock-instance/mock-instance-apply.ts b/libs/ng-mocks/src/lib/mock-instance/mock-instance-apply.ts
@@ -5,14 +5,15 @@ export default (def: any): any[] => {
   const callbacks = [];
 
   const config = ngMocksUniverse.configInstance.get(def);
-  if (config?.init) {
-    callbacks.push(config.init);
-  }
   if (config?.overloads) {
     for (const [name, stub, encapsulation] of config.overloads) {
-      callbacks.push((instance: any) => {
-        mockHelperStubMember(instance, name, stub, encapsulation);
-      });
+      if (name) {
+        callbacks.push((instance: any) => {
+          mockHelperStubMember(instance, name, stub, encapsulation);
+        });
+      } else {
+        callbacks.push(stub);
+      }
     }
   }
 

diff --git a/libs/ng-mocks/src/lib/mock-instance/mock-instance.ts b/libs/ng-mocks/src/lib/mock-instance/mock-instance.ts
@@ -26,30 +26,6 @@ ngMocksStack.subscribePop((state, stack) => {
   currentStack = stack[stack.length - 1];
 });
 
-ngMocksStack.subscribePush(() => {
-  // On start we have to flush any caches,
-  // they are not from this spec.
-  const set = ngMocksUniverse.getLocalMocks();
-  set.splice(0, set.length);
-});
-ngMocksStack.subscribePop(() => {
-  const set = ngMocksUniverse.getLocalMocks();
-  while (set.length) {
-    const [declaration, config] = set.pop() || /* istanbul ignore next */ [];
-    const universeConfig = ngMocksUniverse.configInstance.has(declaration)
-      ? ngMocksUniverse.configInstance.get(declaration)
-      : /* istanbul ignore next */ {};
-    ngMocksUniverse.configInstance.set(declaration, {
-      ...universeConfig,
-      ...config,
-    });
-  }
-});
-
-const restore = (declaration: any, config: any): void => {
-  ngMocksUniverse.getLocalMocks().push([declaration, config]);
-};
-
 interface MockInstanceArgs {
   accessor?: 'get' | 'set';
   data?: any;
@@ -65,7 +41,10 @@ const parseMockInstanceArgs = (args: any[]): MockInstanceArgs => {
     set.value = args[1];
     set.accessor = args[2];
   } else {
-    set.data = args[0];
+    set.value = args[0];
+    if (typeof set.value !== 'function') {
+      set.value = set.value?.init;
+    }
   }
 
   return set;
@@ -82,41 +61,9 @@ if (typeof beforeEach !== 'undefined') {
   afterEach(() => (checkCollect = false));
 }
 
-const mockInstanceConfig = <T>(declaration: Type<T> | AbstractType<T> | InjectionToken<T>, data?: any): void => {
-  const config = typeof data === 'function' ? { init: data } : data;
-  const universeConfig = ngMocksUniverse.configInstance.has(declaration)
-    ? ngMocksUniverse.configInstance.get(declaration)
-    : {};
-  restore(declaration, universeConfig);
-
-  if (config) {
-    ngMocksUniverse.configInstance.set(declaration, {
-      ...universeConfig,
-      ...config,
-    });
-  } else {
-    ngMocksUniverse.configInstance.set(declaration, {
-      ...universeConfig,
-      init: undefined,
-      overloads: [],
-    });
-  }
-
-  if (!config) {
-    // When we are calling MockInstance without a config we need to reset it from the checks too.
-    for (let i = checkReset.length - 1; i >= 0; i -= 1) {
-      if (checkReset[i][0] === declaration && checkReset[i][2] === currentStack) {
-        checkReset.splice(i, 1);
-      }
-    }
-  } else if (checkCollect) {
-    checkReset.push([declaration, ngMocksUniverse.configInstance.get(declaration), currentStack]);
-  }
-};
-
-const mockInstanceMember = <T>(
+const mockInstanceConfig = <T>(
   declaration: Type<T> | AbstractType<T> | InjectionToken<T>,
-  name: string,
+  name: string | undefined,
   stub: any,
   encapsulation?: 'get' | 'set',
 ) => {
@@ -230,12 +177,25 @@ export function MockInstance<T>(
 export function MockInstance<T>(declaration: Type<T> | AbstractType<T> | InjectionToken<T>, ...args: any[]) {
   funcImportExists(declaration, 'MockInstance');
 
-  const { key, value, accessor, data } = parseMockInstanceArgs(args);
-  if (key) {
-    return mockInstanceMember(declaration, key, value, accessor);
+  const { key, value, accessor } = parseMockInstanceArgs(args);
+
+  if (value) {
+    return mockInstanceConfig(declaration, key, value, accessor);
   }
 
-  mockInstanceConfig(declaration, data);
+  const config = ngMocksUniverse.configInstance.get(declaration) || /* istanbul ignore next */ {};
+
+  ngMocksUniverse.configInstance.set(declaration, {
+    ...config,
+    overloads: [],
+  });
+
+  // When we are calling MockInstance without a config we need to reset it from the checks too.
+  for (let i = checkReset.length - 1; i >= 0; i -= 1) {
+    if (checkReset[i][0] === declaration && checkReset[i][2] === currentStack) {
+      checkReset.splice(i, 1);
+    }
+  }
 }
 
 /**

diff --git a/tests/issue-1256/test.spec.ts b/tests/issue-1256/test.spec.ts
@@ -0,0 +1,28 @@
+import { InjectionToken } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { MockInstance, MockProvider, MockReset } from 'ng-mocks';
+
+const myToken = new InjectionToken('MY_TOKEN');
+
+// @see https://github.com/ike18t/ng-mocks/issues/1256
+// global MockInstance doesn't reset own customizations
+describe('issue-1256', () => {
+  MockInstance.scope();
+
+  beforeEach(() =>
+    TestBed.configureTestingModule({
+      providers: [MockProvider(myToken, { test: 1 })],
+    }).compileComponents(),
+  );
+
+  it('changes value #1', () => {
+    MockInstance(myToken, () => ({ test: 2 }));
+    const value: any = TestBed.get(myToken);
+    expect(value.test).toEqual(2);
+  });
+
+  it('uses the default value', () => {
+    const value: any = TestBed.get(myToken);
+    expect(value.test).toEqual(1);
+  });
+});