diff --git a/cypress/e2e/happypath/recovery_hp_1.cy.js b/cypress/e2e/happypath/recovery_hp_1.cy.js index bb036e11fc..e542eead30 100644 --- a/cypress/e2e/happypath/recovery_hp_1.cy.js +++ b/cypress/e2e/happypath/recovery_hp_1.cy.js @@ -34,13 +34,7 @@ describe('Recovery happy path tests 1', () => { recovery.clickOnNextBtn() tx.executeFlow_1() recovery.verifyRecovererAdded([constants.SEPOLIA_OWNER_2_SHORT]) - recovery.clearRecoverers() - - // recovery.removeRecoverer(0, constants.SEPOLIA_OWNER_2) - // recovery.clickOnNextBtn() - // tx.executeFlow_1() - recovery.getSetupRecoveryBtn() }) }) diff --git a/cypress/e2e/pages/main.page.js b/cypress/e2e/pages/main.page.js index a7088c060f..229e7e963d 100644 --- a/cypress/e2e/pages/main.page.js +++ b/cypress/e2e/pages/main.page.js @@ -194,6 +194,16 @@ export function acceptCookies(index = 0) { }) } +export function acceptCookies2() { + cy.wait(2000) + cy.get('body').then(($body) => { + if ($body.find('button:contains(' + acceptSelection + ')').length > 0) { + cy.contains('button', acceptSelection).click() + cy.wait(500) + } + }) +} + export function verifyOwnerConnected(prefix = 'sep:') { cy.get(connectedOwnerBlock).should('contain', prefix) } diff --git a/cypress/e2e/pages/nfts.pages.js b/cypress/e2e/pages/nfts.pages.js index dcd566f383..84b51313f4 100644 --- a/cypress/e2e/pages/nfts.pages.js +++ b/cypress/e2e/pages/nfts.pages.js @@ -22,7 +22,7 @@ const txDetailsSummary = '[data-testid="decoded-tx-summary"]' const txAccordionDetails = '[data-testid="decoded-tx-details"]' const accordionActionItem = '[data-testid="action-item"]' -const noneNFTSelected = '0 NFTs selected' +const noneNFTSelected = /0 NFT[s]? selected/ const sendNFTStr = 'Send NFTs' const recipientAddressStr = 'Recipient address or ENS' const selectedNFTStr = 'Selected NFTs' diff --git a/cypress/e2e/pages/recovery.pages.js b/cypress/e2e/pages/recovery.pages.js index 9c84ea3fcc..4734e22da2 100644 --- a/cypress/e2e/pages/recovery.pages.js +++ b/cypress/e2e/pages/recovery.pages.js @@ -101,7 +101,6 @@ export function getSetupRecoveryBtn() { export function clickOnSetupRecoveryBtn() { getSetupRecoveryBtn().click() - cy.get(setupRecoveryModalBtn).should('be.visible') } export function clickOnSetupRecoveryModalBtn() { diff --git a/cypress/e2e/pages/sidebar.pages.js b/cypress/e2e/pages/sidebar.pages.js index a2bd1c0ad7..481e9bc923 100644 --- a/cypress/e2e/pages/sidebar.pages.js +++ b/cypress/e2e/pages/sidebar.pages.js @@ -349,7 +349,7 @@ export function checkSafeGroupBalance(index) { .find(groupBalance) .invoke('text') .should('include', '$') - .and('match', /\d+\.\d{2}/) + .and('match', /\$?\s?\d+(\.\d{1,3})?/) } export function checkSafeGroupAddress(index, address) { diff --git a/cypress/e2e/smoke/load_safe.cy.js b/cypress/e2e/smoke/load_safe.cy.js index ff05d98de6..b2665cc2ad 100644 --- a/cypress/e2e/smoke/load_safe.cy.js +++ b/cypress/e2e/smoke/load_safe.cy.js @@ -17,7 +17,6 @@ describe('[SMOKE] Load Safe tests', () => { beforeEach(() => { cy.visit(constants.loadNewSafeSepoliaUrl) - cy.wait(2000) }) it('[SMOKE] Verify a network can be selected in the Safe', () => { diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js index 5be72d9f02..d4394774d7 100644 --- a/cypress/support/e2e.js +++ b/cypress/support/e2e.js @@ -19,6 +19,8 @@ import './commands' import './safe-apps-commands' import * as constants from './constants' import * as ls from './localstorage_data' +import { acceptCookies2 } from '../e2e/pages/main.page' + // Alternatively you can use CommonJS syntax: // require('./commands') @@ -73,5 +75,8 @@ beforeEach(() => { constants.localStorageKeys.SAFE_v2__SafeApps__infoModal, ls.appPermissions(constants.safeTestAppurl).infoModalAccepted, ) + cy.wrap(window.localStorage).invoke('getItem', cookiesKey).should('equal', ls.cookies.acceptedCookies) }) + cy.visit(constants.setupUrl + 'sep:0xBb26E3717172d5000F87DeFd391994f789D80aEB') + acceptCookies2() })