From 76e6a0f7fc4a218856635130eb18e9696ed88d05 Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Fri, 16 Dec 2022 15:34:49 +0100 Subject: [PATCH] chore: cleanup --- packages/vitest/src/runtime/error.ts | 6 +++--- packages/vitest/src/utils/base.ts | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/vitest/src/runtime/error.ts b/packages/vitest/src/runtime/error.ts index 6417ca86c7cf..8ea6a4c7f802 100644 --- a/packages/vitest/src/runtime/error.ts +++ b/packages/vitest/src/runtime/error.ts @@ -136,13 +136,13 @@ function isReplaceable(obj1: any, obj2: any) { return obj1Type === obj2Type && obj1Type === 'Object' } -export function replaceAsymmetricMatcher(actual: any, expected: any, actualReplaced = new WeakMap(), expectedReplaced = new WeakMap()) { +export function replaceAsymmetricMatcher(actual: any, expected: any, actualReplaced = new WeakSet(), expectedReplaced = new WeakSet()) { if (!isReplaceable(actual, expected)) return { replacedActual: actual, replacedExpected: expected } if (actualReplaced.has(actual) || expectedReplaced.has(expected)) return { replacedActual: actual, replacedExpected: expected } - actualReplaced.set(actual, true) - expectedReplaced.set(expected, true) + actualReplaced.add(actual) + expectedReplaced.add(expected) ChaiUtil.getOwnEnumerableProperties(expected).forEach((key) => { const expectedValue = expected[key] const actualValue = actual[key] diff --git a/packages/vitest/src/utils/base.ts b/packages/vitest/src/utils/base.ts index bfe92430b3de..fe8765cbffb8 100644 --- a/packages/vitest/src/utils/base.ts +++ b/packages/vitest/src/utils/base.ts @@ -37,10 +37,6 @@ export function slash(str: string) { return str.replace(/\\/g, '/') } -export function mergeSlashes(str: string) { - return str.replace(/\/\//g, '/') -} - export const noop = () => { } export function getType(value: unknown): string {