Skip to content

Commit

Permalink
WIP update test code
Browse files Browse the repository at this point in the history
  • Loading branch information
DomBelcher committed Nov 21, 2024
1 parent 1d1f2e5 commit 05f5187
Show file tree
Hide file tree
Showing 195 changed files with 560 additions and 558 deletions.
3 changes: 2 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"@services/*": ["app/services/*"],
"@utils/*": ["app/utils/*"],
"@views/*": ["app/views/*"],
"@test/*": ["test/*"]
"@test/*": ["test/*"],
"@cypress-stubs/*": ["test/cypress/stubs/*"]
}
},
"exclude": ["node_modules"]
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"@services": "app/services",
"@utils": "app/utils",
"@views": "app/views",
"@test": "test"
"@test": "test",
"@cypress-stubs": "test/cypress/stubs"
},
"standard": {
"globals": [
Expand Down
8 changes: 4 additions & 4 deletions test/cypress/integration/agreements/agreement.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const agreementStubs = require('../../stubs/agreement-stubs')
const transactionStubs = require('../../stubs/transaction-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const agreementStubs = require('@cypress-stubs/agreement-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')

const userExternalId = 'some-user-id'
const gatewayAccountId = 10
Expand Down
8 changes: 4 additions & 4 deletions test/cypress/integration/agreements/agreements.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const agreementStubs = require('../../stubs/agreement-stubs')
const transactionStubs = require('../../stubs/transaction-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const agreementStubs = require('@cypress-stubs/agreement-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')

const userExternalId = 'some-user-id'
const gatewayAccountId = 10
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionStubs = require('../../stubs/transaction-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const liveTransactionsUrl = '/all-service-transactions/nosearch/live'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionStubs = require('../../stubs/transaction-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const transactionsUrl = '/all-service-transactions'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('../../stubs/transaction-summary-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('@cypress-stubs/transaction-summary-stubs')

describe('The disabled account banner', () => {
const gatewayAccountId = '22'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const utils = require('../../utils/request-to-go-live-utils')
const transactionStubs = require('../../stubs/transaction-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')
const { userExternalId, gatewayAccountExternalId, serviceExternalId } = utils.variables

const dashboardUrl = `/account/${gatewayAccountExternalId}/dashboard`
Expand Down
8 changes: 4 additions & 4 deletions test/cypress/integration/dashboard/dashboard-links.cy.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('../../stubs/transaction-summary-stubs')
const stripeAccountSetupStubs = require('../../stubs/stripe-account-setup-stub')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('@cypress-stubs/transaction-summary-stubs')
const stripeAccountSetupStubs = require('@cypress-stubs/stripe-account-setup-stub')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const gatewayAccountId = '42'
Expand Down
6 changes: 3 additions & 3 deletions test/cypress/integration/dashboard/dashboard-statistics.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const moment = require('moment-timezone')
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('../../stubs/transaction-summary-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('@cypress-stubs/transaction-summary-stubs')

describe('Account dashboard', () => {
const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('../../stubs/transaction-summary-stubs')
const stripeAccountSetupStubs = require('../../stubs/stripe-account-setup-stub')
const stripeAccountStubs = require('../../stubs/stripe-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('@cypress-stubs/transaction-summary-stubs')
const stripeAccountSetupStubs = require('@cypress-stubs/stripe-account-setup-stub')
const stripeAccountStubs = require('@cypress-stubs/stripe-account-stubs')
const stripeAccountId = 'stripe-account-id'
const stripePspStubs = require('../../stubs/stripe-psp-stubs')
const stripePspStubs = require('@cypress-stubs/stripe-psp-stubs')

const gatewayAccountId = '22'
const gatewayAccountExternalId = 'a-valid-external-id'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('../../stubs/transaction-summary-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionsSummaryStubs = require('@cypress-stubs/transaction-summary-stubs')

describe('Worldpay account setup banner', () => {
const gatewayAccountId = '22'
Expand Down
4 changes: 2 additions & 2 deletions test/cypress/integration/degateway/degateway.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const userExternalId = 'abc'

function setupUser (isDegatewayed) {
Expand Down
6 changes: 3 additions & 3 deletions test/cypress/integration/demo-payment/demo-payment.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionStubs = require('../../stubs/transaction-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const gatewayAccountId = '42'
Expand Down
6 changes: 3 additions & 3 deletions test/cypress/integration/demo-payment/mock-cards-stripe.cy.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const stripeAccountSetupStubs = require('../../stubs/stripe-account-setup-stub')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const stripeAccountSetupStubs = require('@cypress-stubs/stripe-account-setup-stub')
const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e' // pragma: allowlist secret
const gatewayAccountId = '42'
const gatewayAccountExternalId = 'a-valid-external-id'
Expand Down
6 changes: 3 additions & 3 deletions test/cypress/integration/demo-payment/mock-cards.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const transactionStubs = require('../../stubs/transaction-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const transactionStubs = require('@cypress-stubs/transaction-stubs')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const gatewayAccountId = '42'
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/integration/errors/errors.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const userStubs = require('@cypress-stubs/user-stubs')

const userExternalId = 'authenticated-user-id'

Expand Down
4 changes: 2 additions & 2 deletions test/cypress/integration/feedback/feedback.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const zendeskStubs = require('../../stubs/zendesk-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const zendeskStubs = require('@cypress-stubs/zendesk-stubs')

const authenticatedUserId = 'authenticated-user-id'

Expand Down
4 changes: 2 additions & 2 deletions test/cypress/integration/index/index.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const gatewayAccountId = '42'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const inviteStubs = require('../../stubs/invite-stubs')
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const inviteStubs = require('@cypress-stubs/invite-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')

const inviteCode = 'an-invite-code'
const email = '[email protected]'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const inviteStubs = require('../../stubs/invite-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const inviteStubs = require('@cypress-stubs/invite-stubs')

const SERVICE_EXTERNAL_ID = 'service_abc_123'
const AUTHENTICATED_USER_ID = 'authenticated-user-id'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const { getUserWithServiceRoleStubOpts, getUserSuccess, getServiceUsersSuccess } = require('../../stubs/user-stubs')
const inviteStubs = require('../../stubs/invite-stubs')
const { getUserWithServiceRoleStubOpts, getUserSuccess, getServiceUsersSuccess } = require('@cypress-stubs/user-stubs')
const inviteStubs = require('@cypress-stubs/invite-stubs')

const SERVICE_EXTERNAL_ID = 'service_abc_123'
const AUTHENTICATED_USER_ID = 'authenticated-user-id'
Expand Down
8 changes: 4 additions & 4 deletions test/cypress/integration/my-services/add-new-service.cy.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict'

const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('../../stubs/user-stubs')
const serviceStubs = require('../../stubs/service-stubs')
const transactionsSummaryStubs = require('../../stubs/transaction-summary-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const serviceStubs = require('@cypress-stubs/service-stubs')
const transactionsSummaryStubs = require('@cypress-stubs/transaction-summary-stubs')

const authenticatedUserId = 'authenticated-user-id'
const newServiceName = 'Pay for a thing'
Expand Down
6 changes: 3 additions & 3 deletions test/cypress/integration/my-services/my-services.cy.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('../../stubs/user-stubs')
const payoutStubs = require('../../stubs/payout-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const payoutStubs = require('@cypress-stubs/payout-stubs')

const authenticatedUserId = 'authenticated-user-id'
const myServicesPageTitle = 'My services - GOV.UK Pay'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const serviceStubs = require('../../stubs/service-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const serviceStubs = require('@cypress-stubs/service-stubs')

const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
const gatewayAccountId = 42
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const serviceStubs = require('../../stubs/service-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const serviceStubs = require('@cypress-stubs/service-stubs')

const authenticatedUserId = 'authenticated-user-id'
const serviceExternalId = 'service-external-id'
Expand Down
8 changes: 4 additions & 4 deletions test/cypress/integration/payment-links/amount-hint.cy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const tokenStubs = require('../../stubs/token-stubs')
const productStubs = require('../../stubs/products-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const tokenStubs = require('@cypress-stubs/token-stubs')
const productStubs = require('@cypress-stubs/products-stubs')
const userExternalId = 'a-user-id'
const gatewayAccountId = 42
const gatewayAccountExternalId = 'a-valid-account-id'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const tokenStubs = require('../../stubs/token-stubs')
const productStubs = require('../../stubs/products-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const tokenStubs = require('@cypress-stubs/token-stubs')
const productStubs = require('@cypress-stubs/products-stubs')
const userExternalId = 'a-user-id'
const gatewayAccountId = 42
const gatewayAccountExternalId = 'a-valid-account-id'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const {
getProductsByGatewayAccountIdAndTypeStub,
getProductByExternalIdAndGatewayAccountIdStub,
deleteProductStub
} = require('../../stubs/products-stubs')
const { deleteTokenByApiTokenSuccess } = require('../../stubs/token-stubs')
} = require('@cypress-stubs/products-stubs')
const { deleteTokenByApiTokenSuccess } = require('@cypress-stubs/token-stubs')
const userExternalId = 'a-user-id'
const gatewayAccountExternalId = 'a-valid-account-id'
const gatewayAccountId = 42
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const {
getProductsByGatewayAccountIdAndTypeStub,
getProductByExternalIdAndGatewayAccountIdStub
} = require('../../stubs/products-stubs')
} = require('@cypress-stubs/products-stubs')
const userExternalId = 'a-user-id'
const gatewayAccountId = 42
const gatewayAccountExternalId = 'a-valid-account-id'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')

const productStubs = require('../../stubs/products-stubs')
const productStubs = require('@cypress-stubs/products-stubs')
const userExternalId = 'a-user-id'
const gatewayAccountId = 42
const gatewayAccountExternalId = 'a-valid-account-id'
Expand Down
6 changes: 3 additions & 3 deletions test/cypress/integration/payouts/payouts-list.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const payoutStubs = require('../../stubs/payout-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')
const payoutStubs = require('@cypress-stubs/payout-stubs')

const userExternalId = 'some-user-id'
const liveGatewayAccountId = 10
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/integration/privacy/privacy.cy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const userStubs = require('../../stubs/user-stubs')
const userStubs = require('@cypress-stubs/user-stubs')

const userExternalId = 'a-user-id'
const gatewayAccountId = 42
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const inviteStubs = require('../../stubs/invite-stubs')
const userStubs = require('../../stubs/user-stubs')
const gatewayAccountStubs = require('../../stubs/gateway-account-stubs')
const inviteStubs = require('@cypress-stubs/invite-stubs')
const userStubs = require('@cypress-stubs/user-stubs')
const gatewayAccountStubs = require('@cypress-stubs/gateway-account-stubs')

const inviteCode = 'an-invite-code'
const otpKey = 'ANEXAMPLESECRETSECONDFACTORCODE1'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const inviteStubs = require('../../stubs/invite-stubs')
const inviteStubs = require('@cypress-stubs/invite-stubs')

describe('Start self-signup registration', () => {
it('should rerender page if invalid email address', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const userStubs = require('../../stubs/user-stubs')
const userStubs = require('@cypress-stubs/user-stubs')

describe('Request PSP test account: index', () => {
const userExternalId = 'cd0fa54cf3b7408a80ae2f1b93e7c16e'
Expand Down
Loading

0 comments on commit 05f5187

Please sign in to comment.