diff --git a/cypress/e2e/data-stream/create-data-stream-awskinesis.cy.js b/cypress/e2e/data-stream/create-data-stream-awskinesis.cy.js index 4722f68c4..1fdaf46d3 100644 --- a/cypress/e2e/data-stream/create-data-stream-awskinesis.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-awskinesis.cy.js @@ -49,11 +49,4 @@ describe('Data Stream spec', { tags: ['@dev2'] }, () => { ) cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-azureblobstorage.cy.js b/cypress/e2e/data-stream/create-data-stream-azureblobstorage.cy.js index ae45e9b28..da7f8a393 100644 --- a/cypress/e2e/data-stream/create-data-stream-azureblobstorage.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-azureblobstorage.cy.js @@ -50,11 +50,4 @@ describe('Data Stream spec', { tags: ['@dev2'] }, () => { ) cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-azuremonitor.cy.js b/cypress/e2e/data-stream/create-data-stream-azuremonitor.cy.js index b1ff76151..54bc1dda1 100644 --- a/cypress/e2e/data-stream/create-data-stream-azuremonitor.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-azuremonitor.cy.js @@ -53,11 +53,4 @@ describe('Data Stream spec', { tags: ['@dev2'] }, () => { ) cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-bigquery.cy.js b/cypress/e2e/data-stream/create-data-stream-bigquery.cy.js index 0cb4f5991..d5ae0340f 100644 --- a/cypress/e2e/data-stream/create-data-stream-bigquery.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-bigquery.cy.js @@ -44,11 +44,4 @@ describe('Data Stream spec', { tags: ['@dev2'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 'big_query') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-datadog.cy.js b/cypress/e2e/data-stream/create-data-stream-datadog.cy.js index b2a5fb682..00acf4b32 100644 --- a/cypress/e2e/data-stream/create-data-stream-datadog.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-datadog.cy.js @@ -46,11 +46,4 @@ describe('Data Stream spec', { tags: ['@dev2'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 'datadog') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-elasticsearch.cy.js b/cypress/e2e/data-stream/create-data-stream-elasticsearch.cy.js index 56ad77943..40874d172 100644 --- a/cypress/e2e/data-stream/create-data-stream-elasticsearch.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-elasticsearch.cy.js @@ -49,11 +49,4 @@ describe('Data Stream spec', { tags: ['@dev2'] }, () => { ) cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-ibmqradar.cy.js b/cypress/e2e/data-stream/create-data-stream-ibmqradar.cy.js index 259517373..59cfe94c2 100644 --- a/cypress/e2e/data-stream/create-data-stream-ibmqradar.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-ibmqradar.cy.js @@ -41,11 +41,4 @@ describe('Data Stream spec', { tags: ['@dev3'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 'qradar') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-kafka.cy.js b/cypress/e2e/data-stream/create-data-stream-kafka.cy.js index 6c0f45c03..be7ebc556 100644 --- a/cypress/e2e/data-stream/create-data-stream-kafka.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-kafka.cy.js @@ -42,11 +42,4 @@ describe('Data Stream spec', { tags: ['@dev3'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 'kafka') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-s3.cy.js b/cypress/e2e/data-stream/create-data-stream-s3.cy.js index c9c55cfff..dfaff48f5 100644 --- a/cypress/e2e/data-stream/create-data-stream-s3.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-s3.cy.js @@ -52,11 +52,4 @@ describe('Data Stream spec', { tags: ['@dev3'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 's3') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-splunk.cy.js b/cypress/e2e/data-stream/create-data-stream-splunk.cy.js index d9921a52d..57ac7dee2 100644 --- a/cypress/e2e/data-stream/create-data-stream-splunk.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-splunk.cy.js @@ -46,11 +46,4 @@ describe('Data Stream spec', { tags: ['@dev3'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 'splunk') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/data-stream/create-data-stream-standard.cy.js b/cypress/e2e/data-stream/create-data-stream-standard.cy.js index a7e4eb9e0..15e9194f7 100644 --- a/cypress/e2e/data-stream/create-data-stream-standard.cy.js +++ b/cypress/e2e/data-stream/create-data-stream-standard.cy.js @@ -38,11 +38,4 @@ describe('Data Stream spec', { tags: ['@dev3'] }, () => { cy.get(selectors.dataStream.list.columnName('endpointType')).should('have.text', 'standard') cy.get(selectors.dataStream.list.columnName('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: dataStreamName, productName: 'Data Stream' }).then(() => { - cy.verifyToast('Data Stream successfully deleted') - }) - }) }) diff --git a/cypress/e2e/digital-certificates/create-csr-certificate.cy.js b/cypress/e2e/digital-certificates/create-csr-certificate.cy.js index 57a2b41a1..7b02e772c 100644 --- a/cypress/e2e/digital-certificates/create-csr-certificate.cy.js +++ b/cypress/e2e/digital-certificates/create-csr-certificate.cy.js @@ -41,14 +41,4 @@ describe('Digital Certificates spec', { tags: ['@dev3'] }, () => { cy.get(selectors.digitalCertificates.copyCsrButton).click() cy.get(selectors.digitalCertificates.copyCsrMessage).should('have.text', 'Successfully copied!') }) - - afterEach(() => { - // Delete the digital certificate - cy.deleteEntityFromList({ - entityName: digitalCertificateName, - productName: 'Digital Certificates' - }).then(() => { - cy.verifyToast('Digital certificate successfully deleted!') - }) - }) }) diff --git a/cypress/e2e/digital-certificates/create-digital-certificate.cy.js b/cypress/e2e/digital-certificates/create-digital-certificate.cy.js index 55f911efb..17358b0d9 100644 --- a/cypress/e2e/digital-certificates/create-digital-certificate.cy.js +++ b/cypress/e2e/digital-certificates/create-digital-certificate.cy.js @@ -30,14 +30,4 @@ describe('Digital Certificates spec', { tags: ['@dev3'] }, () => { cy.get(selectors.list.filteredRow.column('name')).contains(digitalCertificateName) cy.get(selectors.list.filteredRow.statusColumn).should('have.text', 'Pending') }) - - afterEach(() => { - // Delete the digital certificate - cy.deleteEntityFromList({ - entityName: digitalCertificateName, - productName: 'Digital Certificates' - }).then(() => { - cy.verifyToast('Digital certificate successfully deleted!') - }) - }) }) diff --git a/cypress/e2e/digital-certificates/create-server-certificate.cy.js b/cypress/e2e/digital-certificates/create-server-certificate.cy.js index ea231a122..d2c711ee5 100644 --- a/cypress/e2e/digital-certificates/create-server-certificate.cy.js +++ b/cypress/e2e/digital-certificates/create-server-certificate.cy.js @@ -27,14 +27,4 @@ describe('Digital Certificates spec', { tags: ['@dev3'] }, () => { cy.verifyToast('success', 'Your digital certificate has been created!') cy.get(selectors.form.editPageTitle).should('have.text', 'Edit Digital Certificate') }) - - afterEach(() => { - // Delete the digital certificate - cy.deleteEntityFromList({ - entityName: digitalCertificateName, - productName: 'Digital Certificates' - }).then(() => { - cy.verifyToast('Digital certificate successfully deleted!') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/digital-certificates/create-trusted-ca-certificate.cy.js b/cypress/e2e/digital-certificates/create-trusted-ca-certificate.cy.js index 38748c18e..8d71a1b4e 100644 --- a/cypress/e2e/digital-certificates/create-trusted-ca-certificate.cy.js +++ b/cypress/e2e/digital-certificates/create-trusted-ca-certificate.cy.js @@ -31,14 +31,4 @@ describe('Digital Certificates spec', { tags: ['@dev3'] }, () => { ) cy.get(selectors.digitalCertificates.trustedCATextArea).should('have.text', '') }) - - afterEach(() => { - // Delete the digital certificate - cy.deleteEntityFromList({ - entityName: digitalCertificateName, - productName: 'Digital Certificates' - }).then(() => { - cy.verifyToast('Digital certificate successfully deleted!') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/digital-certificates/edit-digital-certificate.cy.js b/cypress/e2e/digital-certificates/edit-digital-certificate.cy.js index afb98f8b4..efc3b2280 100644 --- a/cypress/e2e/digital-certificates/edit-digital-certificate.cy.js +++ b/cypress/e2e/digital-certificates/edit-digital-certificate.cy.js @@ -48,14 +48,4 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { cy.get(selectors.list.filteredRow.column('name')).contains(certificateName) cy.get(selectors.list.filteredRow.statusColumn).should('have.text', 'Pending') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ - entityName: certificateName, - productName: 'Digital Certificates' - }).then(() => { - cy.verifyToast('Digital certificate successfully deleted!') - }) - }) }) diff --git a/cypress/e2e/domains/create-domain-edge-application.cy.js b/cypress/e2e/domains/create-domain-edge-application.cy.js index 777c98410..c66038284 100644 --- a/cypress/e2e/domains/create-domain-edge-application.cy.js +++ b/cypress/e2e/domains/create-domain-edge-application.cy.js @@ -26,7 +26,6 @@ const createEdgeFirewallCase = () => { cy.get(selectors.domains.edgeFirewallActionBar).find(selectors.form.actionsSubmitButton).click() cy.verifyToast('success', 'Your Edge Firewall has been created') - } const createDigitalCertificateCase = () => { @@ -45,7 +44,9 @@ const createDigitalCertificateCase = () => { cy.get(selectors.digitalCertificates.emailInput).type(`${digitalCertificateName}@example.com`) cy.get(selectors.digitalCertificates.sanTextarea).type(`${digitalCertificateName}.net`) - cy.intercept('GET', '/api/v4/digital_certificates/certificates/*?fields=*').as('getDigitalCertificatesApi') + cy.intercept('GET', '/api/v4/digital_certificates/certificates/*?fields=*').as( + 'getDigitalCertificatesApi' + ) // Act cy.get(selectors.domains.digitalCertificateActionBar) @@ -67,9 +68,18 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { // Arrange cy.openProduct('Domains') - cy.intercept('GET', '/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=').as('getEdgeApplicationList') - cy.intercept('GET', `/api/v4/edge_firewall/firewalls?ordering=name&page=1&page_size=100&fields=&search=`).as('getEdgeFirewallList') - cy.intercept('GET', '/api/v4/digital_certificates/certificates?ordering=name&page=1&page_size=100&fields=*&search=azion&type=*').as('searchDigitalCertificatesApi') + cy.intercept( + 'GET', + '/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=' + ).as('getEdgeApplicationList') + cy.intercept( + 'GET', + `/api/v4/edge_firewall/firewalls?ordering=name&page=1&page_size=100&fields=&search=` + ).as('getEdgeFirewallList') + cy.intercept( + 'GET', + '/api/v4/digital_certificates/certificates?ordering=name&page=1&page_size=100&fields=*&search=azion&type=*' + ).as('searchDigitalCertificatesApi') cy.get(selectors.domains.createButton).click() cy.get(selectors.domains.nameInput).type(domainName) @@ -112,12 +122,4 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { 'The domain is now available in the Domain management section.' ) }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: domainName, productName: 'Domains' }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - cy.deleteEntityFromList({ entityName: edgeAppName, productName: 'Edge Application' }) - }) }) diff --git a/cypress/e2e/domains/create-domain-lets-encrypt.cy.js b/cypress/e2e/domains/create-domain-lets-encrypt.cy.js index a671c10b8..824addd6f 100644 --- a/cypress/e2e/domains/create-domain-lets-encrypt.cy.js +++ b/cypress/e2e/domains/create-domain-lets-encrypt.cy.js @@ -76,12 +76,4 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { cy.get(selectors.domains.edgeCertificateOption).click() cy.get(selectors.domains.edgeCertificateOption).should('be.visible') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: domainName, productName: 'Domains' }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - cy.deleteEntityFromList({ entityName: edgeAppName, productName: 'Edge Application' }) - }) }) diff --git a/cypress/e2e/domains/create-domain-mtls.cy.js b/cypress/e2e/domains/create-domain-mtls.cy.js index 3aa8f22b0..1804d4999 100644 --- a/cypress/e2e/domains/create-domain-mtls.cy.js +++ b/cypress/e2e/domains/create-domain-mtls.cy.js @@ -99,12 +99,4 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { cy.get(selectors.domains.confirmButton).click() cy.get(selectors.domains.editPageTitle).should('have.text', 'Edit Domain') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: domainName, productName: 'Domains' }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - cy.deleteEntityFromList({ entityName: edgeAppName, productName: 'Edge Application' }) - }) }) diff --git a/cypress/e2e/domains/edit-domain.cy.js b/cypress/e2e/domains/edit-domain.cy.js index 47d22db96..7da98d4ed 100644 --- a/cypress/e2e/domains/edit-domain.cy.js +++ b/cypress/e2e/domains/edit-domain.cy.js @@ -42,7 +42,9 @@ const createDigitalCertificate = () => { cy.get(selectors.digitalCertificates.emailInput).type(`${digitalCertificateName}@example.com`) cy.get(selectors.digitalCertificates.sanTextarea).type(`${digitalCertificateName}.net`) - cy.intercept('GET', '/api/v4/digital_certificates/certificates/*?fields=*').as('getDigitalCertificatesApi') + cy.intercept('GET', '/api/v4/digital_certificates/certificates/*?fields=*').as( + 'getDigitalCertificatesApi' + ) // Act cy.get(selectors.domains.digitalCertificateActionBar) @@ -53,7 +55,10 @@ const createDigitalCertificate = () => { cy.verifyToast('success', 'Your digital certificate has been created!') cy.wait('@getDigitalCertificatesApi') - cy.get(selectors.domains.digitalCertificatesDropdownLetsEncrypt).should('have.text', digitalCertificateName) + cy.get(selectors.domains.digitalCertificatesDropdownLetsEncrypt).should( + 'have.text', + digitalCertificateName + ) cy.get(selectors.domains.digitalCertificatesDropdownLetsEncrypt).click() cy.get(selectors.domains.letsEncryptDropdownOption).click() } @@ -69,8 +74,14 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { // Arrange cy.openProduct('Domains') - cy.intercept('GET', '/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=').as('getEdgeApplicationList') - cy.intercept('GET', `/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=${edgeAppName}`).as('getEdgeApplicationListFilter') + cy.intercept( + 'GET', + '/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=' + ).as('getEdgeApplicationList') + cy.intercept( + 'GET', + `/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=${edgeAppName}` + ).as('getEdgeApplicationListFilter') cy.get(selectors.domains.createButton).click() cy.get(selectors.domains.nameInput).type(domainName) @@ -120,12 +131,4 @@ describe('Domains spec', { tags: ['@dev3'] }, () => { cy.get(selectors.domains.listTableBlockColumnNameRow).should('have.text', domainEditedName) cy.get(selectors.domains.listTableBlockColumnActiveRow).should('have.text', 'Inactive') }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: domainName, productName: 'Domains' }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - cy.deleteEntityFromList({ entityName: edgeAppName, productName: 'Edge Application' }) - }) }) diff --git a/cypress/e2e/edge-application/add-error-response.cy.js b/cypress/e2e/edge-application/add-error-response.cy.js index 484e73d98..83ff5a799 100644 --- a/cypress/e2e/edge-application/add-error-response.cy.js +++ b/cypress/e2e/edge-application/add-error-response.cy.js @@ -75,14 +75,4 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { cy.verifyToast('success', 'Your Error Responses has been edited') cy.get(selectors.form.actionsCancelButton).click() }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-application/add-origin.cy.js b/cypress/e2e/edge-application/add-origin.cy.js index 2041d62bc..bb157296a 100644 --- a/cypress/e2e/edge-application/add-origin.cy.js +++ b/cypress/e2e/edge-application/add-origin.cy.js @@ -62,7 +62,10 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { cy.get(selectors.edgeApplication.origins.addressInput).type('teste.com') cy.get(selectors.form.actionsSubmitButton).click() - cy.get('.p-component-overlay > .p-dialog > .p-dialog-header').should('have.text', 'Origin Key has been created') + cy.get('.p-component-overlay > .p-dialog > .p-dialog-header').should( + 'have.text', + 'Origin Key has been created' + ) cy.get(selectors.edgeApplication.origins.dialogCopyButton).click() cy.verifyToast('success', 'Your origin has been created') cy.verifyToast('Successfully copied!') @@ -72,14 +75,4 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { cy.get(selectors.list.searchInput).type(`${fixtures.originName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.originName) }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-application/create-device-groups.cy.js b/cypress/e2e/edge-application/create-device-groups.cy.js index f61692668..be5e5b501 100644 --- a/cypress/e2e/edge-application/create-device-groups.cy.js +++ b/cypress/e2e/edge-application/create-device-groups.cy.js @@ -48,14 +48,4 @@ describe('Edge Application Device Groups Spec', { tags: ['@dev2'] }, () => { cy.get(selectors.list.searchInput).type(`${fixtures.deviceGroupName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.deviceGroupName) }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-application/edit-cache-setting.cy.js b/cypress/e2e/edge-application/edit-cache-setting.cy.js index fc47e79ad..c1c1761ba 100644 --- a/cypress/e2e/edge-application/edit-cache-setting.cy.js +++ b/cypress/e2e/edge-application/edit-cache-setting.cy.js @@ -95,14 +95,4 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { 'Honor Origin Cache Headers' ) }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-application/edit-origin.cy.js b/cypress/e2e/edge-application/edit-origin.cy.js index c06655ff9..48fe649d3 100644 --- a/cypress/e2e/edge-application/edit-origin.cy.js +++ b/cypress/e2e/edge-application/edit-origin.cy.js @@ -108,14 +108,4 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { cy.get(selectors.list.searchInput).type(`${fixtures.originName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.originName) }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-application/function-instance/create-function-instance.cy.js b/cypress/e2e/edge-application/function-instance/create-function-instance.cy.js index 610078a32..faf442c7e 100644 --- a/cypress/e2e/edge-application/function-instance/create-function-instance.cy.js +++ b/cypress/e2e/edge-application/function-instance/create-function-instance.cy.js @@ -95,20 +95,5 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { 'have.text', fixtures.functionName ) - - // Cleanup - Remove the instance - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Function successfully deleted') - }) - }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) }) }) diff --git a/cypress/e2e/edge-application/function-instance/edit-function-instance.cy.js b/cypress/e2e/edge-application/function-instance/edit-function-instance.cy.js index a1f7792b0..6a486f56f 100644 --- a/cypress/e2e/edge-application/function-instance/edit-function-instance.cy.js +++ b/cypress/e2e/edge-application/function-instance/edit-function-instance.cy.js @@ -118,20 +118,5 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { 'have.text', editedFunctionInstanceName ) - - // Cleanup - Remove the instance - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Function successfully deleted') - }) - }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) }) }) diff --git a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-cache-policy.cy.js b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-cache-policy.cy.js index 05ab99a48..7d69da331 100644 --- a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-cache-policy.cy.js +++ b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-cache-policy.cy.js @@ -83,20 +83,5 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { // Assert cy.get(selectors.list.searchInput).type(`${fixtures.rulesEngineName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.rulesEngineName) - - // Cleanup - Remove the rule engine - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Rule successfully deleted') - }) - }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) }) }) diff --git a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js index 701f04271..3e39e6301 100644 --- a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js +++ b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js @@ -110,20 +110,5 @@ describe('Edge Application', { tags: ['@dev3'] }, () => { // Assert cy.get(selectors.list.searchInput).type(`${fixtures.rulesEngineName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.rulesEngineName) - - // Cleanup - Remove the rule engine - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Rule successfully deleted') - }) - }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) }) }) diff --git a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-origin.cy.js b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-origin.cy.js index 90626e2f3..7bbe13dbc 100644 --- a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-origin.cy.js +++ b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-origin.cy.js @@ -95,20 +95,5 @@ describe('Edge Application', { tags: ['@dev3'] }, () => { // Assert cy.get(selectors.list.searchInput).type(`${fixtures.rulesEngineName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.rulesEngineName) - - // Cleanup - Remove the rule engine - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Rule successfully deleted') - }) - }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) }) }) diff --git a/cypress/e2e/edge-application/rules-engine/create-rule-engine.cy.js b/cypress/e2e/edge-application/rules-engine/create-rule-engine.cy.js index 6fba17747..5dada363f 100644 --- a/cypress/e2e/edge-application/rules-engine/create-rule-engine.cy.js +++ b/cypress/e2e/edge-application/rules-engine/create-rule-engine.cy.js @@ -65,20 +65,5 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { // Assert cy.get(selectors.list.searchInput).type(`${fixtures.rulesEngineName}{enter}`) cy.get(selectors.list.filteredRow.column('name')).should('have.text', fixtures.rulesEngineName) - - // Cleanup - Remove the rule engine - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Rule successfully deleted') - }) - }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) }) }) diff --git a/cypress/e2e/edge-application/rules-engine/edit-rule-engine.cy.js b/cypress/e2e/edge-application/rules-engine/edit-rule-engine.cy.js index 55bc3aef3..ebea61c31 100644 --- a/cypress/e2e/edge-application/rules-engine/edit-rule-engine.cy.js +++ b/cypress/e2e/edge-application/rules-engine/edit-rule-engine.cy.js @@ -119,14 +119,4 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { cy.get(selectors.form.actionsSubmitButton).click() cy.verifyToast('success', 'Rule successfully updated') }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-application/rules-engine/reorder-rules-engine.cy.js b/cypress/e2e/edge-application/rules-engine/reorder-rules-engine.cy.js index ce63ca54f..dfc7c071a 100644 --- a/cypress/e2e/edge-application/rules-engine/reorder-rules-engine.cy.js +++ b/cypress/e2e/edge-application/rules-engine/reorder-rules-engine.cy.js @@ -37,7 +37,10 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { createEdgeApplicationCase() cy.get(selectors.edgeApplication.rulesEngine.clickOnTabRulesEngine).click() - cy.get(selectors.edgeApplication.rulesEngine.checkDefaultRulesEngine).should('have.text', 'Default Rule') + cy.get(selectors.edgeApplication.rulesEngine.checkDefaultRulesEngine).should( + 'have.text', + 'Default Rule' + ) cy.get(selectors.edgeApplication.rulesEngine.createButton).click() @@ -60,18 +63,11 @@ describe('Edge Application', { tags: ['@dev4'] }, () => { cy.get(selectors.edgeApplication.rulesEngine.reviewChanges).should('be.visible') cy.get(selectors.edgeApplication.rulesEngine.reviewChanges).click() - cy.get(selectors.edgeApplication.rulesEngine.reviewChangesModal).should('have.text', ' Rule ”regra01” reordered from 1 to 2. ') + cy.get(selectors.edgeApplication.rulesEngine.reviewChangesModal).should( + 'have.text', + ' Rule ”regra01” reordered from 1 to 2. ' + ) cy.get(selectors.edgeApplication.rulesEngine.saveReorder).click() cy.verifyToast('success', 'Reorder saved') }) - - afterEach(() => { - // Delete the edge application - cy.deleteEntityFromList({ - entityName: fixtures.edgeApplicationName, - productName: 'Edge Application' - }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-dns/create-edge-dns-zone.cy.js b/cypress/e2e/edge-dns/create-edge-dns-zone.cy.js index 3cbe54153..8a686e6f7 100644 --- a/cypress/e2e/edge-dns/create-edge-dns-zone.cy.js +++ b/cypress/e2e/edge-dns/create-edge-dns-zone.cy.js @@ -29,10 +29,4 @@ describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => { cy.get(selectors.edgeDns.domainRow).should('contain', zoneName.toLowerCase()) cy.get(selectors.edgeDns.statusRow).should('have.text', 'Active') }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) - }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-a.cy.js b/cypress/e2e/edge-dns/create-record-type-a.cy.js index 8ac73d260..23448a817 100644 --- a/cypress/e2e/edge-dns/create-record-type-a.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-a.cy.js @@ -79,16 +79,5 @@ describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-aaaa.cy.js b/cypress/e2e/edge-dns/create-record-type-aaaa.cy.js index d3c004415..7ec5c67c2 100644 --- a/cypress/e2e/edge-dns/create-record-type-aaaa.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-aaaa.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-aname.cy.js b/cypress/e2e/edge-dns/create-record-type-aname.cy.js index 334bd3506..b99fe0a27 100644 --- a/cypress/e2e/edge-dns/create-record-type-aname.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-aname.cy.js @@ -71,16 +71,5 @@ describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-caa.cy.js b/cypress/e2e/edge-dns/create-record-type-caa.cy.js index 3bf45301b..3c56a1c45 100644 --- a/cypress/e2e/edge-dns/create-record-type-caa.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-caa.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-cname.cy.js b/cypress/e2e/edge-dns/create-record-type-cname.cy.js index 5fb7083f8..cf2891700 100644 --- a/cypress/e2e/edge-dns/create-record-type-cname.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-cname.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-ds.cy.js b/cypress/e2e/edge-dns/create-record-type-ds.cy.js index 54c036041..0992e52b6 100644 --- a/cypress/e2e/edge-dns/create-record-type-ds.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-ds.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-mx.cy.js b/cypress/e2e/edge-dns/create-record-type-mx.cy.js index 66a35abc1..8cd082a0a 100644 --- a/cypress/e2e/edge-dns/create-record-type-mx.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-mx.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-ns.cy.js b/cypress/e2e/edge-dns/create-record-type-ns.cy.js index 6f54f4954..c7cedd466 100644 --- a/cypress/e2e/edge-dns/create-record-type-ns.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-ns.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-ptr.cy.js b/cypress/e2e/edge-dns/create-record-type-ptr.cy.js index 2ccddae96..4f942f723 100644 --- a/cypress/e2e/edge-dns/create-record-type-ptr.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-ptr.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-srv.cy.js b/cypress/e2e/edge-dns/create-record-type-srv.cy.js index 57efd974c..cc2a152ee 100644 --- a/cypress/e2e/edge-dns/create-record-type-srv.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-srv.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-dns/create-record-type-txt.cy.js b/cypress/e2e/edge-dns/create-record-type-txt.cy.js index f3f615e90..507e9709b 100644 --- a/cypress/e2e/edge-dns/create-record-type-txt.cy.js +++ b/cypress/e2e/edge-dns/create-record-type-txt.cy.js @@ -72,16 +72,5 @@ describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => { 'have.text', recordTypeFixtures.description ) - - // Cleanup - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge DNS Record successfully deleted') - }) - }) - - afterEach(() => { - cy.deleteEntityFromList({ entityName: zoneName, productName: 'Edge DNS' }).then(() => { - cy.verifyToast('Your Edge DNS has been deleted') - }) }) }) diff --git a/cypress/e2e/edge-firewall/create-edge-firewall-network-list.cy.js b/cypress/e2e/edge-firewall/create-edge-firewall-network-list.cy.js index 9dd20d644..544ca7129 100644 --- a/cypress/e2e/edge-firewall/create-edge-firewall-network-list.cy.js +++ b/cypress/e2e/edge-firewall/create-edge-firewall-network-list.cy.js @@ -51,8 +51,14 @@ describe('Edge Firewall spec', { tags: ['@dev5', '@xfail'] }, () => { cy.get(selectors.edgeFirewall.ruleDescriptionInput).type('My Rule Description') // Act - Set Criteria - cy.intercept('GET', '/api/v4/workspace/network_lists?ordering=name&page=1&page_size=100&fields=&search=').as('networkList') - cy.intercept('GET', `/api/v4/workspace/network_lists?ordering=name&page=1&page_size=100&fields=&search=${networkListName}`).as('networkListSearch') + cy.intercept( + 'GET', + '/api/v4/workspace/network_lists?ordering=name&page=1&page_size=100&fields=&search=' + ).as('networkList') + cy.intercept( + 'GET', + `/api/v4/workspace/network_lists?ordering=name&page=1&page_size=100&fields=&search=${networkListName}` + ).as('networkListSearch') cy.get(selectors.edgeFirewall.ruleCriteriaVariableDropdown).click() cy.get(selectors.edgeFirewall.ruleCriteriaVariableDropdownNetworkLists).click() cy.get(selectors.edgeFirewall.ruleCriteriaOperatorDropdown).click() diff --git a/cypress/e2e/edge-functions/create-edge-function.cy.js b/cypress/e2e/edge-functions/create-edge-function.cy.js index 9ce450034..4fbe036dc 100644 --- a/cypress/e2e/edge-functions/create-edge-function.cy.js +++ b/cypress/e2e/edge-functions/create-edge-function.cy.js @@ -26,10 +26,4 @@ describe('Edge Functions spec', { tags: ['@dev5'] }, () => { cy.get(selectors.functions.languageRow).should('have.text', 'JavaScript') cy.get(selectors.functions.initiatorTypeRow).should('have.text', 'edge_application') }) - - afterEach(() => { - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Edge Function successfully deleted') - }) - }) }) diff --git a/cypress/e2e/edge-services/create-edge-service.cy.js b/cypress/e2e/edge-services/create-edge-service.cy.js index 9ec9e330a..0c0802e43 100644 --- a/cypress/e2e/edge-services/create-edge-service.cy.js +++ b/cypress/e2e/edge-services/create-edge-service.cy.js @@ -48,10 +48,4 @@ describe('Edge Services spec', { tags: ['@dev6'] }, () => { cy.get(selectors.edgeServices.listRow('labelActive')).should('have.text', 'Active') }) - - afterEach(() => { - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/edge-services/edit-edge-service-resource.cy.js b/cypress/e2e/edge-services/edit-edge-service-resource.cy.js index 4dd3ddc29..e7eecc52c 100644 --- a/cypress/e2e/edge-services/edit-edge-service-resource.cy.js +++ b/cypress/e2e/edge-services/edit-edge-service-resource.cy.js @@ -88,10 +88,4 @@ describe('Edge Services spec', { tags: ['@dev6'] }, () => { cy.get(selectors.list.searchInput).type(`${fixtures.edgeServiceName}{enter}`) cy.get(selectors.edgeServices.listRow('labelActive')).should('have.text', 'Active') }) - - afterEach(() => { - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Resource successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/create-network-list-asn.cy.js b/cypress/e2e/network-lists/create-network-list-asn.cy.js index 26883029d..7881a0342 100644 --- a/cypress/e2e/network-lists/create-network-list-asn.cy.js +++ b/cypress/e2e/network-lists/create-network-list-asn.cy.js @@ -33,11 +33,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) cy.get(selectors.networkLists.typeRow).should('have.text', 'ASN') }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/create-network-list-countries.cy.js b/cypress/e2e/network-lists/create-network-list-countries.cy.js index 205deac34..2f0837c42 100644 --- a/cypress/e2e/network-lists/create-network-list-countries.cy.js +++ b/cypress/e2e/network-lists/create-network-list-countries.cy.js @@ -38,11 +38,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) cy.get(selectors.networkLists.typeRow).should('have.text', 'Countries') }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/create-network-list-ip-cidr.cy.js b/cypress/e2e/network-lists/create-network-list-ip-cidr.cy.js index 5a59f0d93..e58335d2b 100644 --- a/cypress/e2e/network-lists/create-network-list-ip-cidr.cy.js +++ b/cypress/e2e/network-lists/create-network-list-ip-cidr.cy.js @@ -39,11 +39,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) cy.get(selectors.networkLists.typeRow).should('have.text', 'IP/CIDR') }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/edit-network-list-asn.cy.js b/cypress/e2e/network-lists/edit-network-list-asn.cy.js index ad1ce7bda..e8dd93c24 100644 --- a/cypress/e2e/network-lists/edit-network-list-asn.cy.js +++ b/cypress/e2e/network-lists/edit-network-list-asn.cy.js @@ -53,11 +53,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.searchInput).type(`${networkListName}{enter}`) cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/edit-network-list-countries.cy.js b/cypress/e2e/network-lists/edit-network-list-countries.cy.js index 440f90b61..7472c8704 100644 --- a/cypress/e2e/network-lists/edit-network-list-countries.cy.js +++ b/cypress/e2e/network-lists/edit-network-list-countries.cy.js @@ -58,11 +58,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.searchInput).type(`${networkListName}{enter}`) cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/edit-network-list-ip-cidr.cy.js b/cypress/e2e/network-lists/edit-network-list-ip-cidr.cy.js index 7219f1fe3..3cf88ec50 100644 --- a/cypress/e2e/network-lists/edit-network-list-ip-cidr.cy.js +++ b/cypress/e2e/network-lists/edit-network-list-ip-cidr.cy.js @@ -58,11 +58,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.searchInput).type(`${networkListName}{enter}`) cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/network-lists/network-lists.cy.js b/cypress/e2e/network-lists/network-lists.cy.js index 3dd275ca3..0425ae7f4 100644 --- a/cypress/e2e/network-lists/network-lists.cy.js +++ b/cypress/e2e/network-lists/network-lists.cy.js @@ -234,11 +234,4 @@ describe('Network Lists spec', { tags: ['@dev6'] }, () => { cy.get(selectors.networkLists.searchInput).type(`${networkListName}{enter}`) cy.get(selectors.networkLists.nameRow).should('have.text', `${networkListName}`) }) - - afterEach(() => { - // Delete the network list - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Network list successfully deleted') - }) - }) }) diff --git a/cypress/e2e/personal-token/create-personal-token-custom-date.cy.js b/cypress/e2e/personal-token/create-personal-token-custom-date.cy.js index 9eb042753..73e34d904 100644 --- a/cypress/e2e/personal-token/create-personal-token-custom-date.cy.js +++ b/cypress/e2e/personal-token/create-personal-token-custom-date.cy.js @@ -32,10 +32,4 @@ describe('Personal Token spec', { tags: ['@dev6'] }, () => { cy.get(selectors.personalTokens.searchInput).type(`${personalTokenName}{enter}`) cy.get(selectors.personalTokens.filteredRecordNameColumn).should('have.text', personalTokenName) }) - - afterEach(() => { - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Personal token successfully deleted') - }) - }) }) diff --git a/cypress/e2e/personal-token/create-personal-token.cy.js b/cypress/e2e/personal-token/create-personal-token.cy.js index 39d25f902..f4aa49c5b 100644 --- a/cypress/e2e/personal-token/create-personal-token.cy.js +++ b/cypress/e2e/personal-token/create-personal-token.cy.js @@ -29,10 +29,4 @@ describe('Personal Token spec', { tags: ['@dev6'] }, () => { cy.get(selectors.personalTokens.searchInput).type(`${personalTokenName}{enter}`) cy.get(selectors.personalTokens.filteredRecordNameColumn).should('have.text', personalTokenName) }) - - afterEach(() => { - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Personal token successfully deleted') - }) - }) }) diff --git a/cypress/e2e/purge/create-purge-domain.cy.js b/cypress/e2e/purge/create-purge-domain.cy.js index 28ac4de35..608441d42 100644 --- a/cypress/e2e/purge/create-purge-domain.cy.js +++ b/cypress/e2e/purge/create-purge-domain.cy.js @@ -28,7 +28,10 @@ describe('Real-time Purge spec', { tags: ['@dev6'] }, () => { // Arrange cy.openProduct('Domains') - cy.intercept('GET', '/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=').as('getEdgeApplicationList') + cy.intercept( + 'GET', + '/api/v4/edge_application/applications?ordering=name&page=1&page_size=100&fields=&search=' + ).as('getEdgeApplicationList') cy.get(selectors.domains.createButton).click() cy.get(selectors.domains.nameInput).type(domainName) @@ -69,12 +72,4 @@ describe('Real-time Purge spec', { tags: ['@dev6'] }, () => { ) }) }) - - afterEach(() => { - // Cleanup - cy.deleteEntityFromList({ entityName: domainName, productName: 'Domains' }).then(() => { - cy.verifyToast('Resource successfully deleted') - }) - cy.deleteEntityFromList({ entityName: edgeAppName, productName: 'Edge Application' }) - }) }) diff --git a/cypress/e2e/teams-permissions/create-team-full-permissions.cy.js b/cypress/e2e/teams-permissions/create-team-full-permissions.cy.js index e153e03a1..5b03e83a5 100644 --- a/cypress/e2e/teams-permissions/create-team-full-permissions.cy.js +++ b/cypress/e2e/teams-permissions/create-team-full-permissions.cy.js @@ -35,9 +35,4 @@ describe('Teams Permissions', { tags: ['@dev6'] }, () => { cy.get(selectors.teams.listRow('name')).should('have.text', teamsPermissionsName) cy.get(selectors.teams.listRow('status')).should('have.text', 'Active') }) - - afterEach(() => { - // Delete the team permissions - cy.deleteEntityFromLoadedList() - }) }) diff --git a/cypress/e2e/teams-permissions/create-team-view-permissions.cy.js b/cypress/e2e/teams-permissions/create-team-view-permissions.cy.js index 309a30f5b..f4ebf478d 100644 --- a/cypress/e2e/teams-permissions/create-team-view-permissions.cy.js +++ b/cypress/e2e/teams-permissions/create-team-view-permissions.cy.js @@ -62,9 +62,4 @@ describe('Teams Permissions', { tags: ['@dev7'] }, () => { cy.get(selectors.teams.listRow('name')).should('have.text', teamsPermissionsName) cy.get(selectors.teams.listRow('status')).should('have.text', 'Active') }) - - afterEach(() => { - // Delete the team permissions - cy.deleteEntityFromLoadedList() - }) }) diff --git a/cypress/e2e/users-management/create-user-owner.cy.js b/cypress/e2e/users-management/create-user-owner.cy.js index 8be8ab37d..4acc571ca 100644 --- a/cypress/e2e/users-management/create-user-owner.cy.js +++ b/cypress/e2e/users-management/create-user-owner.cy.js @@ -58,11 +58,4 @@ describe('Users Management spec', { tags: ['@dev7'] }, () => { cy.get(selectors.usersManagement.listRow('status')).should('have.text', 'Inactive') cy.get(selectors.usersManagement.listRow('owner')).should('have.text', 'Yes') }) - - afterEach(() => { - // Delete the user - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('User successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/users-management/create-user-with-team.cy.js b/cypress/e2e/users-management/create-user-with-team.cy.js index ff9447956..544c00ecf 100644 --- a/cypress/e2e/users-management/create-user-with-team.cy.js +++ b/cypress/e2e/users-management/create-user-with-team.cy.js @@ -50,11 +50,4 @@ describe('Users Management spec', { tags: ['@dev7'] }, () => { cy.get(selectors.usersManagement.listRow('status')).should('have.text', 'Inactive') cy.get(selectors.usersManagement.listRow('owner')).should('have.text', 'No') }) - - afterEach(() => { - // Delete the user - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('User successfully deleted') - }) - }) }) diff --git a/cypress/e2e/variables/create-secret.cy.js b/cypress/e2e/variables/create-secret.cy.js index 4752fbb57..e4e290893 100644 --- a/cypress/e2e/variables/create-secret.cy.js +++ b/cypress/e2e/variables/create-secret.cy.js @@ -31,11 +31,4 @@ describe('Variables spec', { tags: ['@dev2'] }, () => { cy.get(selectors.variables.listRow('value')).should('have.text', secretValue) cy.get(selectors.variables.listRow('value')).find('button').should('not.exist') }) - - afterEach(() => { - // Delete the variable - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Variable successfully deleted') - }) - }) }) diff --git a/cypress/e2e/variables/create-variable.cy.js b/cypress/e2e/variables/create-variable.cy.js index 3555d406e..8b9a258b1 100644 --- a/cypress/e2e/variables/create-variable.cy.js +++ b/cypress/e2e/variables/create-variable.cy.js @@ -29,11 +29,4 @@ describe('Variables spec', { tags: ['@dev7'] }, () => { cy.get(selectors.variables.listRow('key')).should('have.text', variableKey) cy.get(selectors.variables.listRow('value')).find('button').should('be.visible') }) - - afterEach(() => { - // Delete the variable - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Variable successfully deleted') - }) - }) }) diff --git a/cypress/e2e/variables/edit-variable.cy.js b/cypress/e2e/variables/edit-variable.cy.js index 257a59753..d727fd5c0 100644 --- a/cypress/e2e/variables/edit-variable.cy.js +++ b/cypress/e2e/variables/edit-variable.cy.js @@ -52,11 +52,4 @@ describe('Variables spec', { tags: ['@dev7'] }, () => { cy.get(selectors.list.searchInput).type(`${variableKey}{enter}`) cy.get(selectors.variables.listRow('key')).should('have.text', variableKey) }) - - afterEach(() => { - // Delete the variable - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('Variable successfully deleted') - }) - }) }) diff --git a/cypress/e2e/waf/create-allowed-rule-conditional-query-string.cy.js b/cypress/e2e/waf/create-allowed-rule-conditional-query-string.cy.js index a824f663b..b567bf19b 100644 --- a/cypress/e2e/waf/create-allowed-rule-conditional-query-string.cy.js +++ b/cypress/e2e/waf/create-allowed-rule-conditional-query-string.cy.js @@ -62,11 +62,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { cy.get(selectors.wafs.breadcrumbToList).click() cy.get(selectors.list.searchInput).type(`${wafName}{enter}`) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/create-allowed-rule-conditional-request-body.cy.js b/cypress/e2e/waf/create-allowed-rule-conditional-request-body.cy.js index 81ca8c5b3..62c9fa517 100644 --- a/cypress/e2e/waf/create-allowed-rule-conditional-request-body.cy.js +++ b/cypress/e2e/waf/create-allowed-rule-conditional-request-body.cy.js @@ -64,11 +64,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { cy.get(selectors.wafs.breadcrumbToList).click() cy.get(selectors.list.searchInput).type(`${wafName}{enter}`) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/create-allowed-rule-conditional-request-header.cy.js b/cypress/e2e/waf/create-allowed-rule-conditional-request-header.cy.js index a57b22e31..5723a3ab4 100644 --- a/cypress/e2e/waf/create-allowed-rule-conditional-request-header.cy.js +++ b/cypress/e2e/waf/create-allowed-rule-conditional-request-header.cy.js @@ -64,11 +64,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { cy.get(selectors.wafs.breadcrumbToList).click() cy.get(selectors.list.searchInput).type(`${wafName}{enter}`) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/create-allowed-rule-file-name.cy.js b/cypress/e2e/waf/create-allowed-rule-file-name.cy.js index ef7ee396d..37b143abf 100644 --- a/cypress/e2e/waf/create-allowed-rule-file-name.cy.js +++ b/cypress/e2e/waf/create-allowed-rule-file-name.cy.js @@ -62,11 +62,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { cy.get(selectors.wafs.breadcrumbToList).click() cy.get(selectors.list.searchInput).type(`${wafName}{enter}`) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/create-allowed-rule-path-zone.cy.js b/cypress/e2e/waf/create-allowed-rule-path-zone.cy.js index b1b930746..3b31dbe5a 100644 --- a/cypress/e2e/waf/create-allowed-rule-path-zone.cy.js +++ b/cypress/e2e/waf/create-allowed-rule-path-zone.cy.js @@ -55,11 +55,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { cy.get(selectors.wafs.breadcrumbToList).click() cy.get(selectors.list.searchInput).type(`${wafName}{enter}`) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/create-allowed-rule-raw-body.cy.js b/cypress/e2e/waf/create-allowed-rule-raw-body.cy.js index 31ff4e8d6..e2371459e 100644 --- a/cypress/e2e/waf/create-allowed-rule-raw-body.cy.js +++ b/cypress/e2e/waf/create-allowed-rule-raw-body.cy.js @@ -62,11 +62,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { cy.get(selectors.wafs.breadcrumbToList).click() cy.get(selectors.list.searchInput).type(`${wafName}{enter}`) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/create-waf-rule.cy.js b/cypress/e2e/waf/create-waf-rule.cy.js index 191bfc3f8..f750027a7 100644 --- a/cypress/e2e/waf/create-waf-rule.cy.js +++ b/cypress/e2e/waf/create-waf-rule.cy.js @@ -37,11 +37,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { 'File uploadEvading TricksShow more (6)' ) }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +}) diff --git a/cypress/e2e/waf/edit-waf-rule.cy.js b/cypress/e2e/waf/edit-waf-rule.cy.js index ca0a67085..bd6c3c084 100644 --- a/cypress/e2e/waf/edit-waf-rule.cy.js +++ b/cypress/e2e/waf/edit-waf-rule.cy.js @@ -79,11 +79,4 @@ describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => { ) cy.get(selectors.wafs.listRow('active')).should('have.text', 'Active') }) - - afterEach(() => { - // Delete the waf - cy.deleteEntityFromLoadedList().then(() => { - cy.verifyToast('WAF rule successfully deleted') - }) - }) -}) \ No newline at end of file +})