From 187bcc8f38417544e30789baf87845c3d26c77cb Mon Sep 17 00:00:00 2001 From: katspaugh Date: Tue, 1 Aug 2023 16:52:26 +0200 Subject: [PATCH] Rm the connectE2EWallet command --- cypress/e2e/add_owner.cy.js | 2 -- cypress/e2e/create_safe.cy.js | 2 -- cypress/e2e/non_owner_spending_limit.cy.js | 2 -- cypress/e2e/smoke/create_safe_simple.cy.js | 2 -- cypress/e2e/smoke/create_tx.cy.js | 1 - cypress/e2e/smoke/nfts.cy.js | 2 -- cypress/e2e/smoke/pending_actions.cy.js | 2 -- cypress/e2e/spending_limit.cy.js | 2 -- cypress/e2e/tx_modal.cy.js | 2 -- cypress/e2e/tx_simulation.cy.js | 2 -- cypress/support/commands.js | 6 ------ 11 files changed, 25 deletions(-) diff --git a/cypress/e2e/add_owner.cy.js b/cypress/e2e/add_owner.cy.js index 3bc9275b1f..d63a568e5f 100644 --- a/cypress/e2e/add_owner.cy.js +++ b/cypress/e2e/add_owner.cy.js @@ -4,8 +4,6 @@ const offset = 7 describe('Adding an owner', () => { before(() => { - cy.connectE2EWallet() - cy.visit(`/${TEST_SAFE}/settings/setup`) cy.contains('button', 'Accept selection').click() diff --git a/cypress/e2e/create_safe.cy.js b/cypress/e2e/create_safe.cy.js index 04ea76eefc..3906b002d2 100644 --- a/cypress/e2e/create_safe.cy.js +++ b/cypress/e2e/create_safe.cy.js @@ -1,7 +1,5 @@ describe('Create Safe', () => { it('should create a new Safe', () => { - cy.connectE2EWallet() - cy.visit('/welcome') // Close cookie banner diff --git a/cypress/e2e/non_owner_spending_limit.cy.js b/cypress/e2e/non_owner_spending_limit.cy.js index da18f7f3c9..581a9f426b 100644 --- a/cypress/e2e/non_owner_spending_limit.cy.js +++ b/cypress/e2e/non_owner_spending_limit.cy.js @@ -3,8 +3,6 @@ const SPENDING_LIMIT_SAFE = 'gor:0xBE3C5aFF7f66c23fe71c3047911f9Aa0026b281B' describe('Check non-owner spending limit beneficiary modal', () => { before(() => { - cy.connectE2EWallet() - cy.visit(`/${SPENDING_LIMIT_SAFE}/home`, { failOnStatusCode: false }) cy.contains('Accept selection').click() diff --git a/cypress/e2e/smoke/create_safe_simple.cy.js b/cypress/e2e/smoke/create_safe_simple.cy.js index 30b2540be7..1cd65e41f8 100644 --- a/cypress/e2e/smoke/create_safe_simple.cy.js +++ b/cypress/e2e/smoke/create_safe_simple.cy.js @@ -3,8 +3,6 @@ const OWNER_ADDRESS = '0xE297437d6b53890cbf004e401F3acc67c8b39665' describe('Create Safe form', () => { it('should navigate to the form', () => { - cy.connectE2EWallet() - cy.visit('/welcome') // Close cookie banner diff --git a/cypress/e2e/smoke/create_tx.cy.js b/cypress/e2e/smoke/create_tx.cy.js index 49d2f9a66d..df92ed35c8 100644 --- a/cypress/e2e/smoke/create_tx.cy.js +++ b/cypress/e2e/smoke/create_tx.cy.js @@ -6,7 +6,6 @@ const currentNonce = 3 describe('Queue a transaction on 1/N', () => { before(() => { - cy.connectE2EWallet() cy.useProdCGW() cy.visit(`/home?safe=${SAFE}`) diff --git a/cypress/e2e/smoke/nfts.cy.js b/cypress/e2e/smoke/nfts.cy.js index 75686930a7..2fbb78d723 100644 --- a/cypress/e2e/smoke/nfts.cy.js +++ b/cypress/e2e/smoke/nfts.cy.js @@ -2,8 +2,6 @@ const TEST_SAFE = 'gor:0x97d314157727D517A706B5D08507A1f9B44AaaE9' describe('Assets > NFTs', () => { before(() => { - cy.connectE2EWallet() - cy.visit(`/balances/nfts?safe=${TEST_SAFE}`) cy.contains('button', 'Accept selection').click() cy.contains(/E2E Wallet @ G(รถ|oe)rli/) diff --git a/cypress/e2e/smoke/pending_actions.cy.js b/cypress/e2e/smoke/pending_actions.cy.js index e381212f6d..080996a301 100644 --- a/cypress/e2e/smoke/pending_actions.cy.js +++ b/cypress/e2e/smoke/pending_actions.cy.js @@ -2,9 +2,7 @@ const SAFE = 'gor:0xCD4FddB8FfA90012DFE11eD4bf258861204FeEAE' describe('Pending actions', () => { before(() => { - cy.connectE2EWallet() cy.useProdCGW() - cy.visit(`/welcome`) cy.contains('button', 'Accept selection').click() }) diff --git a/cypress/e2e/spending_limit.cy.js b/cypress/e2e/spending_limit.cy.js index 9def385933..403d1b93ce 100644 --- a/cypress/e2e/spending_limit.cy.js +++ b/cypress/e2e/spending_limit.cy.js @@ -3,8 +3,6 @@ const SPENDING_LIMIT_SAFE = 'gor:0x28F95E682D1dd632b54Dc61740575f49DB39Eb7F' describe('Check spending limit modal', () => { before(() => { - cy.connectE2EWallet() - cy.visit(`/${SPENDING_LIMIT_SAFE}/home`, { failOnStatusCode: false }) cy.contains('Accept selection').click() diff --git a/cypress/e2e/tx_modal.cy.js b/cypress/e2e/tx_modal.cy.js index 1d50ca9f6a..89b92256d4 100644 --- a/cypress/e2e/tx_modal.cy.js +++ b/cypress/e2e/tx_modal.cy.js @@ -5,8 +5,6 @@ const SAFE_NONCE = '6' describe('Tx Modal', () => { before(() => { - cy.connectE2EWallet() - // Open the Safe used for testing cy.visit(`/${TEST_SAFE}`) cy.contains('a', 'Accept selection').click() diff --git a/cypress/e2e/tx_simulation.cy.js b/cypress/e2e/tx_simulation.cy.js index aeaed28cb7..885fc17b33 100644 --- a/cypress/e2e/tx_simulation.cy.js +++ b/cypress/e2e/tx_simulation.cy.js @@ -3,8 +3,6 @@ const RECIPIENT_ADDRESS = '0x6a5602335a878ADDCa4BF63a050E34946B56B5bC' describe('Tx Simulation', () => { before(() => { - cy.connectE2EWallet() - // Open the Safe used for testing cy.visit(`/${TEST_SAFE}/home`, { failOnStatusCode: false }) cy.contains('button', 'Accept selection').click() diff --git a/cypress/support/commands.js b/cypress/support/commands.js index b02c763ef2..2f9a1336ed 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -1,9 +1,3 @@ -Cypress.Commands.add('connectE2EWallet', () => { - cy.on('window:before:load', (window) => { - // @FIXME - }) -}) - Cypress.Commands.add('useProdCGW', () => { cy.on('window:before:load', (window) => { window.localStorage.setItem('SAFE_v2__debugProdCgw', JSON.stringify(true))