Merge branch 'main' into fix-child-circular-result

Author: nodkz

CHANGELOG.md

@@ -25,6 +25,7 @@
 - `[jest-config]` Make sure to respect `runInBand` option ([#14578](https://github.com/facebook/jest/pull/14578))
 - `[@jest/expect-utils]` Fix comparison of `DataView` ([#14408](https://github.com/jestjs/jest/pull/14408))
 - `[@jest/expect-utils]` [**BREAKING**] exclude non-enumerable in object matching ([#14670](https://github.com/jestjs/jest/pull/14670))
+- `[@jest/expect-utils]` Fix comparison of `URL` ([#14672](https://github.com/jestjs/jest/pull/14672))
 - `[jest-leak-detector]` Make leak-detector more aggressive when running GC ([#14526](https://github.com/jestjs/jest/pull/14526))
 - `[jest-runtime]` Properly handle re-exported native modules in ESM via CJS ([#14589](https://github.com/jestjs/jest/pull/14589))
 - `[jest-util]` Make sure `isInteractive` works in a browser ([#14552](https://github.com/jestjs/jest/pull/14552))
@@ -53,6 +54,7 @@
 - `[jest-config, @jest/core, jest-util]` Upgrade `ci-info` ([#14655](https://github.com/jestjs/jest/pull/14655))
 - `[jest-mock]` [**BREAKING**] Remove `MockFunctionMetadataType`, `MockFunctionMetadata` and `SpyInstance` types ([#14621](https://github.com/jestjs/jest/pull/14621))
 - `[jest-transform]` Upgrade `write-file-atomic` ([#14274](https://github.com/jestjs/jest/pull/14274))
+- `[jest-util]` Upgrade `picomatch` to v3 ([#14653](https://github.com/jestjs/jest/pull/14653))
 
 ## 29.7.0
 

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

@@ -8,6 +8,7 @@
 
 import {List, OrderedMap, OrderedSet, Record} from 'immutable';
 import {stringify} from 'jest-matcher-utils';
+import {equals} from '../jasmineUtils';
 import {
   arrayBufferEquality,
   emptyObject,
@@ -623,9 +624,21 @@ describe('arrayBufferEquality', () => {
     expect(arrayBufferEquality(a, b)).toBeTruthy();
   });
 
-  test('returns false when given matching DataView', () => {
+  test('returns false when given non-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();
   });
+
+  test('returns true when given matching URL', () => {
+    const a = new URL('https://jestjs.io/');
+    const b = new URL('https://jestjs.io/');
+    expect(equals(a, b)).toBeTruthy();
+  });
+
+  test('returns false when given non-matching URL', () => {
+    const a = new URL('https://jestjs.io/docs/getting-started');
+    const b = new URL('https://jestjs.io/docs/getting-started#using-babel');
+    expect(equals(a, b)).toBeFalsy();
+  });
 });

packages/expect-utils/src/jasmineUtils.ts

@@ -125,6 +125,9 @@ function eq(
     // RegExps are compared by their source patterns and flags.
     case '[object RegExp]':
       return a.source === b.source && a.flags === b.flags;
+    // URLs are compared by their href property which contains the entire url string.
+    case '[object URL]':
+      return a.href === b.href;
   }
   if (typeof a !== 'object' || typeof b !== 'object') {
     return false;

packages/jest-util/package.json

@@ -24,7 +24,7 @@
     "chalk": "^4.0.0",
     "ci-info": "^4.0.0",
     "graceful-fs": "^4.2.9",
-    "picomatch": "^2.2.3"
+    "picomatch": "^3.0.0"
   },
   "devDependencies": {
     "@types/graceful-fs": "^4.1.3",

yarn.lock

@@ -13437,7 +13437,7 @@ __metadata:
     chalk: ^4.0.0
     ci-info: ^4.0.0
     graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
+    picomatch: ^3.0.0
   languageName: unknown
   linkType: soft
 
@@ -17403,6 +17403,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picomatch@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "picomatch@npm:3.0.0"
+  checksum: a55ddf301a3b817463f4fad841573be9c8efc33472359b641dcaef3069db78ed8c4924c499c8b9e06af406f426732458bd1ae90222eb346e9c4547491dcc05ae
+  languageName: node
+  linkType: hard
+
 "pify@npm:^2.3.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"