Haar 2007 c integration testing

assets/js/application.js

@@ -8,6 +8,7 @@ function showDiv(divId, element, val) {
 
 document.addEventListener('DOMContentLoaded', function (event) {
   const select = document.getElementById('access-token-validity')
+  if (!select) return
   select.onchange = () => showDiv('custom-access-token-validity-element', select, 'custom')
   showDiv('custom-access-token-validity-element', select, 'custom')
 })

assets/js/initMOJFilterPage.js

@@ -5,7 +5,10 @@ new MOJFrontend.FilterToggleButton({
     container: $('.moj-action-bar__filter'),
     showText: 'Show filter',
     hideText: 'Hide filter',
-    classes: 'govuk-button--secondary',
+    classes: 'govuk-button--secondary toggle-filter-button',
+    attributes: {
+      'data-qa': 'toggle-filter-button',
+    },
   },
   closeButton: {
     container: $('.moj-filter__header-action'),

integration_tests/e2e/add-base-client.cy.ts

@@ -0,0 +1,124 @@
+import Page from '../pages/page'
+import AddBaseClientGrantPage from '../pages/addBaseClientGrant'
+import AddBaseClientDetailsPage from '../pages/addBaseClientDetails'
+import ViewBaseClientListPage from '../pages/viewBaseClientList'
+
+const visitAddBaseClientPage = (): AddBaseClientGrantPage => {
+  cy.signIn({ failOnStatusCode: true, redirectPath: '/base-clients/new' })
+  return Page.verifyOnPage(AddBaseClientGrantPage)
+}
+
+const visitAddWithClientCredentialsPage = (): AddBaseClientDetailsPage => {
+  cy.signIn({ failOnStatusCode: true, redirectPath: '/base-clients/new?grant=client-credentials' })
+  return Page.verifyOnPage(AddBaseClientDetailsPage)
+}
+
+context('Add client page', () => {
+  beforeEach(() => {
+    cy.task('reset')
+    cy.task('stubSignIn')
+    cy.task('stubManageUser')
+    cy.task('stubListBaseClients')
+  })
+
+  context('Add base client choose grant screen', () => {
+    let addBaseClientGrantPage: AddBaseClientGrantPage
+
+    beforeEach(() => {
+      addBaseClientGrantPage = visitAddBaseClientPage()
+    })
+
+    it('User can see select a grant type radio buttons', () => {
+      addBaseClientGrantPage.grantTypeRadioGroup().should('be.visible')
+    })
+
+    it('Client credentials is selected by default', () => {
+      addBaseClientGrantPage.clientCredentialsRadio().should('have.attr', 'checked')
+    })
+
+    it('Authorization code is disabled (for now)', () => {
+      addBaseClientGrantPage.authorizationCodeRadio().should('have.attr', 'disabled')
+    })
+
+    it('User clicks cancel to return to home screen', () => {
+      addBaseClientGrantPage.cancelLink().click()
+      Page.verifyOnPage(ViewBaseClientListPage)
+    })
+
+    it('User clicks continue to got to add base client details screen', () => {
+      addBaseClientGrantPage.continueButton().click()
+      Page.verifyOnPage(AddBaseClientDetailsPage)
+    })
+  })
+
+  context('Add base client enter details screen - client credentials', () => {
+    let addBaseClientDetailsPage: AddBaseClientDetailsPage
+
+    beforeEach(() => {
+      addBaseClientDetailsPage = visitAddWithClientCredentialsPage()
+    })
+
+    it('User can see base-client form inputs', () => {
+      addBaseClientDetailsPage.baseClientIdInput().should('be.visible')
+      addBaseClientDetailsPage.baseClientServiceRadioButton().should('exist')
+      addBaseClientDetailsPage.baseClientPersonalRadioButton().should('exist')
+      addBaseClientDetailsPage.baseClientAccessTokenValidityDropdown().should('be.visible')
+      addBaseClientDetailsPage.baseClientApprovedScopesInput().should('be.visible')
+    })
+
+    it('User can see audit trail form inputs', () => {
+      addBaseClientDetailsPage.auditTrailDetailsInput().should('be.visible')
+    })
+
+    it('User can see grant details form inputs', () => {
+      addBaseClientDetailsPage.grantTypeInput().should('be.visible')
+      addBaseClientDetailsPage.grantAuthoritiesInput().should('be.visible')
+      addBaseClientDetailsPage.grantDatabaseUsernameInput().should('be.visible')
+    })
+
+    it('User can see config form inputs', () => {
+      addBaseClientDetailsPage.configDoesExpireCheckbox().should('exist')
+      addBaseClientDetailsPage.configAllowedIpsInput().should('be.visible')
+    })
+
+    context('Access token validity dropdown', () => {
+      it('Custom input is initially hidden', () => {
+        addBaseClientDetailsPage.baseClientAccessTokenValidityInput().should('not.be.visible')
+      })
+
+      it('Custom input is shown when custom option is selected', () => {
+        addBaseClientDetailsPage.baseClientAccessTokenValidityDropdown().select('Custom')
+        addBaseClientDetailsPage.baseClientAccessTokenValidityInput().should('be.visible')
+      })
+    })
+
+    context('Allow client to expire ', () => {
+      it('Does expire checkbox is unchecked by default', () => {
+        addBaseClientDetailsPage.configDoesExpireCheckbox().should('not.be.checked')
+      })
+
+      it('Expiry days input is shown if checkbox is selected', () => {
+        addBaseClientDetailsPage.configDoesExpireCheckbox().click()
+        addBaseClientDetailsPage.configExpiryDaysInput().should('be.visible')
+      })
+    })
+
+    it('User clicks cancel to return to home screen', () => {
+      addBaseClientDetailsPage.cancelLink().click()
+      Page.verifyOnPage(ViewBaseClientListPage)
+    })
+
+    it('User clicks continue to post new client details screen', () => {
+      // enter a base client id
+      addBaseClientDetailsPage.baseClientIdInput().type('new-client-id')
+
+      // set up to check the POST request
+      cy.intercept('POST', '/base-clients/new', req => {
+        const { body } = req
+        expect(body).to.contain('baseClientId=new-client-id')
+      })
+
+      addBaseClientDetailsPage.saveButton().click()
+    })
+  })
+})

integration_tests/e2e/view-base-client-list.cy.ts

@@ -0,0 +1,88 @@
+import Page from '../pages/page'
+import ViewBaseClientListPage from '../pages/viewBaseClientList'
+import ViewBaseClientPage from '../pages/viewBaseClient'
+import NewBaseClientGrantPage from '../pages/newBaseClientGrant'
+
+const visitBaseClientListPage = (): ViewBaseClientListPage => {
+  cy.signIn()
+  cy.visit('/')
+  return Page.verifyOnPage(ViewBaseClientListPage)
+}
+
+context('Homepage - list base-clients', () => {
+  let listBaseClientsPage: ViewBaseClientListPage
+
+  beforeEach(() => {
+    cy.task('reset')
+    cy.task('stubSignIn')
+    cy.task('stubListBaseClients')
+    cy.task('stubGetBaseClient')
+    cy.task('stubManageUser')
+    cy.task('stubGetListClientInstancesList')
+
+    listBaseClientsPage = visitBaseClientListPage()
+  })
+
+  it('User can see base-client list', () => {
+    listBaseClientsPage.baseClientList().should('have.length', 3)
+  })
+
+  it('User can click through to base-client', () => {
+    listBaseClientsPage.baseClientList().first().children('a').click()
+    Page.verifyOnPage(ViewBaseClientPage)
+  })
+
+  it('User can see Add New button', () => {
+    listBaseClientsPage.addNewBaseClient().should('exist')
+  })
+
+  it('User can click through to new base-client page', () => {
+    listBaseClientsPage.addNewBaseClient().click()
+    Page.verifyOnPage(NewBaseClientGrantPage)
+  })
+
+  it('Filter page is hidden', () => {
+    listBaseClientsPage.filterPanel().should('not.be.visible')
+  })
+
+  it('Toggle filter button has text Show filter', () => {
+    listBaseClientsPage.toggleFilterButton().should('have.text', 'Show filter')
+  })
+
+  it('On click shows filter panel and updates text to Hide filter', () => {
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.filterPanel().should('be.visible')
+    listBaseClientsPage.toggleFilterButton().should('have.text', 'Hide filter')
+  })
+
+  it('On second click hides filter panel and reverts text to Show filter', () => {
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.filterPanel().should('not.be.visible')
+    listBaseClientsPage.toggleFilterButton().should('have.text', 'Show filter')
+  })
+
+  it('On second click hides filter panel and reverts text to Show filter', () => {
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.filterPanel().should('not.be.visible')
+    listBaseClientsPage.toggleFilterButton().should('have.text', 'Show filter')
+  })
+
+  it('On click Apply filter hides the filter', () => {
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.applyFilterButton().click()
+
+    listBaseClientsPage.filterPanel().should('not.be.visible')
+  })
+
+  it('On click Apply with filter content limits rows in table', () => {
+    listBaseClientsPage.toggleFilterButton().click()
+    listBaseClientsPage.roleFilterInputBox().type('ROLE_TWO')
+
+    listBaseClientsPage.applyFilterButton().click()
+
+    listBaseClientsPage.filterPanel().should('not.be.visible')
+    listBaseClientsPage.baseClientList().should('have.length', 2)
+  })
+})

integration_tests/e2e/view-base-client.cy.ts

@@ -0,0 +1,80 @@
+import Page from '../pages/page'
+import ViewBaseClientPage from '../pages/viewBaseClient'
+import ViewClientSecretsPage from '../pages/viewClientSecrets'
+import ConfirmDeleteClientPage from '../pages/confirmDeleteClient'
+import EditBaseClientDetailsPage from '../pages/editBaseClientDetails'
+import EditBaseClientDeploymentDetailsPage from '../pages/editBaseClientDeploymentDetails'
+
+const visitBaseClientPage = (): ViewBaseClientPage => {
+  cy.signIn({ failOnStatusCode: true, redirectPath: '/base-clients/base_client_id_1' })
+  return Page.verifyOnPage(ViewBaseClientPage)
+}
+
+context('Base client page', () => {
+  let baseClientsPage: ViewBaseClientPage
+
+  beforeEach(() => {
+    cy.task('reset')
+    cy.task('stubSignIn')
+    cy.task('stubGetBaseClient')
+    cy.task('stubManageUser')
+    cy.task('stubGetListClientInstancesList')
+    cy.task('stubAddClientInstance')
+
+    baseClientsPage = visitBaseClientPage()
+  })
+
+  context('Client instances', () => {
+    it('User can see client instance list', () => {
+      baseClientsPage.clientInstanceRows().should('have.length', 3)
+    })
+
+    it('User can click add to create new client instance', () => {
+      baseClientsPage.addClientInstanceButton().click()
+      Page.verifyOnPage(ViewClientSecretsPage)
+    })
+
+    it('User can click delete to be taken to delete confirmation page', () => {
+      baseClientsPage.clientInstanceDeleteButtons().first().click()
+      Page.verifyOnPage(ConfirmDeleteClientPage)
+    })
+  })
+
+  context('Base client details', () => {
+    it('User can see base client details table', () => {
+      baseClientsPage.baseClientDetailsTable().should('be.visible')
+    })
+
+    it('User can see audit trail table', () => {
+      baseClientsPage.baseClientAuditTable().should('be.visible')
+    })
+
+    it('User can see client credentials table', () => {
+      baseClientsPage.baseClientClientCredentialsTable().should('be.visible')
+    })
+
+    it('User can see config table', () => {
+      baseClientsPage.baseClientConfigTable().should('be.visible')
+    })
+
+    it('User can click Change client details to be taken to edit page', () => {
+      baseClientsPage.changeClientDetailsLink().click()
+      Page.verifyOnPage(EditBaseClientDetailsPage)
+    })
+  })
+
+  context('Deployment details', () => {
+    it('User can see deployment contacts table', () => {
+      baseClientsPage.baseClientDeploymentContactTable().should('be.visible')
+    })
+
+    it('User can see deployment platform table', () => {
+      baseClientsPage.baseClientDeploymentPlatformTable().should('be.visible')
+    })
+
+    it('User can click Change client details to be taken to edit deployment page', () => {
+      baseClientsPage.changeDeploymentDetailsLink().click()
+      Page.verifyOnPage(EditBaseClientDeploymentDetailsPage)
+    })
+  })
+})

integration_tests/index.d.ts

@@ -4,6 +4,6 @@ declare namespace Cypress {
      * Custom command to signIn. Set failOnStatusCode to false if you expect and non 200 return code
      * @example cy.signIn({ failOnStatusCode: boolean })
      */
-    signIn(options?: { failOnStatusCode: boolean }): Chainable<AUTWindow>
+    signIn(options?: { failOnStatusCode: boolean; redirectPath?: string }): Chainable<AUTWindow>
   }
 }

integration_tests/mockApis/baseClientsApi.ts

@@ -2,6 +2,8 @@ import { stubFor } from './wiremock'
 import {
   listBaseClientsResponseMock,
   getBaseClientResponseMock,
+  getListClientInstancesResponseMock,
+  getSecretsResponseMock,
 } from '../../server/data/localMockData/baseClientsResponseMock'
 
 export default {
@@ -25,7 +27,7 @@ export default {
     return stubFor({
       request: {
         method: 'GET',
-        urlPattern: `/baseClientsApi/base-clients/baseClientId`,
+        urlPattern: `/baseClientsApi/base-clients/base_client_id_1`,
       },
       response: {
         status: 200,
@@ -36,4 +38,52 @@ export default {
       },
     })
   },
+
+  stubGetListClientInstancesList: () => {
+    return stubFor({
+      request: {
+        method: 'GET',
+        urlPattern: `/baseClientsApi/base-clients/base_client_id_1/clients`,
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: getListClientInstancesResponseMock,
+      },
+    })
+  },
+
+  stubGetClientDeploymentDetails: () => {
+    return stubFor({
+      request: {
+        method: 'GET',
+        urlPattern: `/baseClientsApi/base-clients/base_client_id_1/deployment`,
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: getListClientInstancesResponseMock,
+      },
+    })
+  },
+
+  stubAddClientInstance: () => {
+    return stubFor({
+      request: {
+        method: 'POST',
+        urlPattern: `/baseClientsApi/base-clients/base_client_id_1/clients`,
+      },
+      response: {
+        status: 200,
+        headers: {
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        jsonBody: getSecretsResponseMock,
+      },
+    })
+  },
 }