Skip to content

Commit

Permalink
Reducing code changes
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-jameson authored Nov 15, 2024
1 parent 155cc76 commit ccb819e
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 34 deletions.
8 changes: 0 additions & 8 deletions .circleci/deployment/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 >>

Expand All @@ -22,15 +21,13 @@
branches:
ignore:
- develop
- bug/e2e-minimal
- main
- master
- deploy-infrastructure-staging:
filters:
branches:
only:
- develop
- bug/e2e-minimal
- main
- deploy-infrastructure-production:
filters:
Expand All @@ -44,7 +41,6 @@
branches:
ignore:
- develop
- bug/e2e-minimal
- main
- master
- enable-versioning:
Expand Down Expand Up @@ -97,15 +93,13 @@
- develop
- main
- master
- bug/e2e-minimal
- deploy-develop:
requires:
- deploy-infrastructure-staging
filters:
branches:
only:
- develop
- bug/e2e-minimal
- deploy-staging:
requires:
- deploy-infrastructure-staging
Expand All @@ -127,11 +121,9 @@
branches:
only:
- develop
- bug/e2e-minimal
- make_erd: # from ../util folder
filters:
branches:
only:
- develop
- master

1 change: 0 additions & 1 deletion .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ on:
- main
- master
- 'release/**'
- 'bug/3141-e2e-minimal'
types: [review_requested, ready_for_review, synchronize]
jobs:
build_and_test_pr:
Expand Down
21 changes: 0 additions & 21 deletions tdrs-frontend/cypress/e2e/accounts/accounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 0 additions & 4 deletions tdrs-frontend/cypress/e2e/common-steps/common-steps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('[email protected]')
})
Expand Down

0 comments on commit ccb819e

Please sign in to comment.