tests: fix cypress tests on dev (#3374)

safe-global · Mar 1, 2024 · a5cfae4 · a5cfae4
1 parent 65a946a
commit a5cfae4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/cypress/e2e/pages/create_wallet.pages.js b/cypress/e2e/pages/create_wallet.pages.js
@@ -24,6 +24,7 @@ const networkFeeSection = '[data-tetid="network-fee-section"]'
 const nextBtn = '[data-testid="next-btn"]'
 const backBtn = '[data-testid="back-btn"]'
 const cancelBtn = '[data-testid="cancel-btn"]'
+const loginBtn = '[data-testid="login-btn"]'
 
 const sponsorStr = 'Your account is sponsored by Goerli'
 const safeCreationProcessing = 'Transaction is being executed'
@@ -34,9 +35,13 @@ export const walletName = 'test1-sepolia-safe'
 export const defaultSepoliaPlaceholder = 'Sepolia Safe'
 const welcomeToSafeStr = 'Welcome to Safe'
 
+export function clickOnLoginBtn() {
+  cy.get(loginBtn).click()
+}
+
 export function cancelWalletCreation() {
   cy.get(cancelBtn).click()
-  cy.get(createNewSafeBtn).should('be.visible')
+  cy.get('button').contains(continueWithWalletBtn).should('be.visible')
 }
 
 export function clickOnBackBtn() {

diff --git a/cypress/e2e/pages/sidebar.pages.js b/cypress/e2e/pages/sidebar.pages.js
@@ -128,6 +128,7 @@ export function verifySafeCount(count) {
 
 export function openSidebar() {
   cy.get(openSafesIcon).click()
+  cy.wait(500)
   showAllSafes()
   main.verifyElementsExist([sidebarSafeContainer])
 }

diff --git a/cypress/e2e/regression/create_safe_simple_2.cy.js b/cypress/e2e/regression/create_safe_simple_2.cy.js
@@ -18,6 +18,7 @@ describe('Safe creation tests 2', () => {
 
   it('Cancel button cancels safe creation', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     createwallet.clickOnBackBtn()
@@ -27,6 +28,7 @@ describe('Safe creation tests 2', () => {
   // Owners and confirmation step
   it('Verify Next button is disabled when address is empty', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     safe.clearOwnerAddress(0)
@@ -39,6 +41,7 @@ describe('Safe creation tests 2', () => {
       .addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sameOwnerName)
       .then(() => {
         cy.visit(constants.welcomeUrl + '?chain=sep')
+        createwallet.clickOnContinueWithWalletBtn()
         createwallet.clickOnCreateNewSafeBtn()
         safe.clickOnNextBtn()
         safe.verifyOwnerNamesInConfirmationStep(ownerSepolia)
@@ -51,6 +54,7 @@ describe('Safe creation tests 2', () => {
       .addToLocalStorage(constants.localStorageKeys.SAFE_v2__addressBook, ls.addressBookData.sameOwnerName[1])
       .then(() => {
         cy.visit(constants.welcomeUrl + '?chain=sep')
+        createwallet.clickOnContinueWithWalletBtn()
         createwallet.clickOnCreateNewSafeBtn()
         safe.clickOnNextBtn()
         safe.verifyDataDoesNotExist(ownerSepolia)
@@ -59,6 +63,7 @@ describe('Safe creation tests 2', () => {
 
   it('Verify an valid name for owner can be inputed', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     safe.inputOwnerName(0, ownerName)
@@ -67,6 +72,7 @@ describe('Safe creation tests 2', () => {
 
   it('Verify Threshold matching required confirmations max with amount of owners', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     safe.clickOnAddNewOwnerBtn()
@@ -75,6 +81,7 @@ describe('Safe creation tests 2', () => {
 
   it('Verify deleting owner rows updates the currenlty set policies value', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     safe.clickOnAddNewOwnerBtn()
@@ -85,6 +92,7 @@ describe('Safe creation tests 2', () => {
 
   it('Verify ENS name in the address and name fields is resolved', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     safe.inputOwnerAddress(0, constants.ENS_TEST_SEPOLIA_VALID)
@@ -94,6 +102,7 @@ describe('Safe creation tests 2', () => {
 
   it('Verify deleting owner rows is possible', () => {
     owner.waitForConnectionStatus()
+    createwallet.clickOnContinueWithWalletBtn()
     createwallet.clickOnCreateNewSafeBtn()
     safe.clickOnNextBtn()
     safe.clickOnAddNewOwnerBtn()
@@ -108,6 +117,7 @@ describe('Safe creation tests 2', () => {
       .then(() => {
         owner.waitForConnectionStatus()
         cy.visit(constants.welcomeUrl + '?chain=sep')
+        createwallet.clickOnContinueWithWalletBtn()
         createwallet.clickOnCreateNewSafeBtn()
         safe.clickOnNextBtn()
         safe.inputOwnerAddress(0, constants.RECIPIENT_ADDRESS)