Merge branch 'main' into is-interactive-browser

Author: SimenB

CHANGELOG.md

@@ -13,8 +13,10 @@
 ### Fixes
 
 - `[babel-plugin-jest-hoist]` Use `denylist` instead of the deprecated `blacklist` for Babel 8 support ([#14109](https://github.com/jestjs/jest/pull/14109))
+- `[@jest/expect-utils]` Fix comparison of `DataView` ([#14408](https://github.com/jestjs/jest/pull/14408))
 - `[jest-leak-detector]` Make leak-detector more aggressive when running GC ([#14526](https://github.com/jestjs/jest/pull/14526))
 - `[jest-util]` Make sure `isInteractive` works in a browser ([#14552](https://github.com/jestjs/jest/pull/14552))
+- `[pretty-format]` [**BREAKING**] Print `ArrayBuffer` and `DataView` correctly ([#14290](https://github.com/facebook/jest/pull/14290))
 
 ### Performance
 

packages/expect-utils/src/__tests__/utils.test.ts

@@ -571,4 +571,16 @@ describe('arrayBufferEquality', () => {
     const b = Uint8Array.from([1, 2]).buffer;
     expect(arrayBufferEquality(a, b)).toBeTruthy();
   });
+
+  test('returns true when given matching DataView', () => {
+    const a = new DataView(Uint8Array.from([1, 2, 3]).buffer);
+    const b = new DataView(Uint8Array.from([1, 2, 3]).buffer);
+    expect(arrayBufferEquality(a, b)).toBeTruthy();
+  });
+
+  test('returns false when given matching DataView', () => {
+    const a = new DataView(Uint8Array.from([1, 2, 3]).buffer);
+    const b = new DataView(Uint8Array.from([3, 2, 1]).buffer);
+    expect(arrayBufferEquality(a, b)).toBeFalsy();
+  });
 });

packages/expect-utils/src/utils.ts

@@ -390,12 +390,17 @@ export const arrayBufferEquality = (
   a: unknown,
   b: unknown,
 ): boolean | undefined => {
-  if (!(a instanceof ArrayBuffer) || !(b instanceof ArrayBuffer)) {
-    return undefined;
+  let dataViewA = a;
+  let dataViewB = b;
+
+  if (a instanceof ArrayBuffer && b instanceof ArrayBuffer) {
+    dataViewA = new DataView(a);
+    dataViewB = new DataView(b);
   }
 
-  const dataViewA = new DataView(a);
-  const dataViewB = new DataView(b);
+  if (!(dataViewA instanceof DataView && dataViewB instanceof DataView)) {
+    return undefined;
+  }
 
   // Buffers are not equal when they do not have the same byte length
   if (dataViewA.byteLength !== dataViewB.byteLength) {

packages/pretty-format/src/__tests__/prettyFormat.test.ts

@@ -79,7 +79,12 @@ describe('prettyFormat()', () => {
 
   it('prints an array buffer', () => {
     const val = new ArrayBuffer(3);
-    expect(prettyFormat(val)).toBe('ArrayBuffer []');
+    expect(prettyFormat(val)).toBe('ArrayBuffer [\n  0,\n  0,\n  0,\n]');
+  });
+
+  it('prints an data view', () => {
+    const val = new DataView(new ArrayBuffer(3));
+    expect(prettyFormat(val)).toBe('DataView [\n  0,\n  0,\n  0,\n]');
   });
 
   it('prints a nested array', () => {

packages/pretty-format/src/collections.ts

@@ -146,33 +146,42 @@ export function printIteratorValues(
  * without surrounding punctuation (for example, brackets)
  **/
 export function printListItems(
-  list: ArrayLike<unknown>,
+  list: ArrayLike<unknown> | DataView | ArrayBuffer,
   config: Config,
   indentation: string,
   depth: number,
   refs: Refs,
   printer: Printer,
 ): string {
   let result = '';
+  list = list instanceof ArrayBuffer ? new DataView(list) : list;
+  const isDataView = (l: unknown): l is DataView => l instanceof DataView;
+  const length = isDataView(list) ? list.byteLength : list.length;
 
-  if (list.length > 0) {
+  if (length > 0) {
     result += config.spacingOuter;
 
     const indentationNext = indentation + config.indent;
 
-    for (let i = 0; i < list.length; i++) {
+    for (let i = 0; i < length; i++) {
       result += indentationNext;
 
       if (i === config.maxWidth) {
         result += '…';
         break;
       }
 
-      if (i in list) {
-        result += printer(list[i], config, indentationNext, depth, refs);
+      if (isDataView(list) || i in list) {
+        result += printer(
+          isDataView(list) ? list.getInt8(i) : list[i],
+          config,
+          indentationNext,
+          depth,
+          refs,
+        );
       }
 
-      if (i < list.length - 1) {
+      if (i < length - 1) {
         result += `,${config.spacingInner}`;
       } else if (!config.min) {
         result += ',';