Merge branch 'main' into ng-19

Author: timdeschryver

.all-contributorsrc

@@ -410,6 +410,15 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "Arthie",
+      "name": "Arthur Petrie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16376476?v=4",
+      "profile": "https://arthurpetrie.com",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -270,6 +270,9 @@ Thanks goes to these people ([emoji key][emojis]):
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hyperxq"><img src="https://avatars.githubusercontent.com/u/22332354?v=4?s=100" width="100px;" alt="Daniel Ramírez Barrientos"/><br /><sub><b>Daniel Ramírez Barrientos</b></sub></a><br /><a href="https://github.com/testing-library/angular-testing-library/commits?author=Hyperxq" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mlz11"><img src="https://avatars.githubusercontent.com/u/94069699?v=4?s=100" width="100px;" alt="Mahdi Lazraq"/><br /><sub><b>Mahdi Lazraq</b></sub></a><br /><a href="https://github.com/testing-library/angular-testing-library/commits?author=mlz11" title="Code">💻</a> <a href="https://github.com/testing-library/angular-testing-library/commits?author=mlz11" title="Tests">⚠️</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://arthurpetrie.com"><img src="https://avatars.githubusercontent.com/u/16376476?v=4?s=100" width="100px;" alt="Arthur Petrie"/><br /><sub><b>Arthur Petrie</b></sub></a><br /><a href="https://github.com/testing-library/angular-testing-library/commits?author=Arthie" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

projects/testing-library/src/lib/testing-library.ts

@@ -2,14 +2,14 @@ import {
   ApplicationInitStatus,
   ChangeDetectorRef,
   Component,
-  isStandalone,
   NgZone,
   OnChanges,
   OutputRef,
   OutputRefSubscription,
   SimpleChange,
   SimpleChanges,
   Type,
+  isStandalone,
 } from '@angular/core';
 import { ComponentFixture, DeferBlockBehavior, DeferBlockState, TestBed, tick } from '@angular/core/testing';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -27,15 +27,16 @@ import {
   waitForOptions as dtlWaitForOptions,
   within as dtlWithin,
 } from '@testing-library/dom';
+import { getConfig } from './config';
 import {
   ComponentOverride,
+  OutputRefKeysWithCallback,
   RenderComponentOptions,
   RenderResult,
   RenderTemplateOptions,
   OutputRefKeysWithCallback,
   Config,
 } from './models';
-import { getConfig } from './config';
 
 type SubscribedOutput<T> = readonly [key: keyof T, callback: (v: any) => void, subscription: OutputRefSubscription];
 
@@ -72,7 +73,7 @@ export async function render<SutType, WrapperType = SutType>(
     on = {},
     componentProviders = [],
     childComponentOverrides = [],
-    componentImports: componentImports,
+    componentImports,
     excludeComponentDeclaration = false,
     routes = [],
     removeAngularAttributes = false,
@@ -119,12 +120,9 @@ export async function render<SutType, WrapperType = SutType>(
 
   await TestBed.compileComponents();
 
-  componentProviders
-    .reduce((acc, provider) => acc.concat(provider), [] as any[])
-    .forEach((p: any) => {
-      const { provide, ...provider } = p;
-      TestBed.overrideProvider(provide, provider);
-    });
+  for (const { provide, ...provider } of componentProviders) {
+    TestBed.overrideProvider(provide, provider);
+  }
 
   const componentContainer = createComponentFixture(sut, wrapper);
 
@@ -161,7 +159,9 @@ export async function render<SutType, WrapperType = SutType>(
     let result;
 
     if (zone) {
-      await zone.run(() => (result = doNavigate()));
+      await zone.run(() => {
+        result = doNavigate();
+      });
     } else {
       result = doNavigate();
     }
@@ -202,15 +202,17 @@ export async function render<SutType, WrapperType = SutType>(
     if (removeAngularAttributes) {
       createdFixture.nativeElement.removeAttribute('ng-version');
       const idAttribute = createdFixture.nativeElement.getAttribute('id');
-      if (idAttribute && idAttribute.startsWith('root')) {
+      if (idAttribute?.startsWith('root')) {
         createdFixture.nativeElement.removeAttribute('id');
       }
     }
 
     mountedFixtures.add(createdFixture);
 
     let isAlive = true;
-    createdFixture.componentRef.onDestroy(() => (isAlive = false));
+    createdFixture.componentRef.onDestroy(() => {
+      isAlive = false;
+    });
 
     if (hasOnChangesHook(createdFixture.componentInstance) && Object.keys(properties).length > 0) {
       const changes = getChangesObj(null, componentProperties);
@@ -321,10 +323,15 @@ export async function render<SutType, WrapperType = SutType>(
     },
     debugElement: fixture.debugElement,
     container: fixture.nativeElement,
-    debug: (element = fixture.nativeElement, maxLength, options) =>
-      Array.isArray(element)
-        ? element.forEach((e) => console.log(dtlPrettyDOM(e, maxLength, options)))
-        : console.log(dtlPrettyDOM(element, maxLength, options)),
+    debug: (element = fixture.nativeElement, maxLength, options) => {
+      if (Array.isArray(element)) {
+        for (const e of element) {
+          console.log(dtlPrettyDOM(e, maxLength, options));
+        }
+      } else {
+        console.log(dtlPrettyDOM(element, maxLength, options));
+      }
+    },
     ...replaceFindWithFindAndDetectChanges(dtlGetQueriesForElement(fixture.nativeElement, queries)),
   };
 }
@@ -426,9 +433,11 @@ function overrideComponentImports<SutType>(sut: Type<SutType> | string, imports:
 }
 
 function overrideChildComponentProviders(componentOverrides: ComponentOverride<any>[]) {
-  componentOverrides?.forEach(({ component, providers }) => {
-    TestBed.overrideComponent(component, { set: { providers } });
-  });
+  if (componentOverrides) {
+    for (const { component, providers } of componentOverrides) {
+      TestBed.overrideComponent(component, { set: { providers } });
+    }
+  }
 }
 
 function hasOnChangesHook<SutType>(componentInstance: SutType): componentInstance is SutType & OnChanges {
@@ -442,13 +451,10 @@ function hasOnChangesHook<SutType>(componentInstance: SutType): componentInstanc
 
 function getChangesObj(oldProps: Record<string, any> | null, newProps: Record<string, any>) {
   const isFirstChange = oldProps === null;
-  return Object.keys(newProps).reduce<SimpleChanges>(
-    (changes, key) => ({
-      ...changes,
-      [key]: new SimpleChange(isFirstChange ? null : oldProps[key], newProps[key], isFirstChange),
-    }),
-    {} as Record<string, any>,
-  );
+  return Object.keys(newProps).reduce<SimpleChanges>((changes, key) => {
+    changes[key] = new SimpleChange(isFirstChange ? null : oldProps[key], newProps[key], isFirstChange);
+    return changes;
+  }, {} as Record<string, any>);
 }
 
 function update<SutType>(
@@ -464,10 +470,12 @@ function update<SutType>(
   const componentInstance = fixture.componentInstance as Record<string, any>;
   const simpleChanges: SimpleChanges = {};
 
-  for (const key of prevRenderedKeys) {
-    if (!partialUpdate && !Object.prototype.hasOwnProperty.call(newValues, key)) {
-      simpleChanges[key] = new SimpleChange(componentInstance[key], undefined, false);
-      delete componentInstance[key];
+  if (!partialUpdate) {
+    for (const key of prevRenderedKeys) {
+      if (!Object.prototype.hasOwnProperty.call(newValues, key)) {
+        simpleChanges[key] = new SimpleChange(componentInstance[key], undefined, false);
+        delete componentInstance[key];
+      }
     }
   }
 
@@ -647,15 +655,15 @@ function replaceFindWithFindAndDetectChanges<T extends Record<string, any>>(orig
  * Call detectChanges for all fixtures
  */
 function detectChangesForMountedFixtures() {
-  mountedFixtures.forEach((fixture) => {
+  for (const fixture of mountedFixtures) {
     try {
       fixture.detectChanges();
     } catch (err: any) {
       if (!err.message.startsWith('ViewDestroyedError')) {
         throw err;
       }
     }
-  });
+  }
 }
 
 /**