Skip to content

CDPTKAN-763: Software updates #2917

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.

Sign up for GitHub

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

Merged
Ripan (ripan) merged 5 commits into from
Apr 27, 2026
Merged

CDPTKAN-763: Software updates #2917

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7183e83
Update gems
ripan Apr 20, 2026
b4525e1
Fix snyk vunerabilities
ripan Apr 21, 2026
9ee4fee
Update Gems
ripan Apr 27, 2026
cd61963
Fix jstest
ripan Apr 27, 2026
c0fd251
Update Gemfile.lock
ripan Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ruby '3.2.0'
# github: 'ministryofjustice/fb-metadata-presenter',
# branch: 'test-footer-partial'
# gem 'metadata_presenter', path: '../fb-metadata-presenter'
gem 'metadata_presenter', '3.4.12'
gem 'metadata_presenter', '3.4.13'

gem 'activerecord-session_store'
gem 'administrate', '~> 0.20.1'
Expand All @@ -29,8 +29,8 @@ gem 'omniauth-auth0', '~> 3.1.0'
gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
gem 'pg', '>= 0.18', '< 2.0'
gem 'puma', '~> 6.4'
gem 'rack', '2.2.14'
gem 'rails', '~> 7.2'
gem 'rack', '3.2.6'
gem 'rails', '~> 7.2.3.1'
# Use Redis for Action Cable
gem 'redis', '~> 4.0'
gem 'sass-rails', '>= 6'
Expand Down
172 changes: 89 additions & 83 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,73 +9,74 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.2.2)
actionpack (= 7.2.2.2)
activesupport (= 7.2.2.2)
actioncable (7.2.3.1)
actionpack (= 7.2.3.1)
activesupport (= 7.2.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.2.2)
actionpack (= 7.2.2.2)
activejob (= 7.2.2.2)
activerecord (= 7.2.2.2)
activestorage (= 7.2.2.2)
activesupport (= 7.2.2.2)
actionmailbox (7.2.3.1)
actionpack (= 7.2.3.1)
activejob (= 7.2.3.1)
activerecord (= 7.2.3.1)
activestorage (= 7.2.3.1)
activesupport (= 7.2.3.1)
mail (>= 2.8.0)
actionmailer (7.2.2.2)
actionpack (= 7.2.2.2)
actionview (= 7.2.2.2)
activejob (= 7.2.2.2)
activesupport (= 7.2.2.2)
actionmailer (7.2.3.1)
actionpack (= 7.2.3.1)
actionview (= 7.2.3.1)
activejob (= 7.2.3.1)
activesupport (= 7.2.3.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.2.2)
actionview (= 7.2.2.2)
activesupport (= 7.2.2.2)
actionpack (7.2.3.1)
actionview (= 7.2.3.1)
activesupport (= 7.2.3.1)
cgi
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
rack (>= 2.2.4, < 3.3)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.2.2)
actionpack (= 7.2.2.2)
activerecord (= 7.2.2.2)
activestorage (= 7.2.2.2)
activesupport (= 7.2.2.2)
actiontext (7.2.3.1)
actionpack (= 7.2.3.1)
activerecord (= 7.2.3.1)
activestorage (= 7.2.3.1)
activesupport (= 7.2.3.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.2.2)
activesupport (= 7.2.2.2)
actionview (7.2.3.1)
activesupport (= 7.2.3.1)
builder (~> 3.1)
cgi
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.2.2)
activesupport (= 7.2.2.2)
activejob (7.2.3.1)
activesupport (= 7.2.3.1)
globalid (>= 0.3.6)
activemodel (7.2.2.2)
activesupport (= 7.2.2.2)
activerecord (7.2.2.2)
activemodel (= 7.2.2.2)
activesupport (= 7.2.2.2)
activemodel (7.2.3.1)
activesupport (= 7.2.3.1)
activerecord (7.2.3.1)
activemodel (= 7.2.3.1)
activesupport (= 7.2.3.1)
timeout (>= 0.4.0)
activerecord-session_store (2.1.0)
actionpack (>= 6.1)
activerecord (>= 6.1)
activerecord-session_store (2.2.0)
actionpack (>= 7.0)
activerecord (>= 7.0)
cgi (>= 0.3.6)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 4)
railties (>= 6.1)
activestorage (7.2.2.2)
actionpack (= 7.2.2.2)
activejob (= 7.2.2.2)
activerecord (= 7.2.2.2)
activesupport (= 7.2.2.2)
railties (>= 7.0)
activestorage (7.2.3.1)
actionpack (= 7.2.3.1)
activejob (= 7.2.3.1)
activerecord (= 7.2.3.1)
activesupport (= 7.2.3.1)
marcel (~> 1.0)
activesupport (7.2.2.2)
activesupport (7.2.3.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -84,11 +85,11 @@ GEM
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
minitest (>= 5.1, < 6)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
administrate (0.20.1)
actionpack (>= 6.0, < 8.0)
actionview (>= 6.0, < 8.0)
Expand Down Expand Up @@ -301,19 +302,20 @@ GEM
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
mail (2.9.0)
logger
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.4)
marcel (1.1.0)
matrix (0.4.2)
metadata_presenter (3.4.12)
metadata_presenter (3.4.13)
govspeak (~> 7.1)
govuk_design_system_formbuilder (~> 5.11.0)
json-schema (~> 4.1.1)
kramdown (~> 2.4.0)
rails (~> 7.2.0)
rails (~> 7.2.3.1)
sassc-rails (= 2.1.2)
sprockets
sprockets-rails
Expand All @@ -323,12 +325,11 @@ GEM
mini_portile2 (2.8.9)
minitest (5.25.5)
msgpack (1.8.0)
multi_json (1.15.0)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
net-http (0.6.0)
uri
net-imap (0.5.9)
net-imap (0.6.3)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -350,8 +351,9 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
omniauth (2.1.3)
omniauth (2.1.4)
hashie (>= 3.4.6)
logger
rack (>= 2.2.3)
rack-protection
omniauth-auth0 (3.1.1)
Expand Down Expand Up @@ -587,51 +589,54 @@ GEM
psych (5.2.3)
date
stringio
public_suffix (6.0.1)
public_suffix (7.0.5)
puma (6.6.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (2.2.14)
rack-protection (3.2.0)
rack (3.2.6)
rack-protection (4.2.1)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-proxy (0.7.7)
rack
rack-session (1.0.2)
rack (< 3)
rack-session (2.1.2)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (1.0.1)
rack (< 3)
webrick
rails (7.2.2.2)
actioncable (= 7.2.2.2)
actionmailbox (= 7.2.2.2)
actionmailer (= 7.2.2.2)
actionpack (= 7.2.2.2)
actiontext (= 7.2.2.2)
actionview (= 7.2.2.2)
activejob (= 7.2.2.2)
activemodel (= 7.2.2.2)
activerecord (= 7.2.2.2)
activestorage (= 7.2.2.2)
activesupport (= 7.2.2.2)
rackup (2.3.1)
rack (>= 3)
rails (7.2.3.1)
actioncable (= 7.2.3.1)
actionmailbox (= 7.2.3.1)
actionmailer (= 7.2.3.1)
actionpack (= 7.2.3.1)
actiontext (= 7.2.3.1)
actionview (= 7.2.3.1)
activejob (= 7.2.3.1)
activemodel (= 7.2.3.1)
activerecord (= 7.2.3.1)
activestorage (= 7.2.3.1)
activesupport (= 7.2.3.1)
bundler (>= 1.15.0)
railties (= 7.2.2.2)
railties (= 7.2.3.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (7.2.2.2)
actionpack (= 7.2.2.2)
activesupport (= 7.2.2.2)
railties (7.2.3.1)
actionpack (= 7.2.3.1)
activesupport (= 7.2.3.1)
cgi
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
tsort (>= 0.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
Expand All @@ -648,7 +653,7 @@ GEM
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
rexml (3.4.1)
rexml (3.4.4)
rinku (2.0.6)
rouge (4.5.1)
rspec-core (3.13.3)
Expand Down Expand Up @@ -781,6 +786,7 @@ GEM
thread_safe (0.3.6)
tilt (2.6.0)
timeout (0.4.3)
tsort (0.2.0)
turbo-rails (1.5.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
Expand All @@ -793,7 +799,7 @@ GEM
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.3)
uri (1.1.1)
useragent (0.16.11)
version_gem (1.1.6)
view_component (3.6.0)
Expand Down Expand Up @@ -856,13 +862,13 @@ DEPENDENCIES
govuk_notify_rails (~> 2.2.0)
hashie
listen (~> 3.8)
metadata_presenter (= 3.4.12)
metadata_presenter (= 3.4.13)
omniauth-auth0 (~> 3.1.0)
omniauth-rails_csrf_protection (~> 1.0.1)
pg (>= 0.18, < 2.0)
puma (~> 6.4)
rack (= 2.2.14)
rails (~> 7.2)
rack (= 3.2.6)
rails (~> 7.2.3.1)
redis (~> 4.0)
rspec-rails
rspec_junit_formatter
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"@x-govuk/marked-govspeak": "^0.2.0",
"accessible-autocomplete": "^2.0.4",
"chai-dom": "^1.11.0",
"dompurify": "^3.2.4",
"dompurify": "^3.4.0",
"govuk-frontend": "4.8.0",
"govuk-markdown": "^0.3.0",
"jquery": "^3.6.4",
"jquery-ui-dist": "^1.13.2",
"marked": "4.3.0",
"resolve-url-loader": "^5.0.0",
"sanitize-html": "^2.8.1",
"sanitize-html": "^2.12.1",
"showdown": "^2.1.0",
"sinon": "^15.0.3",
"sinon": "^16.1.2",
"tabbable": "^6.0.1"
},
"version": "0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion test/web-components/editable-content/behaviours_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ describe('<editable-content>', function() {

button.focus()

expect(component.output).to.have.html(`<h1 id="heading-1" class="govuk-heading-xl">Heading 1</h1><p class="govuk-body">This is a paragraph</p>
expect(component.output).to.have.html(`<h1 class="govuk-heading-xl" id="heading-1">Heading 1</h1><p class="govuk-body">This is a paragraph</p>
`)
})
})
Expand Down
6 changes: 3 additions & 3 deletions test/web-components/editable-content/syntax_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('<editable-content>', function() {
component.root.focus();
button.focus();

expect(component.output).to.contain.html(`<h1 id="heading-1" class="govuk-heading-xl">Heading 1</h1><h2 id="heading-2" class="govuk-heading-l">Heading 2</h2><h3 id="heading-3" class="govuk-heading-m">Heading 3</h3><h4 id="heading-4" class="govuk-heading-s">Heading 4</h4>`)
expect(component.output).to.contain.html(`<h1 class="govuk-heading-xl" id="heading-1">Heading 1</h1><h2 class="govuk-heading-l" id="heading-2">Heading 2</h2><h3 class="govuk-heading-m" id="heading-3">Heading 3</h3><h4 class="govuk-heading-s" id="heading-4">Heading 4</h4>`)
})
})

Expand All @@ -50,7 +50,7 @@ describe('<editable-content>', function() {
component.root.focus();
button.focus();

expect(component.output).to.contain.html(`<p class="govuk-body"><a href="http://example.com" class="govuk-link">Link</a></p>`)
expect(component.output).to.contain.html(`<p class="govuk-body"><a class="govuk-link" href="http://example.com">Link</a></p>`)
})

it('renders email links', async function() {
Expand All @@ -63,7 +63,7 @@ describe('<editable-content>', function() {
component.root.focus();
button.focus();

expect(component.output).to.contain.html(`<p class="govuk-body"><a href="mailto:email@address.com" class="govuk-link">email@address.com</a></p>`)
expect(component.output).to.contain.html(`<p class="govuk-body"><a class="govuk-link" href="mailto:email@address.com">email@address.com</a></p>`)
})
})

Expand Down
Loading
Loading