Skip to content

Commit

Permalink
Merge pull request #3574 from alphagov/pp-10904-switch-cy-route-to-cy…
Browse files Browse the repository at this point in the history 
…-intercept

PP-10904 Cypress 12 upgrade prep - replace `cy.server`, `cy.route` with `cy.intercept`
  • Loading branch information
@iqbalgds
iqbalgds committed Jul 14, 2023
2 parents cda2880 + 123c041 commit f68016a
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 42 deletions.
3 changes: 1 addition & 2 deletions test/cypress/integration/card/awaiting-auth.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ describe('Awaiting auth', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter card details')

Expand Down
6 changes: 2 additions & 4 deletions test/cypress/integration/card/billing-address-collection.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ describe('Billing address collection', () => {
const checkCardDetailsStubs = cardPaymentStubs.checkCardDetailsStubs(chargeId)
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter card details')

Expand Down Expand Up @@ -153,8 +152,7 @@ describe('Billing address collection', () => {
const checkCardDetailsStubs = cardPaymentStubs.checkCardDetailsStubs(chargeId)
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#card-no').type(validPayment.cardNumber)
cy.get('#card-no').blur()
Expand Down
9 changes: 3 additions & 6 deletions test/cypress/integration/card/email-collection.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter card details')

Expand Down Expand Up @@ -77,8 +76,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter card details')

Expand Down Expand Up @@ -123,8 +121,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#card-no').type(validPayment.cardNumber)
cy.get('#card-no').blur()
Expand Down
9 changes: 3 additions & 6 deletions test/cypress/integration/card/email-typo.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ describe('Standard card payment flow', () => {

cy.get('#card-no').type(validPayment.cardNumber)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#expiry-month').type(validPayment.expiryMonth)
cy.get('#expiry-year').type(validPayment.expiryYear)
Expand Down Expand Up @@ -160,8 +159,7 @@ describe('Standard card payment flow', () => {

cy.get('#card-no').type(validPayment.cardNumber)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#expiry-month').type(validPayment.expiryMonth)
cy.get('#expiry-year').type(validPayment.expiryYear)
Expand Down Expand Up @@ -241,8 +239,7 @@ describe('Standard card payment flow', () => {

cy.get('#card-no').type(validPayment.cardNumber)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#expiry-month').type(validPayment.expiryMonth)
cy.get('#expiry-year').type(validPayment.expiryYear)
Expand Down
3 changes: 1 addition & 2 deletions test/cypress/integration/card/enforce-views-to-state.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ describe('Enforce views to state', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter card details')

Expand Down
6 changes: 2 additions & 4 deletions test/cypress/integration/card/moto-mask-payment.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should allow a valid card number to be entered and remove existing error messages')

Expand Down Expand Up @@ -218,8 +217,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter and validate a correct card')

Expand Down
21 changes: 7 additions & 14 deletions test/cypress/integration/card/payment.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter and validate a correct card')

Expand Down Expand Up @@ -184,9 +183,8 @@ describe('Standard card payment flow', () => {

cy.visit(`/secure/${tokenId}`)
cy.location('pathname').should('eq', `/card_details/${chargeId}`)
cy.server()

cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')
cy.get('#card-no').type('4000160000000004')
cy.get('#card-no').blur()
cy.wait('@checkCard')
Expand All @@ -199,9 +197,8 @@ describe('Standard card payment flow', () => {

cy.visit(`/secure/${tokenId}`)
cy.location('pathname').should('eq', `/card_details/${chargeId}`)
cy.server()

cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')
cy.get('#card-no').type('4000160000000004')
cy.get('#card-no').blur()
cy.wait('@checkCard')
Expand All @@ -225,8 +222,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#card-no').type('1234567890')
cy.get('#card-no').blur()
Expand All @@ -250,8 +246,7 @@ describe('Standard card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#card-no').type('1234567890')
cy.get('#card-no').blur()
Expand Down Expand Up @@ -290,8 +285,7 @@ describe('Standard card payment flow', () => {
}
})

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter and validate a correct card')

Expand Down Expand Up @@ -339,8 +333,7 @@ describe('Standard card payment flow', () => {
}
})

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should enter and validate a correct card')

Expand Down
3 changes: 1 addition & 2 deletions test/cypress/integration/card/token-reuse.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ describe('Re-use token flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.log('Should allow entering payment details')

Expand Down
3 changes: 1 addition & 2 deletions test/cypress/integration/worldpay-3ds-flex-ddc/payment-with-session-id.test.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ describe('Worldpay 3ds flex card payment flow', () => {
cy.task('clearStubs')
cy.task('setupStubs', checkCardDetailsStubs)

cy.server()
cy.route('POST', `/check_card/${chargeId}`).as('checkCard')
cy.intercept('POST', `/check_card/${chargeId}`).as('checkCard')

cy.get('#card-no').type(validPayment.cardNumber)
cy.get('#card-no').blur()
Expand Down

0 comments on commit f68016a

Please sign in to comment.