test: fix flaky e2e tests (ChainSafe#6231)

packages/cli/test/utils/runUtils.ts

@@ -17,20 +17,14 @@ export function findApiToken(dirpath: string): string {
 }
 
 export function expectDeepEquals<T>(a: T, b: T, message: string): void {
-  try {
-    expect(a).toEqual(b);
-  } catch (e) {
-    expect.fail(message);
-  }
+  expect(a).toEqualWithMessage(b, message);
 }
 
 /**
  * Similar to `expectDeepEquals` but only checks presence of all elements in array, irrespective of their order.
  */
 export function expectDeepEqualsUnordered<T>(a: T[], b: T[], message: string): void {
-  try {
-    expect(a.sort()).toEqual(b.sort());
-  } catch (e) {
-    expect.fail(message);
-  }
+  expect(a).toEqualWithMessage(expect.arrayContaining(b), message);
+  expect(b).toEqualWithMessage(expect.arrayContaining(a), message);
+  expect(a).toHaveLength(b.length);
 }

scripts/vitest/customMatchers.ts

@@ -42,40 +42,44 @@ expect.extend({
   toBeWithMessage(received: unknown, expected: unknown, message: string) {
     if (Object.is(received, expected)) {
       return {
-        message: () => "Expected value is truthy",
+        message: () => "Received value is the same as expected value",
         pass: true,
       };
     }
 
     return {
       pass: false,
       message: () => message,
+      actual: received,
+      expected,
     };
   },
   toSatisfy(received: unknown, func: (received: unknown) => boolean) {
     if (func(received)) {
       return {
-        message: () => "Expected value satisfied the condition",
+        message: () => "Received value satisfied the condition",
         pass: true,
       };
     }
 
     return {
       pass: false,
-      message: () => "Expected value did not satisfy the condition",
+      message: () => "Received value did not satisfy the condition",
     };
   },
   toEqualWithMessage(received: unknown, expected: unknown, message: string) {
     if (this.equals(received, expected)) {
       return {
-        message: () => "Expected value is truthy",
+        message: () => "Received value equals expected value",
         pass: true,
       };
     }
 
     return {
       pass: false,
       message: () => message,
+      actual: received,
+      expected,
     };
   },
 });