From b934a04a2c66e9fdbda57cd7a2ea88eb4c421cf3 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Mon, 30 Sep 2024 11:20:54 +0100 Subject: [PATCH] upgrade to govuk 5.4 => 5.6 --- Gemfile | 4 ++-- Gemfile.lock | 20 +++++++++---------- package.json | 2 +- .../early_career_payments_claim_spec.rb | 2 +- spec/support/feature_helpers.rb | 16 +++++++++++++++ yarn.lock | 8 ++++---- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index d48d5a7d1b..4378774e0d 100644 --- a/Gemfile +++ b/Gemfile @@ -64,9 +64,9 @@ gem "httpclient" gem "daemons" # Gov form builder to structure claims -gem "govuk_design_system_formbuilder", "~> 5.4.0" +gem "govuk_design_system_formbuilder", "~> 5.6" -gem "govuk-components" +gem "govuk-components", "~> 5.6.1" # See https://github.com/typhoeus/ethon/issues/185 gem "ethon", "~> 0.16.0" diff --git a/Gemfile.lock b/Gemfile.lock index cf1f9d3748..72171d32aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,7 +218,7 @@ GEM html-attributes-utils (~> 1.0.0, >= 1.0.0) pagy (>= 6, < 10) view_component (>= 3.9, < 3.15) - govuk_design_system_formbuilder (5.4.0) + govuk_design_system_formbuilder (5.6.0) actionview (>= 6.1) activemodel (>= 6.1) activesupport (>= 6.1) @@ -232,7 +232,7 @@ GEM mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) jbuilder (2.12.0) actionview (>= 5.0.0) @@ -274,7 +274,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.24.1) + minitest (5.25.1) msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) @@ -291,14 +291,14 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.6-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) notifications-ruby-client (6.1.0) jwt (>= 1.5, < 3) @@ -531,7 +531,7 @@ GEM validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - view_component (3.12.1) + view_component (3.14.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -579,8 +579,8 @@ DEPENDENCIES faker (~> 3.4) faraday_middleware foreman - govuk-components - govuk_design_system_formbuilder (~> 5.4.0) + govuk-components (~> 5.6.1) + govuk_design_system_formbuilder (~> 5.6) httpclient jbuilder (~> 2.12) jwt diff --git a/package.json b/package.json index d87cc21ed6..d126cfd875 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "dependencies": { "a11y-dialog": "^8.1.1", "accessible-autocomplete": "^3.0.1", - "govuk-frontend": "^5.4.0", + "govuk-frontend": "^5.6.0", "govuk-one-login-service-header": "https://github.com/govuk-one-login/service-header.git" }, "devDependencies": { diff --git a/spec/features/early_career_payments/early_career_payments_claim_spec.rb b/spec/features/early_career_payments/early_career_payments_claim_spec.rb index 98e559659c..7a55f6626c 100644 --- a/spec/features/early_career_payments/early_career_payments_claim_spec.rb +++ b/spec/features/early_career_payments/early_career_payments_claim_spec.rb @@ -997,7 +997,7 @@ skip_tid # - Which school do you teach at - choose_school school + choose_school_js school # - NQT in Academic Year after ITT choose "Yes" diff --git a/spec/support/feature_helpers.rb b/spec/support/feature_helpers.rb index 212fc67389..0c8b88cad6 100644 --- a/spec/support/feature_helpers.rb +++ b/spec/support/feature_helpers.rb @@ -40,6 +40,22 @@ def choose_school(school) click_button "Continue" end + def choose_school_js(school) + expect(page).to have_text(/Which (additional )?school/) # there can be variations of the full text depending on which journey/page + + fill_in :school_search, with: school.name.sub("The ", "").split(" ").first + + within("#school_search__listbox") do + sleep(1) # seems to aid in success, as if click happens before event is bound + find("li", text: school.name).click + end + + click_button "Continue" + + choose school.name + click_button "Continue" + end + def choose_still_teaching(teaching_at = "Yes, at Penistone Grammar School") choose teaching_at click_on "Continue" diff --git a/yarn.lock b/yarn.lock index 8a2367deda..4083ef5b01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,10 +34,10 @@ focusable-selectors@^0.8.0: resolved "https://registry.yarnpkg.com/focusable-selectors/-/focusable-selectors-0.8.4.tgz#2ee34129b29371766ce201499e3b88c6f79ea4c1" integrity sha512-0XxbkD0KhOnX10qmnfF9U8DkDD8N/e4M77wMYw2Itoi4vdcoRjSkqXLZFIzkrLIOxzmzCGy88fNG1EbeXMD/zw== -govuk-frontend@^5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.4.0.tgz#8f2e0b55ef7c7552a1efe68c7b40ff1b4a393e72" - integrity sha512-F3YwQYrYQqIPfNxsoph6O78Ey1unCB6cy6omx8KeWY9G504lWZFBSIaiUCma1jNLw9bOUU7Ui+tXG09jjqy0Mw== +govuk-frontend@^5.4.0, govuk-frontend@^5.6.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.6.0.tgz#8c0975f0d825ec7192bcfe64e3e97ef3dfa7dea1" + integrity sha512-yNA4bL7i7mNrg36wPNZ3RctHo9mjl82Phs8MWs1lwovxJuQ4ogEo/XWn2uB1HxkXNqgMlW4wnd0iiKgRMfxYfw== "govuk-one-login-service-header@https://github.com/govuk-one-login/service-header.git": version "1.1.0"