From 36edb2eab35ae785bb08222d4f5211bf25d03723 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:33:54 +0000 Subject: [PATCH 1/2] Bump gds-api-adapters from 96.0.3 to 97.0.0 Bumps [gds-api-adapters](https://github.com/alphagov/gds-api-adapters) from 96.0.3 to 97.0.0. - [Changelog](https://github.com/alphagov/gds-api-adapters/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/gds-api-adapters/compare/v96.0.3...v97.0.0) --- updated-dependencies: - dependency-name: gds-api-adapters dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6adcd2ea..1cedd49c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,7 +129,7 @@ GEM net-http ffi (1.16.3) find_a_port (1.0.1) - gds-api-adapters (96.0.3) + gds-api-adapters (97.0.0) addressable link_header null_logger @@ -216,9 +216,10 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.0.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.1001) mini_mime (1.1.5) mini_portile2 (2.8.7) minitest (5.25.1) From 1e1b0e908da7ae0a9e4a7c484ec12d8e999fbda1 Mon Sep 17 00:00:00 2001 From: Ynda Jas Date: Fri, 18 Oct 2024 12:14:31 +0100 Subject: [PATCH 2/2] Remove redirect type references Support for this has been dropped from Router API and subsequently gds-api-adapters --- app/models/route_set.rb | 1 - spec/support/router_helpers.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/route_set.rb b/app/models/route_set.rb index d4539a6b..3158ea22 100644 --- a/app/models/route_set.rb +++ b/app/models/route_set.rb @@ -95,7 +95,6 @@ def register_redirect(route) route.fetch(:path), route.fetch(:type), route.fetch(:destination), - route.fetch(:redirect_type, "permanent"), segments_mode: route[:segments_mode], ) end diff --git a/spec/support/router_helpers.rb b/spec/support/router_helpers.rb index c79a0080..c1cfa836 100644 --- a/spec/support/router_helpers.rb +++ b/spec/support/router_helpers.rb @@ -25,7 +25,7 @@ def assert_redirect_routes_registered(redirects) # NOTE: WebMock stubs allow you to assert against already executed requests. redirects.each do |(path, type, destination, segments_mode)| - redirect_signature = stub_redirect_registration(path, type, destination, "permanent", segments_mode) + redirect_signature = stub_redirect_registration(path, type, destination, segments_mode) assert_requested(redirect_signature, times: 1) end end