PP-12444 simplified account stripe onboarding tasks cypress tests

app/browsered/multi-select.js

@@ -105,9 +105,12 @@ const closeMultiSelectOnEscapeKeypress = function () {
 const onCloseButtonClick = event => {
   const { target } = event
   event.stopPropagation()
-  const dropdown = target.closest(TOP_LEVEL_SELECTOR).querySelector(DROPDOWN_SELECTOR)
+  const multiSelect = target.closest(TOP_LEVEL_SELECTOR)
+  const dropdown = multiSelect.querySelector(DROPDOWN_SELECTOR)
+  const openButton = multiSelect.querySelector(OPEN_BUTTON_SELECTOR)
   dropdown.style.visibility = 'hidden'
-  target.setAttribute('aria-expanded', false)
+  openButton.setAttribute('aria-expanded', false)
+  openButton.focus()
 }
 
 const onOpenButtonClick = event => {

app/views/services/_service-switch.njk

@@ -15,7 +15,7 @@
       {% endif %}
     </button>
     {% if account.provider_switch_enabled and service.isAdminUser %}
-      <strong class="govuk-tag govuk-tag--blue service-info--tag">switch PSP</strong>
+      <strong class="govuk-tag govuk-tag--blue service-info--tag">Switch PSP</strong>
     {% endif %}
   </form>
 </li>

test/cypress/integration/simplified-account/service-settings/stripe-details/bank-details.cy.js

@@ -232,6 +232,13 @@ describe('Stripe details settings', () => {
           cy.title().should('eq', 'Settings - Stripe details - GOV.UK Pay')
           cy.get('h1').should('contain', 'Stripe details')
           cy.location('pathname').should('not.contain', '/bank-account')
+          cy.get('.govuk-task-list__item')
+            .contains('Organisation\'s bank details')
+            .parent()
+            .parent()
+            .within(() => {
+              cy.get('.govuk-task-list__status').should('contain.text', 'Complete')
+            })
         })
       })
     })

test/cypress/integration/simplified-account/service-settings/stripe-details/company-number.cy.js

@@ -0,0 +1,257 @@
+const userStubs = require('@test/cypress/stubs/user-stubs')
+const gatewayAccountStubs = require('@test/cypress/stubs/gateway-account-stubs')
+const stripeAccountSetupStubs = require('@test/cypress/stubs/stripe-account-setup-stub')
+const { STRIPE, WORLDPAY } = require('@models/payment-providers')
+const stripePspStubs = require('@test/cypress/stubs/stripe-psp-stubs')
+const ROLES = require('@test/fixtures/roles.fixtures')
+
+const USER_EXTERNAL_ID = 'user-123-abc'
+const SERVICE_EXTERNAL_ID = 'service-456-def'
+const SERVICE_NAME = {
+  en: 'McDuck Enterprises', cy: 'Mentrau McDuck'
+}
+const LIVE_ACCOUNT_TYPE = 'live'
+const GATEWAY_ACCOUNT_ID = 10
+const STRIPE_ACCOUNT_ID = 'acct_123example123'
+
+const STRIPE_DETAILS_SETTINGS_URL = `/simplified/service/${SERVICE_EXTERNAL_ID}/account/${LIVE_ACCOUNT_TYPE}/settings/stripe-details`
+
+const setStubs = (opts = {}, additionalStubs = []) => {
+  cy.task('setupStubs', [
+    userStubs.getUserSuccess({
+      userExternalId: USER_EXTERNAL_ID,
+      gatewayAccountId: GATEWAY_ACCOUNT_ID,
+      serviceName: SERVICE_NAME,
+      serviceExternalId: SERVICE_EXTERNAL_ID,
+      merchantDetails: {
+        name: 'McDuck Enterprises',
+        address_line1: 'McDuck Manor',
+        address_city: 'Duckburg',
+        address_postcode: 'SW1A 1AA'
+      },
+      role: ROLES[opts.role || 'admin'],
+      features: 'degatewayaccountification' // TODO remove features once simplified accounts are live
+    }),
+    gatewayAccountStubs.getAccountByServiceIdAndAccountType(SERVICE_EXTERNAL_ID, LIVE_ACCOUNT_TYPE, {
+      gateway_account_id: GATEWAY_ACCOUNT_ID,
+      type: LIVE_ACCOUNT_TYPE,
+      payment_provider: opts.paymentProvider || STRIPE,
+      provider_switch_enabled: opts.providerSwitchEnabled || false
+    }),
+    ...additionalStubs])
+}
+
+describe('Stripe details settings', () => {
+  beforeEach(() => {
+    cy.setEncryptedCookies(USER_EXTERNAL_ID)
+  })
+  describe('The company number task', () => {
+    describe('For a non-admin', () => {
+      beforeEach(() => {
+        setStubs({
+          role: 'view-and-refund'
+        })
+        cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number', { failOnStatusCode: false })
+      })
+      it('should show not found page', () => {
+        cy.title().should('eq', 'Page not found - GOV.UK Pay')
+        cy.get('h1').should('contain.text', 'Page not found')
+      })
+    })
+    describe('For a non-stripe service', () => {
+      beforeEach(() => {
+        setStubs({
+          paymentProvider: WORLDPAY
+        })
+        cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number', { failOnStatusCode: false })
+      })
+      it('should show not found page', () => {
+        cy.title().should('eq', 'Page not found - GOV.UK Pay')
+        cy.get('h1').should('contain.text', 'Page not found')
+      })
+    })
+    describe('Completed', () => {
+      beforeEach(() => {
+        setStubs({}, [
+          stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+            serviceExternalId: SERVICE_EXTERNAL_ID,
+            accountType: LIVE_ACCOUNT_TYPE,
+            companyNumber: true
+          })
+        ])
+        cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number')
+      })
+      it('should show the task already completed page', () => {
+        cy.title().should('eq', 'An error occurred - GOV.UK Pay')
+        cy.get('h1').should('contain', 'You\'ve already completed this task')
+      })
+    })
+    describe('Not yet started', () => {
+      beforeEach(() => {
+        setStubs({}, [
+          stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+            serviceExternalId: SERVICE_EXTERNAL_ID,
+            accountType: LIVE_ACCOUNT_TYPE
+          })
+        ])
+        cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number')
+      })
+      describe('The settings navigation', () => {
+        it('should show stripe details', () => {
+          cy.get('.service-settings-nav')
+            .find('li')
+            .contains('Stripe details')
+            .then(li => {
+              cy.wrap(li)
+                .should('have.attr', 'href', STRIPE_DETAILS_SETTINGS_URL)
+                .parent().should('have.class', 'service-settings-nav__li--active')
+            })
+        })
+      })
+      describe('The task page', () => {
+        it('should show the correct title', () => {
+          cy.title().should('eq', 'Settings - Stripe details - Company registration number - GOV.UK Pay')
+        })
+        it('should show the correct heading', () => {
+          cy.get('h1').should('contain', 'Company registration number')
+        })
+      })
+      describe('When inputting a company registration number', () => {
+        beforeEach(() => {
+          setStubs({}, [
+            stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE
+            })
+          ])
+          cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number')
+        })
+
+        it('should render errors when submitting bad inputs', () => {
+          const invalidCompanyRegError = 'Enter a valid Company registration number'
+          const emptyCompanyRegError = 'Enter a company registration number'
+
+          cy.get('.govuk-error-summary').should('not.exist')
+
+          cy.get('input[name="companyNumber"]')
+            .clear({ force: true })
+            .type('what')
+
+          cy.get('#company-number-submit').click()
+          cy.get('.govuk-error-summary')
+            .should('exist')
+            .should('contain', invalidCompanyRegError)
+          cy.get('input[name="companyNumber"]').should('have.class', 'govuk-input--error')
+          cy.get('#company-number-error').should('contain.text', invalidCompanyRegError)
+
+          cy.get('input[name="companyNumber"]')
+            .clear({ force: true })
+
+          cy.get('#company-number-submit').click()
+          cy.get('.govuk-error-summary')
+            .should('exist')
+            .should('contain', emptyCompanyRegError)
+          cy.get('input[name="companyNumber"]').should('have.class', 'govuk-input--error')
+          cy.get('#company-number-error').should('contain.text', emptyCompanyRegError)
+        })
+      })
+      describe('When selecting yes and submitting a company number', () => {
+        beforeEach(() => {
+          setStubs({}, [
+            stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE
+            }),
+            gatewayAccountStubs.getStripeAccountByServiceIdAndAccountType(
+              SERVICE_EXTERNAL_ID,
+              LIVE_ACCOUNT_TYPE,
+              {
+                stripeAccountId: STRIPE_ACCOUNT_ID
+              }
+            ),
+            stripePspStubs.updateAccount({
+              stripeAccountId: STRIPE_ACCOUNT_ID
+            }),
+            stripeAccountSetupStubs.patchStripeProgressByServiceExternalIdAndAccountType({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE
+            }),
+            stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE,
+              companyNumber: true
+            })
+          ])
+          cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number')
+        })
+
+        it('should redirect to the task summary page on success', () => {
+          cy.get('input[name="companyNumber"]')
+            .clear({ force: true })
+            .type('LP123456')
+
+          cy.get('#company-number-submit').click()
+          cy.title().should('eq', 'Settings - Stripe details - GOV.UK Pay')
+          cy.get('h1').should('contain', 'Stripe details')
+          cy.location('pathname').should('not.contain', '/company-number')
+          cy.get('.govuk-task-list__item')
+            .contains('Company registration number')
+            .parent()
+            .parent()
+            .within(() => {
+              cy.get('.govuk-task-list__status').should('contain.text', 'Complete')
+            })
+        })
+      })
+      describe('When selecting no and completing the task', () => {
+        beforeEach(() => {
+          setStubs({}, [
+            stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE
+            }),
+            gatewayAccountStubs.getStripeAccountByServiceIdAndAccountType(
+              SERVICE_EXTERNAL_ID,
+              LIVE_ACCOUNT_TYPE,
+              {
+                stripeAccountId: STRIPE_ACCOUNT_ID
+              }
+            ),
+            stripeAccountSetupStubs.patchStripeProgressByServiceExternalIdAndAccountType({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE
+            }),
+            stripeAccountSetupStubs.getServiceAndAccountTypeStripeSetupSuccess({
+              serviceExternalId: SERVICE_EXTERNAL_ID,
+              accountType: LIVE_ACCOUNT_TYPE,
+              companyNumber: true
+            })
+          ])
+          cy.visit(STRIPE_DETAILS_SETTINGS_URL + '/company-number')
+        })
+
+        it('should redirect to the task summary page on success', () => {
+          cy.get('input[type="radio"]')
+            .siblings('label')
+            .contains('No')
+            .prev('input[type="radio"]')
+            .check()
+
+          cy.get('input[name="companyNumber"]').should('not.be.visible')
+
+          cy.get('#company-number-submit').click()
+          cy.title().should('eq', 'Settings - Stripe details - GOV.UK Pay')
+          cy.get('h1').should('contain', 'Stripe details')
+          cy.location('pathname').should('not.contain', '/company-number')
+          cy.get('.govuk-task-list__item')
+            .contains('Company registration number')
+            .parent()
+            .parent()
+            .within(() => {
+              cy.get('.govuk-task-list__status').should('contain.text', 'Complete')
+            })
+        })
+      })
+    })
+  })
+})