Hopefully fix flaky tests

base-org · Feb 15, 2024 · 87fbf7a · 87fbf7a
1 parent 7374a11
commit 87fbf7a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/src/hooks/L1/useWriteDepositERC20.test.ts b/src/hooks/L1/useWriteDepositERC20.test.ts
@@ -23,8 +23,10 @@ test('useWriteDepositERC20', async () => {
   })
 
   await waitFor(() => {
-    expect(result.current.error).toBeNull()
-    expect(result.current.isSuccess).toBeTruthy()
+    Promise.all([
+      expect(result.current.error).toBeNull(),
+      expect(result.current.isSuccess).toBeTruthy(),
+    ])
   })
 
   expect(result.current).toMatchInlineSnapshot(`

diff --git a/src/hooks/L1/useWriteDepositETH.test.ts b/src/hooks/L1/useWriteDepositETH.test.ts
@@ -18,9 +18,10 @@ test('useWriteDepositETH', async () => {
 
   // since we didn't use the async wait for it to succeed
   await waitFor(() => {
-    // check for error first so if one happens we can see it in the test failure
-    expect(result.current.error).toBeNull()
-    expect(result.current.isSuccess).toBeTruthy()
+    Promise.all([
+      expect(result.current.error).toBeNull(),
+      expect(result.current.isSuccess).toBeTruthy(),
+    ])
   })
 
   // now assert the result is what we expect

diff --git a/src/hooks/L1/useWriteFinalizeWithdrawalTransaction.test.ts b/src/hooks/L1/useWriteFinalizeWithdrawalTransaction.test.ts
@@ -18,8 +18,10 @@ test('useWriteFinalizeWithdrawalTransaction', async () => {
   })
 
   await waitFor(() => {
-    expect(result.current.error).toBeNull()
-    expect(result.current.isSuccess).toBeTruthy()
+    Promise.all([
+      expect(result.current.error).toBeNull(),
+      expect(result.current.isSuccess).toBeTruthy(),
+    ])
   })
 
   expect(result.current).toMatchInlineSnapshot(`

diff --git a/src/hooks/L1/useWriteProveWithdrawalTransaction.test.ts b/src/hooks/L1/useWriteProveWithdrawalTransaction.test.ts
@@ -18,9 +18,11 @@ test('useWriteProveWithdrawalTransaction', async () => {
   })
 
   await waitFor(() => {
-    expect(result.current.error).toBeNull()
-    // We're only checking that we're able to successfully call the contract. The snapshot
-    // will continue to change as blocks get procuded, and this check is sufficient.
-    expect(result.current.isSuccess).toBeTruthy()
+    Promise.all([
+      expect(result.current.error).toBeNull(),
+      // We're only checking that we're able to successfully call the contract. The snapshot
+      // will continue to change as blocks get procuded, and this check is sufficient.
+      expect(result.current.isSuccess).toBeTruthy(),
+    ])
   })
 }, { retry: 3 })
diff --git a/src/hooks/L2/useWriteWithdrawERC20.test.ts b/src/hooks/L2/useWriteWithdrawERC20.test.ts
@@ -28,8 +28,10 @@ test('useWriteWithdrawERC20', async () => {
   })
 
   await waitFor(() => {
-    expect(result.current.useWriteWithdrawERC20.error).toBeNull()
-    expect(result.current.useWriteWithdrawERC20.isSuccess).toBeTruthy()
+    Promise.all([
+      expect(result.current.useWriteWithdrawERC20.error).toBeNull(),
+      expect(result.current.useWriteWithdrawERC20.isSuccess).toBeTruthy(),
+    ])
   })
 
   expect(result.current.useWriteWithdrawERC20).toMatchInlineSnapshot(`

diff --git a/src/hooks/L2/useWriteWithdrawETH.test.ts b/src/hooks/L2/useWriteWithdrawETH.test.ts
@@ -27,8 +27,10 @@ test('useWriteWithdrawETH', async () => {
   })
 
   await waitFor(() => {
-    expect(result.current.useWriteWithdrawETH.error).toBeNull()
-    expect(result.current.useWriteWithdrawETH.isSuccess).toBeTruthy()
+    Promise.all([
+      expect(result.current.useWriteWithdrawETH.error).toBeNull(),
+      expect(result.current.useWriteWithdrawETH.isSuccess).toBeTruthy(),
+    ])
   })
 
   expect(result.current.useWriteWithdrawETH).toMatchInlineSnapshot(`