From 8aca74ec5b8c49b11d73deb5bc257c84a77dd747 Mon Sep 17 00:00:00 2001 From: Christopher Sunkel Date: Mon, 26 Feb 2024 18:42:17 +0000 Subject: [PATCH] Fixes --- package.json | 2 +- .../ActivityFeed/activities/card/ActivityCardSubject.jsx | 5 +++-- test/a11y/cypress/config/urlTestExclusions.js | 1 + .../cypress/specs/companies/omis-collection-spec.js | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b56ed6cdb0c..d3abd5f76ef 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "test:unit": "NODE_ENV=test API_ROOT=http://test MOCHA_FILE=junit/test-results.xml npx mocha ./src/**/*.test.js --exit", "test:functional": "CYPRESS_retries=3 nyc cypress run --browser chrome", "test:a11y": "CYPRESS_coverage=false cypress run --config-file cypress.a11y.config.js --browser chrome", - "test:a11y:watch": "CYPRESS_coverage=false cypress open --config-file cypress.a11y.config.js --browser chrome", + "test:a11y:watch": "CYPRESS_coverage=false cypress open --config-file cypress.a11y.config.js --e2e --browser chrome", "test:unit-client": "NODE_ENV=test WEBPACK_ENV=develop MOCHA_FILE=junit/test-results.xml npx mochapack --webpack-config webpack.node.config.js --opts ./test/unit-client/mocha.opts ./test/unit-client/assets/javascripts/**/*.test.{js,jsx}", "test:functional:watch": "cypress open --e2e --browser chrome", "test:e2e:lep": "CYPRESS_coverage=false cypress run --config '{\"specPattern\":[\"test/end-to-end/cypress/specs/LEP/**/*.js\"]}' --browser chrome", diff --git a/src/client/components/ActivityFeed/activities/card/ActivityCardSubject.jsx b/src/client/components/ActivityFeed/activities/card/ActivityCardSubject.jsx index 114f0b094e4..bf7ab38dc59 100644 --- a/src/client/components/ActivityFeed/activities/card/ActivityCardSubject.jsx +++ b/src/client/components/ActivityFeed/activities/card/ActivityCardSubject.jsx @@ -1,11 +1,12 @@ import React from 'react' import PropTypes from 'prop-types' +import { H3 } from 'govuk-react' import { FONT_SIZE, FONT_WEIGHTS } from '@govuk-react/constants' import styled from 'styled-components' import { BLUE } from '../../../../../client/utils/colours' -const StyledActivitySubject = styled('h3')` +const StyledActivitySubject = styled(H3)` font-size: ${FONT_SIZE.SIZE_20}; font-weight: ${FONT_WEIGHTS.bold}; line-height: ${FONT_SIZE.SIZE_24}; @@ -25,7 +26,7 @@ const ActivityCardSubject = ({ dataTest = 'activity-card-subject', margin = { bottom: 10 }, }) => ( - + {children} ) diff --git a/test/a11y/cypress/config/urlTestExclusions.js b/test/a11y/cypress/config/urlTestExclusions.js index e34029f3918..2f3a8412aed 100644 --- a/test/a11y/cypress/config/urlTestExclusions.js +++ b/test/a11y/cypress/config/urlTestExclusions.js @@ -132,6 +132,7 @@ export const urlTestExclusions = [ { url: '/investments/projects/:investmentId/propositions/:propositionId' }, { url: '/companies/:companyId/hierarchies/ghq/:globalHqId/add' }, { url: '/companies/:companyId/hierarchies/ghq/remove' }, + { url: '/companies/:companyId' }, // 501 errors { url: '/api-proxy/v4/company/:companyId/export-win' }, { url: '/investments/projects/:projectId/edit-ukcompany/:companyId' }, diff --git a/test/functional/cypress/specs/companies/omis-collection-spec.js b/test/functional/cypress/specs/companies/omis-collection-spec.js index a59c6ca466c..7898394ad15 100644 --- a/test/functional/cypress/specs/companies/omis-collection-spec.js +++ b/test/functional/cypress/specs/companies/omis-collection-spec.js @@ -205,9 +205,8 @@ describe('Company Orders (OMIS) Collection Page', () => { }).as('archivedApiRequest') cy.visit(urls.companies.orders(archivedLtd.id)) assertPayload('@archivedApiRequest', { - offset: 0, limit: 10, - sortby: 'created_on:desc', + offset: 0, company: archivedLtd.id, }) })