Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use GOV.UK Frontend v5 on management pages and tests #2327

Merged
merged 5 commits into from
Jan 11, 2024

Conversation

colinrotherham
Copy link
Contributor

@colinrotherham colinrotherham commented Sep 1, 2023

PR to use GOV.UK Frontend v5 on management pages including the error server

Plugins can freely use GOV.UK Frontend v5 already but internal pages still use v4 and fail some tests

Test fixes

This PR also unblocks status checks on main where we know some tests install the latest govuk-frontend plugin. Current CSS selectors for the logo were incompatible between v4 and v5 so have been fixed

.govuk-header__logotype-text.govuk-header__logotype

@colinrotherham colinrotherham changed the base branch from main to frontend-v5-compatibility-colin September 1, 2023 16:29
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from f2b5762 to 4e782dc Compare September 1, 2023 16:47
server.js Outdated Show resolved Hide resolved
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from 4e782dc to e5d6c76 Compare September 4, 2023 16:47
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin branch 9 times, most recently from 18fc10b to e12f909 Compare September 14, 2023 15:16
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from e5d6c76 to 79c7701 Compare September 14, 2023 15:20
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from 79c7701 to f2fa86a Compare September 14, 2023 16:11
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from f2fa86a to 56fc65d Compare September 14, 2023 16:16
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch 2 times, most recently from 4ed5548 to 32c38b7 Compare September 19, 2023 12:21
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from 32c38b7 to aef666e Compare September 21, 2023 09:12
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from aef666e to 517c9ed Compare September 21, 2023 15:36
Base automatically changed from frontend-v5-compatibility-colin to main September 21, 2023 16:01
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from 517c9ed to 5495022 Compare September 28, 2023 17:18
Base automatically changed from frontend-v5-deprecated to main October 11, 2023 09:18
@colinrotherham colinrotherham changed the title [WIP] GOV.UK Frontend v5.0.0 preview [WIP] GOV.UK Frontend v5.0.0 pre-release Oct 24, 2023
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch 3 times, most recently from 2905408 to ae1af80 Compare October 25, 2023 08:02
@colinrotherham colinrotherham changed the title [WIP] GOV.UK Frontend v5.0.0 pre-release Use GOV.UK Frontend v5 on management pages Oct 25, 2023
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch 2 times, most recently from 0ca11e4 to 02c7bff Compare October 30, 2023 21:55
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from 02c7bff to 97b777c Compare November 3, 2023 12:30
@colinrotherham
Copy link
Contributor Author

colinrotherham commented Nov 3, 2023

Updated with GOV.UK Frontend v5.0.0-beta.1 v5.0.0

@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from 97b777c to a4be636 Compare November 3, 2023 12:50
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from a4be636 to 6728198 Compare November 30, 2023 11:05
@colinrotherham colinrotherham force-pushed the frontend-v5-compatibility-colin-preview branch from dd37d5d to e4ece89 Compare December 8, 2023 16:48
@colinrotherham colinrotherham marked this pull request as ready for review December 8, 2023 16:48

const fontUrl = '/plugin-assets/govuk-frontend/govuk/assets/fonts/bold-b542beb274-v2.woff2'
const fontUrl = '/manage-prototype/dependencies/govuk-frontend/dist/govuk/assets/fonts/bold-b542beb274-v2.woff2'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since plugins can use a different GOV.UK Frontend version, let's test the internal version

cy.get('.govuk-header__logotype-text')
cy.get('.govuk-header__logotype')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed the logo to use the parent .govuk-header__logotype

This way they'll work with both v4 and v5 should we need to switch

@colinrotherham colinrotherham changed the title Use GOV.UK Frontend v5 on management pages Use GOV.UK Frontend v5 on management pages + test fixes Jan 11, 2024
@colinrotherham colinrotherham changed the title Use GOV.UK Frontend v5 on management pages + test fixes Use GOV.UK Frontend v5 on management pages and tests Jan 11, 2024
Copy link
Contributor

@domoscargin domoscargin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for sorting.

@colinrotherham colinrotherham merged commit 34b0ad1 into main Jan 11, 2024
30 checks passed
@colinrotherham colinrotherham deleted the frontend-v5-compatibility-colin-preview branch January 11, 2024 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants