Skip to content

Commit b99de5a

Browse files
authored
Merge pull request #277 from Crown-Commercial-Service/dependabot/bun/govuk-frontend-5.14.0
Bump govuk-frontend from 5.13.0 to 5.14.0
2 parents 49291be + 4d7fe90 commit b99de5a

File tree

14 files changed

+60
-14
lines changed

14 files changed

+60
-14
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Added
1111

1212
- Add support for Ruby v4.0
13+
- Updated CCS Frontend to v2.4.0
14+
- Updated GOV.UK Frontend to v5.14.0
1315

1416
## [3.3.0] - 2025-11-26
1517

bun.lock

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/ccs/components/govuk/footer.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ def render
6767
concat(tag.div(class: 'govuk-footer__meta') do
6868
concat(tag.div(class: 'govuk-footer__meta-item govuk-footer__meta-item--grow') do
6969
concat(meta.render) if meta
70-
concat(footer_logo)
71-
concat(footer_content_licence)
70+
unless options.key?(:content_licence) && options[:content_licence].nil?
71+
concat(footer_logo)
72+
concat(footer_content_licence)
73+
end
7274
end)
7375
concat(footer_copyright)
7476
end)

lib/ccs/components/govuk/pagination.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def initialize_pagination_items(pagination_items, form)
8787

8888
pagination_item_class = form ? Item::Form : Item::Tag
8989

90-
@pagination_items = pagination_items.map { |pagination_item| pagination_item[:ellipsis] ? Item::Ellipsis : pagination_item_class.new(form: form, context: context, **pagination_item) }
90+
@pagination_items = pagination_items.compact_blank.map { |pagination_item| pagination_item[:ellipsis] ? Item::Ellipsis : pagination_item_class.new(form: form, context: context, **pagination_item) }
9191
end
9292
end
9393
end

lib/ccs/components/govuk/service_navigation/navigation.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def initialize(navigation:, context:, menu_button: nil, collapse_navigation_on_m
5656

5757
menu_button[:aria] = { controls: @navigation[:id] }
5858
menu_button[:aria][:label] = menu_button[:label] if menu_button[:label] && menu_button[:label] != menu_button[:text]
59+
menu_button[:aria][:hidden] = true
5960

6061
@menu_button = menu_button
6162
@navigation[:links] = navigation[:items].map { |navigation_link| Link.new(context: context, **navigation_link) }

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "CCS",
66
"license": "MIT",
77
"devDependencies": {
8-
"govuk-frontend": "5.13.0",
9-
"ccs-frontend": "2.3.0"
8+
"govuk-frontend": "5.14.0",
9+
"ccs-frontend": "2.4.0"
1010
}
1111
}

spec/ccs/components/govuk/service_navigation/navigation_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
let(:default_html) do
3838
'
3939
<nav aria-label="Menu" class="govuk-service-navigation__wrapper">
40-
<button name="button" type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" hidden="hidden">
40+
<button name="button" type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" aria-hidden="true" hidden="hidden">
4141
Menu
4242
</button>
4343
<ul id="navigation" class="govuk-service-navigation__list">

spec/ccs/components/govuk/service_navigation_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<span class="govuk-service-navigation__text">U.A. High</span>
5454
</span>
5555
<nav aria-label="Menu" class="govuk-service-navigation__wrapper">
56-
<button name="button" type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" hidden="hidden">
56+
<button name="button" type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" aria-hidden="true" hidden="hidden">
5757
Menu
5858
</button>
5959
<ul id="navigation" class="govuk-service-navigation__list">

spec/ccs/frontend_helpers/govuk_frontend/footer/fixtures_spec.rb

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@
2929
end
3030
end
3131

32+
context "when the fixture is 'with no content licence'" do
33+
let(:fixture_name) { 'with no content licence' }
34+
let(:result) { govuk_footer(content_licence: fixture_options[:contentLicence]) }
35+
36+
it 'has HTML matching the fixture' do
37+
expect(result).to eq_html(fixture_html)
38+
end
39+
end
40+
3241
context "when the fixture is 'with custom text content licence and copyright notice'" do
3342
let(:fixture_name) { 'with custom text content licence and copyright notice' }
3443
let(:result) { govuk_footer(content_licence: fixture_options[:contentLicence][:text], copyright: fixture_options[:copyright][:text]) }
@@ -56,6 +65,15 @@
5665
end
5766
end
5867

68+
context "when the fixture is 'with only custom meta'" do
69+
let(:fixture_name) { 'with only custom meta' }
70+
let(:result) { govuk_footer(content_licence: fixture_options[:contentLicence], meta: { text: fixture_options[:meta][:text] }) }
71+
72+
it 'has HTML matching the fixture' do
73+
expect(result).to eq_html(fixture_html)
74+
end
75+
end
76+
5977
context "when the fixture is 'with meta links and meta content'" do
6078
let(:fixture_name) { 'with meta links and meta content' }
6179
let(:result) { govuk_footer(meta: { items: fixture_options[:meta][:items], text: fixture_options[:meta][:html].html_safe }) }
@@ -65,6 +83,15 @@
6583
end
6684
end
6785

86+
context "when the fixture is 'with only meta links'" do
87+
let(:fixture_name) { 'with only meta links' }
88+
let(:result) { govuk_footer(content_licence: fixture_options[:contentLicence], meta: { items: fixture_options[:meta][:items] }) }
89+
90+
it 'has HTML matching the fixture' do
91+
expect(result).to eq_html(fixture_html)
92+
end
93+
end
94+
6895
context "when the fixture is 'with default width navigation (one column)'" do
6996
let(:fixture_name) { 'with default width navigation (one column)' }
7097
let(:result) { govuk_footer(navigation: fixture_options[:navigation]) }

spec/ccs/frontend_helpers/govuk_frontend/footer/validate_fixtures_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
'default' => true,
77
'with custom HTML content licence and copyright notice' => true,
88
'with custom text content licence and copyright notice' => true,
9+
'with no content licence' => true,
910
'with meta' => true,
1011
'with custom meta' => true,
12+
'with only custom meta' => true,
1113
'with meta links and meta content' => true,
14+
'with only meta links' => true,
1215
'with default width navigation (one column)' => true,
1316
'with default width navigation (two columns)' => true,
1417
'with navigation' => true,

0 commit comments

Comments
 (0)