chore(deps): update dependency ng-mocks to v13.0.0

.gitignore

@@ -1,2 +1,3 @@
+/.angular
 /node_modules
 /test-reports

package.json

@@ -36,7 +36,7 @@
     "@types/jasmine": "3.10.3",
     "core-js": "3.20.3",
     "jasmine-core": "3.10.1",
-    "ng-mocks": "13.0.0-alpha.6",
+    "ng-mocks": "13.0.0",
     "rxjs": "6.6.7",
     "tslib": "2.3.1",
     "zone.js": "0.11.4"

src/e2e.ts

@@ -58,6 +58,7 @@ import './examples/readme/classic.spec.ts';
 // import './tests/control-value-accessor-form-control/test.spec.ts';
 // import './tests/control-value-accessor-ng-model/test.spec.ts';
 // import './tests/correct-module-exports-11/test.spec.ts';
+// import './tests/double-declarations/test.spec.ts';
 // import './tests/double-decorator/example-1.spec.ts';
 // import './tests/double-decorator/example-2.spec.ts';
 // import './tests/double-decorator/example-3.spec.ts';
@@ -78,10 +79,12 @@ import './examples/readme/classic.spec.ts';
 // import './tests/is-mock-of/test.spec.ts';
 // import './tests/is-mocked-ng-def-of/test.spec.ts';
 // import './tests/issue-142/test.spec.ts';
+// import './tests/issue-1427/test.spec.ts';
 // import './tests/issue-145/components.spec.ts';
 // import './tests/issue-145/directives.spec.ts';
 // import './tests/issue-151/test.spec.ts';
 // import './tests/issue-157/test.spec.ts';
+// import './tests/issue-1587/test.spec.ts';
 // import './tests/issue-162/test.spec.ts';
 // import './tests/issue-166/test.spec.ts';
 // import './tests/issue-167/component.spec.ts';
@@ -180,6 +183,7 @@ import './examples/readme/classic.spec.ts';
 // import './tests/mock-component-render/content-children.spec.ts';
 // import './tests/mock-component-render/hide.spec.ts';
 // import './tests/mock-component-render/reduced.spec.ts';
+// import './tests/mock-component/test.spec.ts';
 // import './tests/mock-directive-with-multi-token/test.spec.ts';
 // import './tests/mock-instance-in-it/test.spec.ts';
 // import './tests/mock-instance-member/reset.spec.ts';
@@ -196,6 +200,7 @@ import './examples/readme/classic.spec.ts';
 // import './tests/mock-render-param-ref/test.spec.ts';
 // import './tests/mock-render-tokens/test.spec.ts';
 // import './tests/mock-service-override/test.spec.ts';
+// import './tests/mock-service/test.spec.ts';
 // import './tests/module-with-factory-tokens/test.spec.ts';
 // import './tests/module-with-tokens/test.spec.ts';
 // import './tests/multi-tokens/test.spec.ts';
@@ -213,6 +218,7 @@ import './examples/readme/classic.spec.ts';
 // import './tests/ng-mocks-default-mock/test.precise.spec.ts';
 // import './tests/ng-mocks-default-mock/test.real.spec.ts';
 // import './tests/ng-mocks-default-mock/test.unset.spec.ts';
+// import './tests/ng-mocks-faster/test.spec.ts';
 // import './tests/ng-mocks-find-all/test.spec.ts';
 // import './tests/ng-mocks-find-instance-token/test.spec.ts';
 // import './tests/ng-mocks-find-instance/317.spec.ts';

src/examples/MockComponent/test.spec.ts

@@ -82,7 +82,11 @@ describe('MockComponent', () => {
     // called 'someOutput'. TestedComponent listens on the output via
     // `(someOutput)="trigger($event)"`.
     // Let's install a spy and trigger the output.
-    ngMocks.stubMember(component, 'trigger', jasmine.createSpy());
+    ngMocks.stubMember(
+      component,
+      'trigger',
+      jasmine.createSpy(), // or jest.fn(),
+    );
     mockComponent.someOutput.emit({
       payload: 'foo',
     });

src/examples/MockDirective-Attribute/test.spec.ts

@@ -81,7 +81,11 @@ describe('MockDirective:Attribute', () => {
     // 'someOutput'. TestedComponent listens on the output via
     // `(someOutput)="trigger($event)"`.
     // Let's install a spy and trigger the output.
-    ngMocks.stubMember(component, 'trigger', jasmine.createSpy());
+    ngMocks.stubMember(
+      component,
+      'trigger',
+      jasmine.createSpy(), // or jest.fn(),
+    );
     mockDirective.someOutput.emit();
 
     // Assert on the effect.

src/examples/MockInstance/test.spec.ts

@@ -54,6 +54,7 @@ describe('MockInstance', () => {
       update$: EMPTY,
     }));
   });
+
   afterEach(() => {
     // Resets customizations
     MockInstance(ChildComponent);

src/examples/readme/builder.spec.ts

@@ -171,7 +171,7 @@ describe('profile:builder', () => {
     const spySave = MockInstance(
       StorageService,
       'save',
-      jasmine.createSpy(),
+      jasmine.createSpy(), // or jest.fn(),
     );
 
     // <profile [profile]="params.profile">

src/examples/readme/classic.spec.ts

@@ -104,7 +104,7 @@ describe('profile:classic', () => {
   // https://ng-mocks.sudo.eu/api/ngMocks/faster
   ngMocks.faster();
 
-  // Helps to reset MockInstance customizations after each test.
+  // Helps to reset customizations after each test.
   MockInstance.scope();
 
   // Let's declare TestBed in beforeAll instead of beforeEach.
@@ -157,7 +157,7 @@ describe('profile:classic', () => {
     const spySave = MockInstance(
       StorageService,
       'save',
-      jasmine.createSpy(),
+      jasmine.createSpy(), // or jest.fn(),
     );
 
     // Renders <profile [profile]="params.profile">

src/tests/abstract-methods-provider/test.spec.ts

@@ -1,6 +1,5 @@
 import { Injectable, NgModule } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
-import { MockBuilder } from 'ng-mocks';
+import { getTestBedInjection, MockBuilder } from 'ng-mocks';
 
 @Injectable()
 abstract class LoggerInterface {
@@ -30,8 +29,7 @@ describe('abstract-methods-provider', () => {
   beforeEach(() => MockBuilder().mock(TargetModule));
 
   it('provides a mock copy with an implemented abstract method', () => {
-    const actual: LoggerInterface = TestBed.get(LoggerInterface);
-
-    expect(actual.log).toBeDefined();
+    const actual = getTestBedInjection(LoggerInterface);
+    expect(actual && actual.log).toBeDefined();
   });
 });

src/tests/control-value-accessor-form-control/test.spec.ts

@@ -26,11 +26,13 @@ describe('control-value-accessor-form-control:real', () => {
       mock,
       'writeValue',
       jasmine.createSpy().and.callFake(mock.writeValue),
+      // or jest.fn(mock.writeValue),
     );
     ngMocks.stubMember(
       mock,
       'setDisabledState',
       jasmine.createSpy().and.callFake(mock.setDisabledState),
+      // or jest.fn(mock.setDisabledState),
     );
     fixture.detectChanges();
 
@@ -103,21 +105,25 @@ describe('control-value-accessor-form-control:mock', () => {
       mock,
       'writeValue',
       jasmine.createSpy().and.callFake(mock.writeValue),
+      // or jest.fn(mock.writeValue),
     );
     ngMocks.stubMember(
       mock,
       'setDisabledState',
       jasmine.createSpy().and.callFake(mock.setDisabledState),
+      // or jest.fn(mock.setDisabledState),
     );
     ngMocks.stubMember(
       mock,
       'registerOnChange',
       jasmine.createSpy().and.callFake(mock.registerOnChange),
+      // or jest.fn(mock.registerOnChange),
     );
     ngMocks.stubMember(
       mock,
       'registerOnTouched',
       jasmine.createSpy().and.callFake(mock.registerOnTouched),
+      // or jest.fn(mock.registerOnTouched),
     );
     fixture.detectChanges();
 

src/tests/control-value-accessor-ng-model/test.spec.ts

@@ -27,11 +27,13 @@ describe('control-value-accessor-ng-model:real', () => {
       mock,
       'writeValue',
       jasmine.createSpy().and.callFake(mock.writeValue),
+      // or jest.fn(mock.writeValue),
     );
     ngMocks.stubMember(
       mock,
       'setDisabledState',
       jasmine.createSpy().and.callFake(mock.setDisabledState),
+      // or jest.fn(mock.setDisabledState),
     );
     const ngModel = ngMocks.get(mockElement, NgModel);
     fixture.detectChanges();
@@ -99,21 +101,25 @@ describe('control-value-accessor-ng-model:mock', () => {
       mock,
       'writeValue',
       jasmine.createSpy().and.callFake(mock.writeValue),
+      // or jest.fn(mock.writeValue),
     );
     ngMocks.stubMember(
       mock,
       'setDisabledState',
       jasmine.createSpy().and.callFake(mock.setDisabledState),
+      // or jest.fn(mock.setDisabledState),
     );
     ngMocks.stubMember(
       mock,
       'registerOnChange',
       jasmine.createSpy().and.callFake(mock.registerOnChange),
+      // or jest.fn(mock.registerOnChange),
     );
     ngMocks.stubMember(
       mock,
       'registerOnTouched',
       jasmine.createSpy().and.callFake(mock.registerOnTouched),
+      // or jest.fn(mock.registerOnTouched),
     );
     const ngModel = ngMocks.get(mockElement, NgModel);
     fixture.detectChanges();

src/tests/double-declarations/fixtures.ts

@@ -0,0 +1,108 @@
+import {
+  Component,
+  ContentChild,
+  ContentChildren,
+  Directive,
+  EventEmitter,
+  HostBinding,
+  HostListener,
+  Input,
+  Output,
+  QueryList,
+} from '@angular/core';
+
+@Directive({
+  selector: 'base1',
+})
+export class BaseCls1 {}
+
+@Directive({
+  selector: 'base2',
+})
+export class BaseCls2 {}
+
+@Directive({
+  selector: 'base3',
+})
+export class BaseCls3 {}
+
+@Directive({
+  selector: 'override1',
+})
+export class OverrideCls1 {}
+
+@Directive({
+  selector: 'override2',
+})
+export class OverrideCls2 {}
+
+@Directive({
+  selector: 'override3',
+})
+export class OverrideCls3 {}
+
+@Directive({
+  selector: 'div',
+})
+export class DivCls {
+  @Input() public prop: number | null = null;
+}
+
+@Directive({
+  selector: 'base1',
+})
+@Directive({
+  selector: 'base2',
+})
+export class BaseCls {
+  @ContentChild(DivCls) public contentChildBase?: DivCls;
+  @ContentChildren(DivCls) public contentChildrenBase?: QueryList<DivCls>;
+
+  @HostBinding('attr.base1') public hostBase1: any;
+  @HostBinding('attr.base2') public hostBase2: any;
+  public hostBase3 = '';
+
+  @Output() @Input() public mix1: EventEmitter<void> | string = new EventEmitter();
+
+  @Input() @Output() public mix2: EventEmitter<void> | string = new EventEmitter();
+  @Input() public prop1: EventEmitter<void> | string = '';
+
+  @Input('prop2alias') public prop2: EventEmitter<void> | string = '';
+  @Input('prop3alias') public prop3: EventEmitter<void> | string = '';
+
+  @Input() public propBase1: EventEmitter<void> | string = '';
+  @Output() public propBase2 = new EventEmitter<void>();
+
+  @HostListener('focus') public hostBaseHandler3() {
+    this.hostBase3 = 'base3';
+  }
+}
+
+@Component({
+  selector: 'override1',
+  template: `override1<ng-content></ng-content>`,
+})
+@Component({
+  selector: 'override2',
+  template: `override2<ng-content></ng-content>`,
+})
+export class OverrideCls extends BaseCls {
+  @ContentChild(DivCls) public contentChildOverride?: DivCls;
+  @ContentChildren(DivCls) public contentChildrenOverride?: QueryList<DivCls>;
+
+  @HostBinding('attr.override2') public hostBase2: any;
+  @HostBinding('attr.override1') public hostOverride1: any;
+  public hostOverride3 = '';
+
+  @Output() public prop1: EventEmitter<void> | string = new EventEmitter();
+  @Input('override2alias') public prop2: EventEmitter<void> | string = '';
+
+  @Input('override3alias') public prop3: EventEmitter<void> | string = '';
+  @Input() public propOverride1: EventEmitter<void> | string = '';
+
+  @Output() public propOverride2 = new EventEmitter<void>();
+
+  @HostListener('click') public hostBaseHandler3() {
+    this.hostOverride3 = 'override3';
+  }
+}