Skip to content

Commit

Permalink
fix(EMS-3590-3591-3423): header link, integrity hashes (#2738)
Browse files Browse the repository at this point in the history
* fix(EMS-3590): update insurance header link

* fix(EMS-3591-3423): update integrity hashes

* chore(EMS-3533): update start url redirect

* fix(EMS-3533): revert start page redirect

* chore(e2e): dry route const
  • Loading branch information
ttbarnes authored Jul 16, 2024
1 parent 22af7be commit 46c4d01
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 19 deletions.
6 changes: 2 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@

## [2.11.1](https://github.com/UK-Export-Finance/exip/compare/v2.11.0...v2.11.1) (2024-07-15)


### Bug Fixes

* **EMS-3439-3504:** uk goods or services, application submission email copy fixes ([#2728](https://github.com/UK-Export-Finance/exip/issues/2728)) ([125154e](https://github.com/UK-Export-Finance/exip/commit/125154ea28b8aeae6b65fc41889e97ca9de59cd4))
- **EMS-3439-3504:** uk goods or services, application submission email copy fixes ([#2728](https://github.com/UK-Export-Finance/exip/issues/2728)) ([125154e](https://github.com/UK-Export-Finance/exip/commit/125154ea28b8aeae6b65fc41889e97ca9de59cd4))

## [2.11.0](https://github.com/UK-Export-Finance/exip/compare/v2.10.1...v2.11.0) (2024-07-12)


### Features

* **EMS-3502-3567-3568:** content updates - contact details ([#2721](https://github.com/UK-Export-Finance/exip/issues/2721)) ([4b347e7](https://github.com/UK-Export-Finance/exip/commit/4b347e7425d0ece98d7de00649a57eb9e9820ef3))
- **EMS-3502-3567-3568:** content updates - contact details ([#2721](https://github.com/UK-Export-Finance/exip/issues/2721)) ([4b347e7](https://github.com/UK-Export-Finance/exip/commit/4b347e7425d0ece98d7de00649a57eb9e9820ef3))

## [2.10.1](https://github.com/UK-Export-Finance/exip/compare/v2.10.0...v2.10.1) (2024-07-12)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ import { PRODUCT } from '../../../content-strings';
import header from '../../../partials/header';
import { ROUTES } from '../../../constants';

const { ROOT: quoteStart } = ROUTES;
const { START: insuranceStart } = ROUTES.INSURANCE;
const {
QUOTE: { START: quoteStart },
INSURANCE: {
ELIGIBILITY: { CHECK_IF_ELIGIBLE: insuranceStart },
},
} = ROUTES;

/**
* checks service name based on if isInsuranceRoute is true or false
Expand Down
5 changes: 4 additions & 1 deletion e2e-tests/constants/routes/insurance/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ import { CHECK_YOUR_ANSWERS } from './check-your-answers';

export const MVP_INSURANCE_ROOT = '/insurance';
export const INSURANCE_ROOT = '/apply';
export const START_ROOT = '/start';

const ELIGIBILITY_ROOT = '/eligibility';

export const INSURANCE_ROUTES = {
MVP_INSURANCE_ROOT,
ROOT: INSURANCE_ROOT,
START: `${INSURANCE_ROOT}/start`,
ELIGIBILITY_ROOT,
START_ROOT,
START: `${INSURANCE_ROOT}${START_ROOT}`,
ELIGIBILITY: {
CHECK_IF_ELIGIBLE: `${INSURANCE_ROOT}${ELIGIBILITY_ROOT}/check-if-eligible`,
CANNOT_APPLY: `${INSURANCE_ROOT}${ELIGIBILITY_ROOT}/cannot-apply`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ const {
ELIGIBILITY: { CHECK_IF_ELIGIBLE },
MVP_INSURANCE_ROOT,
ROOT,
START_ROOT,
} = INSURANCE_ROUTES;

const baseUrl = Cypress.config('baseUrl');

const mvpStartRoute = `${MVP_INSURANCE_ROOT}${START_ROOT}`;

context(`Insurance - Redirects - '${MVP_INSURANCE_ROOT}' URLs should redirect to the '${ROOT}' equivalent URL`, () => {
describe(`/${MVP_INSURANCE_ROOT}/start`, () => {
describe(mvpStartRoute, () => {
it(`should redirect to ${EXTERNAL.FULL_APPLICATION}`, () => {
cy.navigateToUrl('/insurance/start');
cy.navigateToUrl(mvpStartRoute);

cy.assertUrl(EXTERNAL.FULL_APPLICATION);
});
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/css/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ui/public/js/govukFrontend.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ui/public/js/govukFrontend.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ui/public/js/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ui/public/js/main.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ui/server/constants/integrity.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const INTEGRITY = {
JS: 'sha512-BFOXngFJ+9msC1y5Q1LD6AG+LG635vp8Lfv/+HVCUU8w/N8VWH13wdTyZeLGvu4d7zoTz83nfz329ENYfe9x5Q==',
ACCESSIBILITY: 'sha512-+7iHxg+GAStsu3dNSm9llhRRnjOvuU10+1sbYjZlkCUd5wH9iaCWV9fY+33BtUQHafrjWU/rM42x3QlAj68Z2g==',
GOVUK: 'sha512-uJMQPUeUnIWtgcgNotPpY4KqFrwRUF37sk+lFhznPIixtx6YLkppurGiruUaJx3s12jd2vZ0eaow4QQdeE0ANg==',
GOVUK: 'sha512-2w2jF0v1I3SJnJjE7gO7bHPoMvDcS7Q09iR+lhxAuJtlAh/ns4RngF/6kFLTDURPvd0xI2TegOvnh1Iw2ndTKg==',
FORM: 'sha512-iLw/Pa746ZmhA0V+1Vj107wkJKKnTwS5EggladAAm+onBFlgZBTRGA4xf3bVGU40qPKP6Fjn16JW6G+g3tnj7A==',
COOKIES: 'sha512-mdioDv38Cx1nkVD8oPXoJxvie9wf/339EE8g8+jlsVaDrJeJiwUkYBwweF3fqQMZfZzO8ivTXAEyithgBzeEpw==',
GA: 'sha512-GYc1xJpYfgNCIBH1NDfs7GhzBdepN1aPqueETCi5ZFIaompI6v++beAnZgbxpSyKr2GqO/oUpm86HZyoe3tD1Q==',
Expand Down
4 changes: 3 additions & 1 deletion src/ui/server/constants/routes/insurance/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ import { CHECK_YOUR_ANSWERS } from './check-your-answers';

export const MVP_INSURANCE_ROOT = '/insurance';
export const INSURANCE_ROOT = '/apply';
export const START_ROOT = '/start';

const ELIGIBILITY_ROOT = '/eligibility';

export const INSURANCE_ROUTES = {
MVP_INSURANCE_ROOT,
INSURANCE_ROOT,
ELIGIBILITY_ROOT,
START: `${INSURANCE_ROOT}/start`,
START_ROOT,
START: `${INSURANCE_ROOT}${START_ROOT}`,
ELIGIBILITY: {
CHECK_IF_ELIGIBLE: `${INSURANCE_ROOT}${ELIGIBILITY_ROOT}/check-if-eligible`,
CANNOT_APPLY: `${INSURANCE_ROOT}${ELIGIBILITY_ROOT}/cannot-apply`,
Expand Down
8 changes: 6 additions & 2 deletions src/ui/server/helpers/page-variables/core/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ import { ATTRIBUTES, ROUTES, TEMPLATES } from '../../../constants';

const { THERE_IS_A_PROBLEM } = ERROR_MESSAGES;

const { START: quoteStart } = ROUTES.QUOTE;
const { START: insuranceStart } = ROUTES.INSURANCE;
const {
QUOTE: { START: quoteStart },
INSURANCE: {
ELIGIBILITY: { CHECK_IF_ELIGIBLE: insuranceStart },
},
} = ROUTES;

const { CONDITIONAL_YES_HTML } = TEMPLATES.PARTIALS.INSURANCE.BUYER.CONNECTION_WITH_BUYER;

Expand Down
2 changes: 1 addition & 1 deletion src/ui/server/helpers/page-variables/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const corePageVariables = ({ PAGE_CONTENT_STRINGS, BACK_LINK, ORIGINAL_URL, USE_
FEEDBACK_ROUTE = ROUTES.INSURANCE.FEEDBACK;
FOOTER = INSURANCE_FOOTER;
PRODUCT = { DESCRIPTION: PRODUCT_CONTENT_STRINGS.DESCRIPTION.APPLICATION };
START_ROUTE = ROUTES.INSURANCE.START;
START_ROUTE = ROUTES.INSURANCE.ELIGIBILITY.CHECK_IF_ELIGIBLE;
}

return {
Expand Down

0 comments on commit 46c4d01

Please sign in to comment.