Tests: Make tests independent (#2736)

cypress/e2e/pages/address_book.page.js

@@ -67,6 +67,13 @@ export function verifyNewEntryAdded(name, address) {
   cy.contains(address).should('exist')
 }
 
+export function addEntry(name, address) {
+  typeInName(name)
+  typeInAddress(address)
+  clickOnSaveEntryBtn()
+  verifyNewEntryAdded(name, address)
+}
+
 export function clickOnEditEntryBtn() {
   cy.get(editEntryBtn).click({ force: true })
 }

cypress/e2e/pages/batches.pages.js

@@ -89,7 +89,7 @@ export function verifyAmountTransactionsInBatch(count) {
 }
 
 export function clickOnConfirmBatchBtn() {
-  cy.contains(confirmBatchBtn).click()
+  cy.get('button').contains(confirmBatchBtn).should('be.visible').should('be.enabled').click()
 }
 
 export function verifyBatchTransactionsCount(count) {

cypress/e2e/pages/load_safe.pages.js

@@ -39,6 +39,10 @@ export function selectPolygon() {
   cy.contains('span', constants.networks.polygon)
 }
 
+export function inputNameAndAddress(name, address) {
+  inputName(name)
+  inputAddress(address)
+}
 export function inputName(name) {
   cy.get(nameInput).type(name).should('have.value', name)
 }

cypress/e2e/safe-apps/info_modal.cy.js

@@ -3,7 +3,7 @@ import * as main from '../pages/main.page'
 import * as safeapps from '../pages/safeapps.pages'
 
 describe('Safe Apps info modal tests', () => {
-  before(() => {
+  beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(constants.SEPOLIA_TEST_SAFE_5 + constants.appsUrl, { failOnStatusCode: false })
     main.acceptCookies()

cypress/e2e/safe-apps/preview_drawer.cy.js

@@ -3,7 +3,7 @@ import * as main from '../pages/main.page'
 import * as safeapps from '../pages/safeapps.pages'
 
 describe('Safe Apps info modal tests', () => {
-  before(() => {
+  beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(`/${constants.SEPOLIA_TEST_SAFE_5}/apps`, { failOnStatusCode: false })
     main.acceptCookies()

cypress/e2e/safe-apps/tx_modal.cy.js

@@ -6,10 +6,8 @@ const testAppName = 'Cypress Test App'
 const testAppDescr = 'Cypress Test App Description'
 
 describe('Transaction modal tests', () => {
-  before(() => {
-    cy.clearLocalStorage()
-  })
   beforeEach(() => {
+    cy.clearLocalStorage()
     cy.fixture('safe-app').then((html) => {
       cy.intercept('GET', `${constants.testAppUrl}/*`, html)
       cy.intercept('GET', `*/manifest.json`, {

cypress/e2e/smoke/address_book.cy.js

@@ -9,28 +9,29 @@ const NAME = 'Owner1'
 const EDITED_NAME = 'Edited Owner1'
 
 describe('Address book tests', () => {
-  before(() => {
+  beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(constants.addressBookUrl + constants.SEPOLIA_TEST_SAFE_1)
-    main.acceptCookies()
+    main.acceptCookies(1)
   })
 
   it('Verify entry can be added [C56061]', () => {
     addressBook.clickOnCreateEntryBtn()
-    addressBook.typeInName(NAME)
-    addressBook.typeInAddress(constants.RECIPIENT_ADDRESS)
-    addressBook.clickOnSaveEntryBtn()
-    addressBook.verifyNewEntryAdded(NAME, constants.RECIPIENT_ADDRESS)
+    addressBook.addEntry(NAME, constants.RECIPIENT_ADDRESS)
   })
 
   it('Verify entered entry in Name input can be saved [C56063]', () => {
+    addressBook.clickOnCreateEntryBtn()
+    addressBook.addEntry(NAME, constants.RECIPIENT_ADDRESS)
     addressBook.clickOnEditEntryBtn()
     addressBook.typeInNameInput(EDITED_NAME)
     addressBook.clickOnSaveButton()
     addressBook.verifyNameWasChanged(NAME, EDITED_NAME)
   })
 
   it('Verify entry can be deleted [C56062]', () => {
+    addressBook.clickOnCreateEntryBtn()
+    addressBook.addEntry(NAME, constants.RECIPIENT_ADDRESS)
     // Click the delete button in the first entry
     addressBook.clickDeleteEntryButton()
     addressBook.clickDeleteEntryModalDeleteButton()
@@ -63,6 +64,8 @@ describe('Address book tests', () => {
   })
 
   it('Verify the address book file can be downloaded [C56065]', () => {
+    addressBook.clickOnImportFileBtn()
+    addressBook.importFile()
     // Download the export file
     const date = format(new Date(), 'yyyy-MM-dd', { timeZone: 'UTC' })
     const fileName = `safe-address-book-${date}.csv` //name that is given to the file automatically

cypress/e2e/smoke/balances.cy.js

@@ -11,7 +11,7 @@ describe('Balance tests', () => {
   // Fiat balance regex
   const fiatRegex = balances.fiatRegex
 
-  before(() => {
+  beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(constants.BALANCE_URL + constants.SEPOLIA_TEST_SAFE_5)
     main.acceptCookies(2)
@@ -114,6 +114,7 @@ describe('Balance tests', () => {
   })
 
   it('Verify a token can be unhidden [C56081]', () => {
+    balances.hideAsset(balances.currencyDaiCap)
     balances.openHideTokenMenu()
     balances.clickOnTokenCheckbox(balances.currencyDaiCap)
     balances.saveHiddenTokenSelection()

cypress/e2e/smoke/load_safe.cy.js

@@ -19,7 +19,7 @@ const OWNER_ENS_DEFAULT_NAME = 'test20.eth'
 const OWNER_ADDRESS = constants.EOA
 
 describe('Load Safe tests', () => {
-  before(() => {
+  beforeEach(() => {
     cy.clearLocalStorage()
     cy.visit(constants.loadNewSafeSepoliaUrl)
     main.acceptCookies()
@@ -39,10 +39,8 @@ describe('Load Safe tests', () => {
     cy.get('input[name="address"]').parent().prev('label').as('addressLabel')
 
     createwallet.verifyDefaultWalletName(createwallet.defaltSepoliaPlaceholder)
-
-    safe.inputName(testSafeName)
     safe.verifyIncorrectAddressErrorMessage()
-    safe.inputAddress(constants.SEPOLIA_TEST_SAFE_1)
+    safe.inputNameAndAddress(testSafeName, constants.SEPOLIA_TEST_SAFE_1)
 
     // Type an invalid address
     // cy.get('input[name="address"]').clear().type(EOA_ADDRESS)
@@ -65,17 +63,29 @@ describe('Load Safe tests', () => {
   })
 
   it('Verify custom name in the first owner an be set [C56120]', () => {
+    safe.inputNameAndAddress(testSafeName, constants.SEPOLIA_TEST_SAFE_1)
+    safe.clickOnNextBtn()
     createwallet.typeOwnerName(testOwnerName, 0)
     safe.clickOnNextBtn()
   })
 
   it('Verify Safe and owner names are displayed in the Review step [C56121]', () => {
+    safe.inputNameAndAddress(testSafeName, constants.SEPOLIA_TEST_SAFE_1)
+    safe.clickOnNextBtn()
+    createwallet.typeOwnerName(testOwnerName, 0)
+    safe.clickOnNextBtn()
     safe.verifyDataInReviewSection(testSafeName, testOwnerName)
     safe.clickOnAddBtn()
   })
 
   it('Verify the custom Safe name is successfully loaded [C56122]', () => {
-    main.verifyHomeSafeUrl(constants.SEPOLIA_TEST_SAFE_1)
+    safe.inputNameAndAddress(testSafeName, constants.SEPOLIA_TEST_SAFE_2)
+    safe.clickOnNextBtn()
+    createwallet.typeOwnerName(testOwnerName, 0)
+    safe.clickOnNextBtn()
+    safe.verifyDataInReviewSection(testSafeName, testOwnerName)
+    safe.clickOnAddBtn()
+    main.verifyHomeSafeUrl(constants.SEPOLIA_TEST_SAFE_2)
     safe.veriySidebarSafeNameIsVisible(testSafeName)
     safe.verifyOwnerNamePresentInSettings(testOwnerName)
   })

cypress/e2e/smoke/tx_history.cy.js

@@ -20,11 +20,10 @@ describe('Transaction history tests', () => {
     main.acceptCookies(1)
   })
 
-  it('Verify October 9th transactions are displayed [C56128]', () => {
+  it('Verify October 29th transactions are displayed [C56128]', () => {
     const DATE = 'Oct 29, 2023'
     const NEXT_DATE_LABEL = 'Oct 20, 2023'
     const amount = '0.00001 ETH'
-    const time = '10:39 PM'
     const success = 'Success'
 
     createTx.verifyDateExists(DATE)
@@ -42,7 +41,6 @@ describe('Transaction history tests', () => {
       // Info
       createTx.verifyImageAltTxt(1, constants.tokenAbbreviation.sep)
       createTx.verifyTransactionStrExists(amount)
-      createTx.verifyTransactionStrExists(time)
       createTx.verifyTransactionStrExists(success)
     })
   })