use tick instead of waituntil

ChainSafe · Oct 12, 2023 · fb833e4 · fb833e4
1 parent f3040eb
commit fb833e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/packages/ui/cypress/tests/login.cy.ts b/packages/ui/cypress/tests/login.cy.ts
@@ -2,18 +2,20 @@ import { injectedAccounts } from '../fixtures/injectedAccounts'
 import { landingPageUrl } from '../fixtures/landingData'
 import { landingPage } from '../support/page-objects/landingPage'
 import { topMenuItems } from '../support/page-objects/topMenuItems'
-import { waitForAuthRequest } from '../utils/waitForAuthRequests'
 
 describe('Connect Account', () => {
   beforeEach(() => {
     cy.visit(landingPageUrl)
     cy.initExtension(injectedAccounts)
+    cy.clock()
     topMenuItems.connectButton().click()
     landingPage.accountsLoader().should('contain', 'Loading accounts')
+    cy.tick(500)
+    // restore the clock to prevent WS errors
+    cy.clock().invoke('restore')
   })
 
   it('Reject connection', () => {
-    waitForAuthRequest()
     cy.getAuthRequests().then((authRequests) => {
       const requests = Object.values(authRequests)
       // we should have 1 connection request to the extension
@@ -28,7 +30,6 @@ describe('Connect Account', () => {
   })
 
   it('Connects with Alice', () => {
-    waitForAuthRequest()
     const AliceAddress = Object.values(injectedAccounts)[0].address
     cy.getAuthRequests().then((authRequests) => {
       const requests = Object.values(authRequests)

diff --git a/packages/ui/cypress/tests/transactions.cy.ts b/packages/ui/cypress/tests/transactions.cy.ts
@@ -6,7 +6,6 @@ import { multisigPage } from '../support/page-objects/multisigPage'
 import { notifications } from '../support/page-objects/notifications'
 import { sendTxModal } from '../support/page-objects/sendTxModal'
 import { topMenuItems } from '../support/page-objects/topMenuItems'
-import { waitForAuthRequest } from '../utils/waitForAuthRequests'
 import { waitForTxRequest } from '../utils/waitForTxRequests'
 
 const AliceAddress = Object.values(injectedAccounts)[0].address
@@ -21,9 +20,12 @@ describe('Perform transactions', () => {
   beforeEach(() => {
     cy.visit(landingPageUrl)
     cy.initExtension(injectedAccounts)
+    cy.clock()
     topMenuItems.connectButton().click()
     landingPage.accountsLoader().should('contain', 'Loading accounts')
-    waitForAuthRequest()
+    cy.tick(500)
+    // restore the clock to prevent WS errors
+    cy.clock().invoke('restore')
     cy.getAuthRequests().then((authRequests) => {
       const requests = Object.values(authRequests)
       // we should have 1 connection request to the extension

diff --git a/packages/ui/cypress/utils/waitForAuthRequests.ts b/packages/ui/cypress/utils/waitForAuthRequests.ts