From faa9518ab88df2f94c58f129c0e41bdb1fa6f885 Mon Sep 17 00:00:00 2001 From: katspaugh <381895+katspaugh@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:26:58 +0200 Subject: [PATCH] Tests: fix tx destails tests (#4032) --- cypress/e2e/regression/messages_onchain.cy.js | 12 ++---------- cypress/e2e/regression/tx_history.cy.js | 4 ++-- cypress/e2e/regression/tx_history_2.cy.js | 8 +------- cypress/fixtures/txhistory_data_data.json | 7 ++++--- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/cypress/e2e/regression/messages_onchain.cy.js b/cypress/e2e/regression/messages_onchain.cy.js index 492e38fba2..a96af1c72b 100644 --- a/cypress/e2e/regression/messages_onchain.cy.js +++ b/cypress/e2e/regression/messages_onchain.cy.js @@ -21,21 +21,13 @@ describe('Onchain Messages tests', () => { it('Verify exapanded details for signed on-chain message', () => { createTx.clickOnTransactionItemByName(typeMessagesOnchain.contractName) - createTx.verifyExpandedDetails([ - typeMessagesOnchain.contractName, - typeMessagesOnchain.contractAddress, - typeMessagesOnchain.delegateCall, - ]) + createTx.verifyExpandedDetails([typeMessagesOnchain.contractName, typeMessagesOnchain.delegateCall]) }) it('Verify exapanded details for unsigned on-chain message', () => { cy.visit(constants.transactionQueueUrl + staticSafes.SEP_STATIC_SAFE_10) createTx.clickOnTransactionItemByName(typeMessagesOnchain.contractName) - createTx.verifyExpandedDetails([ - typeMessagesOnchain.contractName, - typeMessagesOnchain.contractAddress, - typeMessagesOnchain.delegateCall, - ]) + createTx.verifyExpandedDetails([typeMessagesOnchain.contractName, typeMessagesOnchain.delegateCall]) }) it('Verify summary for unsigned on-chain message', () => { diff --git a/cypress/e2e/regression/tx_history.cy.js b/cypress/e2e/regression/tx_history.cy.js index 469d45bda9..dad9ed5bd1 100644 --- a/cypress/e2e/regression/tx_history.cy.js +++ b/cypress/e2e/regression/tx_history.cy.js @@ -104,8 +104,8 @@ describe('Tx history tests 1', () => { createTx.clickOnTransactionItemByName(typeSpendingLimits.title, typeSpendingLimits.summaryTxInfo) createTx.verifyExpandedDetails( [ - typeSpendingLimits.title, - typeSpendingLimits.description, + typeSpendingLimits.contractTitle, + typeSpendingLimits.call_multiSend, typeSpendingLimits.transactionHash, typeSpendingLimits.safeTxHash, ], diff --git a/cypress/e2e/regression/tx_history_2.cy.js b/cypress/e2e/regression/tx_history_2.cy.js index ad4142bffa..22954e3fb0 100644 --- a/cypress/e2e/regression/tx_history_2.cy.js +++ b/cypress/e2e/regression/tx_history_2.cy.js @@ -62,13 +62,7 @@ describe('Tx history tests 2', () => { it('Verify exapanded details for batch', () => { createTx.clickOnTransactionItemByName(typeBatch.title, typeBatch.summaryTxInfo) createTx.verifyExpandedDetails( - [ - typeBatch.description, - typeBatch.contractTitle, - typeBatch.contractAddress, - typeBatch.transactionHash, - typeBatch.safeTxHash, - ], + [typeBatch.contractTitle, typeBatch.transactionHash, typeBatch.safeTxHash], createTx.delegateCallWarning, ) createTx.verifyActions([typeBatch.nativeTransfer.title]) diff --git a/cypress/fixtures/txhistory_data_data.json b/cypress/fixtures/txhistory_data_data.json index 5aa6d06ca9..e80972788f 100644 --- a/cypress/fixtures/txhistory_data_data.json +++ b/cypress/fixtures/txhistory_data_data.json @@ -154,19 +154,20 @@ "contractAddress": "sep:0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B", "transactionHash": "0x69c3...bc37", "safeTxHash": "0xf81c...243e", + "call_multiSend": "CallmultiSend", "enableModule": { "title": "enableModule", "description": "Interact with", "interactionAddress": "sep:0x5912f6616c84024cD1aff0D5b55bb36F5180fFdb", "moduleAddress": "sep:0xCFbF...3134", - "moduleAddressTitle": "module(address)" + "moduleAddressTitle": "module address" }, "addDelegate": { "title": "addDelegate", "description": "Interact with", "interactionAddress": "sep:0xCFbFaC74C26F8647cBDb8c5caf80BB5b32E43134", "delegateAddress": "sep:0xC16D...6fED", - "delegateAddressTitle": "delegate(address)" + "delegateAddressTitle": "delegate address" }, "setAllowance": { "title": "setAllowance", @@ -175,7 +176,7 @@ "allowanceAmount": "100000000000", "resetTimeMin": "0", "resetBaseMin": "0", - "delegateAddressTitle": "delegate(address)" + "delegateAddressTitle": "delegate address" } }, "untrustedReceivedToken": {