From 58053cd977e027f1df7d360bb3db472202d29729 Mon Sep 17 00:00:00 2001 From: willclarke Date: Mon, 21 Oct 2024 10:44:05 +0100 Subject: [PATCH 1/6] EL-1781 Rails update to 7.2.1 (#1604) * update rails and add new db cleaner gem and config * update alias_attribute which has been deprecated and use alias_method --- Gemfile | 4 +- Gemfile.lock | 139 +++++++++--------- app/forms/additional_property_details_form.rb | 3 +- app/forms/benefit_details_form.rb | 3 +- app/forms/client_assets_form.rb | 3 +- app/forms/dependant_income_details_form.rb | 3 +- app/forms/income_form.rb | 3 +- app/forms/partner_assets_form.rb | 3 +- app/forms/vehicles_details_form.rb | 3 +- spec/rails_helper.rb | 24 ++- 10 files changed, 102 insertions(+), 86 deletions(-) diff --git a/Gemfile b/Gemfile index cce7ff100..ec85900e5 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.3.4" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 7.1.3" +gem "rails", "~> 7.2.1" # The modern asset pipeline for Rails [https://github.com/rails/propshaft] gem "propshaft", ">= 0.9.0" @@ -102,7 +102,7 @@ group :test do gem "webmock", require: false gem "axe-core-rspec" gem "rack_session_access" - gem "database_cleaner" + gem "database_cleaner-active_record" gem "vcr", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 50429bf3a..5a68fc308 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,84 +1,80 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.3.4) - actionpack (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activesupport (= 7.1.3.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) + actionmailer (7.2.1) + actionpack (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.4) - actionpack (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + useragent (~> 0.16) + actiontext (7.2.1) + actionpack (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.4) - activesupport (= 7.1.3.4) + activejob (7.2.1) + activesupport (= 7.2.1) globalid (>= 0.3.6) - activemodel (7.1.3.4) - activesupport (= 7.1.3.4) + activemodel (7.2.1) + activesupport (= 7.2.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.1.3.4) - activemodel (= 7.1.3.4) - activesupport (= 7.1.3.4) + activerecord (7.2.1) + activemodel (= 7.2.1) + activesupport (= 7.2.1) timeout (>= 0.4.0) - activestorage (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activesupport (= 7.1.3.4) + activestorage (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activesupport (= 7.2.1) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) annotate_models (1.0.1) @@ -138,9 +134,7 @@ GEM cssbundling-rails (1.4.1) railties (>= 6.0.0) csv (3.3.0) - database_cleaner (2.0.2) - database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.1.0) + database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -259,7 +253,6 @@ GEM msgpack (1.7.2) multi_xml (0.7.1) bigdecimal (~> 3.1) - mutex_m (0.2.0) nested_form (0.3.2) net-http (0.4.1) uri @@ -357,20 +350,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.4) - actioncable (= 7.1.3.4) - actionmailbox (= 7.1.3.4) - actionmailer (= 7.1.3.4) - actionpack (= 7.1.3.4) - actiontext (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activemodel (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + rails (7.2.1) + actioncable (= 7.2.1) + actionmailbox (= 7.2.1) + actionmailer (= 7.2.1) + actionpack (= 7.2.1) + actiontext (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activemodel (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -385,10 +378,10 @@ GEM nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (>= 1.0, < 3) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) - irb + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -485,6 +478,7 @@ GEM rexml rubyzip (2.3.2) safe_shell (1.1.0) + securerandom (0.3.1) selenium-webdriver (4.25.0) base64 (~> 0.2) logger (~> 1.4) @@ -532,6 +526,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.6.0) uri (0.13.1) + useragent (0.16.10) vcr (6.3.1) base64 version_gem (1.1.4) @@ -580,7 +575,7 @@ DEPENDENCIES capybara capybara-selenium cssbundling-rails - database_cleaner + database_cleaner-active_record debug devise dotenv-rails (>= 3.1.1) @@ -609,7 +604,7 @@ DEPENDENCIES pry-stack_explorer puma (~> 6.4) rack_session_access - rails (~> 7.1.3) + rails (~> 7.2.1) rails_admin redis-rails rexml (>= 3.3.4) diff --git a/app/forms/additional_property_details_form.rb b/app/forms/additional_property_details_form.rb index 547e6e88c..94e933416 100644 --- a/app/forms/additional_property_details_form.rb +++ b/app/forms/additional_property_details_form.rb @@ -7,7 +7,8 @@ class AdditionalPropertyDetailsForm ITEMS_SESSION_KEY = "additional_properties".freeze ITEM_MODEL = AdditionalPropertyModel ATTRIBUTES = %i[additional_properties].freeze - alias_attribute :additional_properties, :items + alias_method :additional_properties, :items + alias_method :additional_properties=, :items= class << self def add_extra_attributes_to_model_from_session(model, session_data, index) diff --git a/app/forms/benefit_details_form.rb b/app/forms/benefit_details_form.rb index 2f28042cd..be764ef7d 100644 --- a/app/forms/benefit_details_form.rb +++ b/app/forms/benefit_details_form.rb @@ -7,7 +7,8 @@ class BenefitDetailsForm ITEMS_SESSION_KEY = "benefits".freeze ITEM_MODEL = BenefitModel ATTRIBUTES = %i[benefits].freeze - alias_attribute :benefits, :items + alias_method :benefits, :items + alias_method :benefits=, :items= def benefit_list @benefit_list ||= begin diff --git a/app/forms/client_assets_form.rb b/app/forms/client_assets_form.rb index 27b54937f..6bf21cbd8 100644 --- a/app/forms/client_assets_form.rb +++ b/app/forms/client_assets_form.rb @@ -13,7 +13,8 @@ class ClientAssetsForm < AssetsForm ITEMS_SESSION_KEY = "bank_accounts".freeze ITEM_MODEL = BankAccountModel - alias_attribute :bank_accounts, :items + alias_method :bank_accounts, :items + alias_method :bank_accounts=, :items= class << self def add_extra_attributes_to_model_from_session(bank_account_model, session_data, _) diff --git a/app/forms/dependant_income_details_form.rb b/app/forms/dependant_income_details_form.rb index 28136e910..ab9656a02 100644 --- a/app/forms/dependant_income_details_form.rb +++ b/app/forms/dependant_income_details_form.rb @@ -7,7 +7,8 @@ class DependantIncomeDetailsForm ITEMS_SESSION_KEY = "dependant_incomes".freeze ITEM_MODEL = DependantIncomeModel ATTRIBUTES = %i[dependant_incomes].freeze - alias_attribute :dependant_incomes, :items + alias_method :dependant_incomes, :items + alias_method :dependant_incomes=, :items= def max_items (check.adult_dependants ? check.adult_dependants_count : 0) + (check.child_dependants ? check.child_dependants_count : 0) diff --git a/app/forms/income_form.rb b/app/forms/income_form.rb index 37b7043f8..851d9be49 100644 --- a/app/forms/income_form.rb +++ b/app/forms/income_form.rb @@ -7,7 +7,8 @@ class IncomeForm ITEMS_SESSION_KEY = "incomes".freeze ITEM_MODEL = IncomeModel ATTRIBUTES = %i[incomes].freeze - alias_attribute :incomes, :items + alias_method :incomes, :items + alias_method :incomes=, :items= def self.add_extra_attributes_to_model_from_session(model, session_data, _) model.controlled = Steps::Logic.controlled?(session_data) diff --git a/app/forms/partner_assets_form.rb b/app/forms/partner_assets_form.rb index 13d789f93..148b20902 100644 --- a/app/forms/partner_assets_form.rb +++ b/app/forms/partner_assets_form.rb @@ -6,5 +6,6 @@ class PartnerAssetsForm < AssetsForm ITEMS_SESSION_KEY = "partner_bank_accounts".freeze ITEM_MODEL = BankAccountModel - alias_attribute :bank_accounts, :items + alias_method :bank_accounts, :items + alias_method :bank_accounts=, :items= end diff --git a/app/forms/vehicles_details_form.rb b/app/forms/vehicles_details_form.rb index edd9e3448..e51608168 100644 --- a/app/forms/vehicles_details_form.rb +++ b/app/forms/vehicles_details_form.rb @@ -7,7 +7,8 @@ class VehiclesDetailsForm ITEMS_SESSION_KEY = "vehicles".freeze ITEM_MODEL = VehicleModel ATTRIBUTES = %i[vehicles].freeze - alias_attribute :vehicles, :items + alias_method :vehicles, :items + alias_method :vehicles=, :items= class << self def add_extra_attributes_to_model_from_session(vehicle_model, session_data, _) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 07b574fae..cdad37439 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -10,6 +10,7 @@ require "rspec/rails" require "axe-rspec" require "pry-rescue/rspec" if Rails.env.development? +require "database_cleaner/active_record" Capybara.register_driver :headless_chrome do |app| options = Selenium::WebDriver::Chrome::Options.new @@ -168,11 +169,24 @@ expect(ErrorService).not_to receive(:call) unless test.metadata.key?(:throws_cfe_error) end - config.before(:suite) do - DatabaseCleaner.clean_with :truncation - end - config.after(:suite) do - DatabaseCleaner.clean_with :truncation + RSpec.configure do |test| + test.use_transactional_fixtures = false + + # Clean the database before the suite runs + test.before(:suite) do + DatabaseCleaner.clean_with(:truncation) + end + + # Use truncation before each test runs + test.before do + DatabaseCleaner.strategy = :truncation + DatabaseCleaner.start + end + + # Clean the database after each test + test.after do + DatabaseCleaner.clean + end end config.after(:suite) do From b4ebfcebcd357dbf28a180bbf9841a0db2ab2299 Mon Sep 17 00:00:00 2001 From: willclarke Date: Mon, 21 Oct 2024 13:38:36 +0100 Subject: [PATCH 2/6] update puppetteer to 23.5.3 (#1600) Co-authored-by: Hettie Street <43522239+HettieS@users.noreply.github.com> --- .circleci/config.yml | 2 +- .../workflows/browser_tools_docker_image.yml | 2 +- Dockerfile_browser_tools.dockerfile | 2 +- package.json | 2 +- yarn.lock | 30 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc4ebeba0..85e54bf85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ executors: test-executor: resource_class: medium docker: - - image: checkclientqualifiesdocker/circleci-image:puppeteer-2340 + - image: checkclientqualifiesdocker/circleci-image:puppeteer-2353 auth: username: $DOCKERHUB_USER_CCQ password: $DOCKERHUB_PAT_CCQ diff --git a/.github/workflows/browser_tools_docker_image.yml b/.github/workflows/browser_tools_docker_image.yml index 0313e48a7..b4169e384 100644 --- a/.github/workflows/browser_tools_docker_image.yml +++ b/.github/workflows/browser_tools_docker_image.yml @@ -3,7 +3,7 @@ on: push: branches: - main - - puppeteer-2340 + - puppeteer-2353 jobs: build-push: diff --git a/Dockerfile_browser_tools.dockerfile b/Dockerfile_browser_tools.dockerfile index fb4330ae3..a6b119778 100644 --- a/Dockerfile_browser_tools.dockerfile +++ b/Dockerfile_browser_tools.dockerfile @@ -11,7 +11,7 @@ RUN sudo apt install pdftk --allow-unauthenticated # These 2 lines still need to mirror the actual version # used by the application (in yarn.lock, not package.json) -RUN yarn add puppeteer@23.4.0 +RUN yarn add puppeteer@23.5.3 RUN npx puppeteer browsers install chrome COPY . . diff --git a/package.json b/package.json index f72635000..78c70e104 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "esbuild": "^0.24.0", "govuk-frontend": "^5.6.0", "jquery": "^3.7.1", - "puppeteer": "23.4.0", + "puppeteer": "23.5.3", "rails_admin": "3.2.0", "sass": "^1.79.4" }, diff --git a/yarn.lock b/yarn.lock index 207555b67..a31dc83ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -417,10 +417,10 @@ chokidar@^4.0.0: dependencies: readdirp "^4.0.1" -chromium-bidi@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.6.5.tgz#31be98f9ee5c93fa99d240c680518c9293d8c6bb" - integrity sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA== +chromium-bidi@0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.8.0.tgz#ffd79dad7db1fcc874f1c55fcf46ded05a884269" + integrity sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug== dependencies: mitt "3.0.1" urlpattern-polyfill "10.0.0" @@ -898,28 +898,28 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -puppeteer-core@23.4.0: - version "23.4.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-23.4.0.tgz#09886b61b0f5a32e3ed665ecc38bf0fe05566da4" - integrity sha512-fqkIP5FOcb38jfBj/OcBz1wFaI9nk40uQKSORvnXws6wCbep2dg8yxZ3ddJxBIfQsxoiEOvnrykFinUScrB/ew== +puppeteer-core@23.5.3: + version "23.5.3" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-23.5.3.tgz#f53af458d59d08ec256d56d17689818592d9166a" + integrity sha512-V58MZD/B3CwkYsqSEQlHKbavMJptF04fzhMdUpiCRCmUVhwZNwSGEPhaiZ1f8I3ABQUirg3VNhXVB6Z1ubHXtQ== dependencies: "@puppeteer/browsers" "2.4.0" - chromium-bidi "0.6.5" + chromium-bidi "0.8.0" debug "^4.3.7" devtools-protocol "0.0.1342118" typed-query-selector "^2.12.0" ws "^8.18.0" -puppeteer@23.4.0: - version "23.4.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-23.4.0.tgz#547a6ac78debb8affc6782fbebc401be2786d2e2" - integrity sha512-FxgFFJI7NAsX8uebiEDSjS86vufz9TaqERQHShQT0lCbSRI3jUPEcz/0HdwLiYvfYNsc1zGjqY3NsGZya4PvUA== +puppeteer@23.5.3: + version "23.5.3" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-23.5.3.tgz#aba7fbf39d8d9bb0c8d48a78e26ef169ed812685" + integrity sha512-FghmfBsr/UUpe48OiCg1gV3W4vVfQJKjQehbF07SjnQvEpWcvPTah1nykfGWdOQQ1ydJPIXcajzWN7fliCU3zw== dependencies: "@puppeteer/browsers" "2.4.0" - chromium-bidi "0.6.5" + chromium-bidi "0.8.0" cosmiconfig "^9.0.0" devtools-protocol "0.0.1342118" - puppeteer-core "23.4.0" + puppeteer-core "23.5.3" typed-query-selector "^2.12.0" queue-tick@^1.0.1: From e532d93c4f3418d789a45144117977958b593a84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:37:24 +0000 Subject: [PATCH 3/6] Bump the combined-dependencies group across 1 directory with 6 updates Bumps the combined-dependencies group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [grover](https://github.com/Studiosity/grover) | `1.1.10` | `1.1.11` | | [erb_lint](https://github.com/Shopify/erb-lint) | `0.6.0` | `0.7.0` | | [faker](https://github.com/faker-ruby/faker) | `3.4.2` | `3.5.1` | | [axe-core-rspec](https://github.com/dequelabs/axe-core-gems) | `4.10.0` | `4.10.1` | | [govuk-components](https://github.com/x-govuk/govuk-components) | `5.6.1` | `5.7.0` | | [govuk_design_system_formbuilder](https://github.com/x-govuk/govuk-form-builder) | `5.6.0` | `5.7.0` | Updates `grover` from 1.1.10 to 1.1.11 - [Release notes](https://github.com/Studiosity/grover/releases) - [Changelog](https://github.com/Studiosity/grover/blob/main/CHANGELOG.md) - [Commits](https://github.com/Studiosity/grover/compare/v1.1.10...v1.1.11) Updates `erb_lint` from 0.6.0 to 0.7.0 - [Release notes](https://github.com/Shopify/erb-lint/releases) - [Commits](https://github.com/Shopify/erb-lint/compare/v0.6.0...v0.7.0) Updates `faker` from 3.4.2 to 3.5.1 - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v3.4.2...v3.5.1) Updates `axe-core-rspec` from 4.10.0 to 4.10.1 - [Release notes](https://github.com/dequelabs/axe-core-gems/releases) - [Changelog](https://github.com/dequelabs/axe-core-gems/blob/develop/CHANGELOG.md) - [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.10.0...v4.10.1) Updates `govuk-components` from 5.6.1 to 5.7.0 - [Release notes](https://github.com/x-govuk/govuk-components/releases) - [Commits](https://github.com/x-govuk/govuk-components/compare/v5.6.1...v5.7.0) Updates `govuk_design_system_formbuilder` from 5.6.0 to 5.7.0 - [Release notes](https://github.com/x-govuk/govuk-form-builder/releases) - [Commits](https://github.com/x-govuk/govuk-form-builder/compare/v5.6.0...v5.7.0) --- updated-dependencies: - dependency-name: grover dependency-type: direct:production update-type: version-update:semver-patch dependency-group: combined-dependencies - dependency-name: erb_lint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: combined-dependencies - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-minor dependency-group: combined-dependencies - dependency-name: axe-core-rspec dependency-type: direct:development update-type: version-update:semver-patch dependency-group: combined-dependencies - dependency-name: govuk-components dependency-type: direct:production update-type: version-update:semver-minor dependency-group: combined-dependencies - dependency-name: govuk_design_system_formbuilder dependency-type: direct:production update-type: version-update:semver-minor dependency-group: combined-dependencies ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5a68fc308..b7823a0d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,12 +79,14 @@ GEM public_suffix (>= 2.0.2, < 7.0) annotate_models (1.0.1) ast (2.4.2) - axe-core-api (4.10.0) + axe-core-api (4.10.1) dumb_delegator + ostruct virtus - axe-core-rspec (4.10.0) - axe-core-api (= 4.10.0) + axe-core-rspec (4.10.1) + axe-core-api (= 4.10.1) dumb_delegator + ostruct virtus axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -159,7 +161,7 @@ GEM railties (>= 6.1) drb (2.2.1) dumb_delegator (1.0.0) - erb_lint (0.6.0) + erb_lint (0.7.0) activesupport better_html (>= 2.0.1) parser (>= 2.7.1.4) @@ -175,7 +177,7 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faker (3.4.2) + faker (3.5.1) i18n (>= 1.8.11, < 2) faraday (2.12.0) faraday-net_http (>= 2.0, < 3.4) @@ -191,11 +193,11 @@ GEM geckoboard-ruby (0.4.0) globalid (1.2.1) activesupport (>= 6.1) - govuk-components (5.6.1) + govuk-components (5.7.0) html-attributes-utils (~> 1.0.0, >= 1.0.0) pagy (>= 6, < 10) - view_component (>= 3.9, < 3.15) - govuk_design_system_formbuilder (5.6.0) + view_component (>= 3.9, < 3.17) + govuk_design_system_formbuilder (5.7.0) actionview (>= 6.1) activemodel (>= 6.1) activesupport (>= 6.1) @@ -203,7 +205,7 @@ GEM govuk_notify_rails (3.0.0) notifications-ruby-client (~> 6.2) rails (>= 4.1.0) - grover (1.1.10) + grover (1.1.11) combine_pdf (~> 1.0) nokogiri (~> 1.0) hashdiff (1.1.1) @@ -302,7 +304,8 @@ GEM omniauth (~> 2.1) ruby-saml (~> 1.17) orm_adapter (0.5.0) - pagy (9.0.8) + ostruct (0.6.0) + pagy (9.1.0) parallel (1.26.3) parallel_tests (4.7.2) parallel @@ -530,7 +533,7 @@ GEM vcr (6.3.1) base64 version_gem (1.1.4) - view_component (3.14.0) + view_component (3.16.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) From d4239764b38bc32157e24418eb55d40cfb9af996 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:34:30 +0000 Subject: [PATCH 4/6] Bump rails_admin from 3.2.0 to 3.2.1 Bumps [rails_admin](https://github.com/sferik/rails_admin) from 3.2.0 to 3.2.1. - [Changelog](https://github.com/railsadminteam/rails_admin/blob/master/CHANGELOG.md) - [Commits](https://github.com/sferik/rails_admin/compare/v3.2.0...v3.2.1) --- updated-dependencies: - dependency-name: rails_admin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b7823a0d0..30dc46834 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,9 +50,9 @@ GEM globalid (>= 0.3.6) activemodel (7.2.1) activesupport (= 7.2.1) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) activerecord (7.2.1) activemodel (= 7.2.1) @@ -260,7 +260,7 @@ GEM uri net-http-persistent (4.0.4) connection_pool (~> 2.2) - net-imap (0.4.16) + net-imap (0.5.0) date net-protocol net-pop (0.1.2) @@ -339,7 +339,7 @@ GEM puma (6.4.3) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -374,7 +374,7 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails_admin (3.2.0) + rails_admin (3.2.1) activemodel-serializers-xml (>= 1.0) csv kaminari (>= 0.14, < 2.0) @@ -521,9 +521,8 @@ GEM thread_safe (0.3.6) tilt (2.4.0) timeout (0.4.1) - turbo-rails (2.0.6) + turbo-rails (2.0.11) actionpack (>= 6.0.0) - activejob (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -559,7 +558,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.18) + zeitwerk (2.7.1) PLATFORMS arm64-darwin-21 From fc4786407f3671f41047b1797304bb0307800ea4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:45:16 +0000 Subject: [PATCH 5/6] Bump actiontext from 7.2.1 to 7.2.1.1 Bumps [actiontext](https://github.com/rails/rails) from 7.2.1 to 7.2.1.1. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.2.1.1/actiontext/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.2.1...v7.2.1.1) --- updated-dependencies: - dependency-name: actiontext dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 106 +++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 30dc46834..13764cd9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.2.1) - actionpack (= 7.2.1) - activesupport (= 7.2.1) + actioncable (7.2.1.1) + actionpack (= 7.2.1.1) + activesupport (= 7.2.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.1) - actionpack (= 7.2.1) - activejob (= 7.2.1) - activerecord (= 7.2.1) - activestorage (= 7.2.1) - activesupport (= 7.2.1) + actionmailbox (7.2.1.1) + actionpack (= 7.2.1.1) + activejob (= 7.2.1.1) + activerecord (= 7.2.1.1) + activestorage (= 7.2.1.1) + activesupport (= 7.2.1.1) mail (>= 2.8.0) - actionmailer (7.2.1) - actionpack (= 7.2.1) - actionview (= 7.2.1) - activejob (= 7.2.1) - activesupport (= 7.2.1) + actionmailer (7.2.1.1) + actionpack (= 7.2.1.1) + actionview (= 7.2.1.1) + activejob (= 7.2.1.1) + activesupport (= 7.2.1.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.1) - actionview (= 7.2.1) - activesupport (= 7.2.1) + actionpack (7.2.1.1) + actionview (= 7.2.1.1) + activesupport (= 7.2.1.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -32,39 +32,39 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.1) - actionpack (= 7.2.1) - activerecord (= 7.2.1) - activestorage (= 7.2.1) - activesupport (= 7.2.1) + actiontext (7.2.1.1) + actionpack (= 7.2.1.1) + activerecord (= 7.2.1.1) + activestorage (= 7.2.1.1) + activesupport (= 7.2.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.1) - activesupport (= 7.2.1) + actionview (7.2.1.1) + activesupport (= 7.2.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.2.1) - activesupport (= 7.2.1) + activejob (7.2.1.1) + activesupport (= 7.2.1.1) globalid (>= 0.3.6) - activemodel (7.2.1) - activesupport (= 7.2.1) + activemodel (7.2.1.1) + activesupport (= 7.2.1.1) activemodel-serializers-xml (1.0.3) activemodel (>= 5.0.0.a) activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord (7.2.1) - activemodel (= 7.2.1) - activesupport (= 7.2.1) + activerecord (7.2.1.1) + activemodel (= 7.2.1.1) + activesupport (= 7.2.1.1) timeout (>= 0.4.0) - activestorage (7.2.1) - actionpack (= 7.2.1) - activejob (= 7.2.1) - activerecord (= 7.2.1) - activesupport (= 7.2.1) + activestorage (7.2.1.1) + actionpack (= 7.2.1.1) + activejob (= 7.2.1.1) + activerecord (= 7.2.1.1) + activesupport (= 7.2.1.1) marcel (~> 1.0) - activesupport (7.2.1) + activesupport (7.2.1.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -353,20 +353,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.2.1) - actioncable (= 7.2.1) - actionmailbox (= 7.2.1) - actionmailer (= 7.2.1) - actionpack (= 7.2.1) - actiontext (= 7.2.1) - actionview (= 7.2.1) - activejob (= 7.2.1) - activemodel (= 7.2.1) - activerecord (= 7.2.1) - activestorage (= 7.2.1) - activesupport (= 7.2.1) + rails (7.2.1.1) + actioncable (= 7.2.1.1) + actionmailbox (= 7.2.1.1) + actionmailer (= 7.2.1.1) + actionpack (= 7.2.1.1) + actiontext (= 7.2.1.1) + actionview (= 7.2.1.1) + activejob (= 7.2.1.1) + activemodel (= 7.2.1.1) + activerecord (= 7.2.1.1) + activestorage (= 7.2.1.1) + activesupport (= 7.2.1.1) bundler (>= 1.15.0) - railties (= 7.2.1) + railties (= 7.2.1.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -381,9 +381,9 @@ GEM nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (>= 1.0, < 3) - railties (7.2.1) - actionpack (= 7.2.1) - activesupport (= 7.2.1) + railties (7.2.1.1) + actionpack (= 7.2.1.1) + activesupport (= 7.2.1.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) From d0c34671918fa959bfee5117e72f58f31ea43c7d Mon Sep 17 00:00:00 2001 From: willclarke Date: Wed, 23 Oct 2024 07:47:09 +0100 Subject: [PATCH 6/6] release new cw forms (#1615) --- helm_deploy/laa-estimate-eligibility/values/ccq-production.yaml | 2 +- helm_deploy/laa-estimate-eligibility/values/ccq-staging.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm_deploy/laa-estimate-eligibility/values/ccq-production.yaml b/helm_deploy/laa-estimate-eligibility/values/ccq-production.yaml index 336abb3b2..ee1ef2a30 100644 --- a/helm_deploy/laa-estimate-eligibility/values/ccq-production.yaml +++ b/helm_deploy/laa-estimate-eligibility/values/ccq-production.yaml @@ -60,7 +60,7 @@ featureFlags: basicAuthentication: NOT_ENABLED outgoingsFlow: ENABLED conditionalReveals: ENABLED - cwFormUpdates: NOT_ENABLED + cwFormUpdates: ENABLED sharedOwnership: NOT_ENABLED eeBanner: NOT_ENABLED diff --git a/helm_deploy/laa-estimate-eligibility/values/ccq-staging.yaml b/helm_deploy/laa-estimate-eligibility/values/ccq-staging.yaml index c2e6226d9..4c66bbe9d 100644 --- a/helm_deploy/laa-estimate-eligibility/values/ccq-staging.yaml +++ b/helm_deploy/laa-estimate-eligibility/values/ccq-staging.yaml @@ -60,7 +60,7 @@ featureFlags: basicAuthentication: ENABLED outgoingsFlow: ENABLED conditionalReveals: ENABLED - cwFormUpdates: NOT_ENABLED + cwFormUpdates: ENABLED sharedOwnership: NOT_ENABLED eeBanner: NOT_ENABLED