diff --git a/.circleci/deployment/workflows.yml b/.circleci/deployment/workflows.yml index aa1830f75..8a4269c04 100644 --- a/.circleci/deployment/workflows.yml +++ b/.circleci/deployment/workflows.yml @@ -6,7 +6,6 @@ - equal: [ master, << pipeline.git.branch >> ] - equal: [ main, << pipeline.git.branch >> ] - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ bug/e2e-minimal, << pipeline.git.branch >> ] - << pipeline.parameters.run_dev_deployment >> - not: << pipeline.parameters.run_nightly_owasp_scan >> @@ -22,7 +21,6 @@ branches: ignore: - develop - - bug/e2e-minimal - main - master - deploy-infrastructure-staging: @@ -30,7 +28,6 @@ branches: only: - develop - - bug/e2e-minimal - main - deploy-infrastructure-production: filters: @@ -44,7 +41,6 @@ branches: ignore: - develop - - bug/e2e-minimal - main - master - enable-versioning: @@ -97,7 +93,6 @@ - develop - main - master - - bug/e2e-minimal - deploy-develop: requires: - deploy-infrastructure-staging @@ -105,7 +100,6 @@ branches: only: - develop - - bug/e2e-minimal - deploy-staging: requires: - deploy-infrastructure-staging @@ -127,11 +121,9 @@ branches: only: - develop - - bug/e2e-minimal - make_erd: # from ../util folder filters: branches: only: - develop - master - diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 94049f7f7..5aef71099 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -27,7 +27,6 @@ on: - main - master - 'release/**' - - 'bug/3141-e2e-minimal' types: [review_requested, ready_for_review, synchronize] jobs: build_and_test_pr: diff --git a/tdrs-frontend/cypress/e2e/accounts/accounts.js b/tdrs-frontend/cypress/e2e/accounts/accounts.js index 05ffcec03..a1feaedf3 100644 --- a/tdrs-frontend/cypress/e2e/accounts/accounts.js +++ b/tdrs-frontend/cypress/e2e/accounts/accounts.js @@ -81,27 +81,6 @@ Then('{string} cannot log in', (username) => { cy.visit('/') cy.contains('Inactive Account').should('exist') }) - -Then('{string} fails to log in', (username) => { - cy.visit('/') - cy.login(username) - cy.contains('Welcome').should('exist').then(() => { - // get sessionId and csrfToken from cookie store - cy.getCookie('sessionid').its('value').as('userSessionId') - cy.getCookie('csrftoken').its('value').as('userCsrfToken') - }) - const userSessionId = cy.state('aliases').userSessionId - const userCsrfToken = cy.state('aliases').userCsrfToken - - // cy.authcheck(userSessionId, userCsrfToken) - // cy.visit('/').then(() => { - // cy.contains('Inactive Account').should('exist') - // }) - cy.wait(30000).then(() => { - cy.contains('Inactive Account').should('exist') - }) -}) - Then('{string} sees the request still submitted', (username) => { cy.visit('/') cy.contains('Request Submitted').should('exist') diff --git a/tdrs-frontend/cypress/e2e/common-steps/common-steps.js b/tdrs-frontend/cypress/e2e/common-steps/common-steps.js index f0e8ebddd..e6a735c33 100644 --- a/tdrs-frontend/cypress/e2e/common-steps/common-steps.js +++ b/tdrs-frontend/cypress/e2e/common-steps/common-steps.js @@ -6,10 +6,6 @@ When('{string} visits the home page', (username) => { cy.contains('Sign into TANF Data Portal', { timeout: 30000 }) }) -When('{string} visits', (username) => { - cy.visit('/') -}) - When('The admin logs in', () => { cy.adminLogin('cypress-admin@teamraft.com') })