From 3de25f4c9a36432ec94db0b380d55a810def6351 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 08:36:59 +0000 Subject: [PATCH 1/3] Bump govuk_app_config from 9.11.2 to 9.12.0 Bumps [govuk_app_config](https://github.com/alphagov/govuk_app_config) from 9.11.2 to 9.12.0. - [Changelog](https://github.com/alphagov/govuk_app_config/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_app_config/compare/v9.11.2...v9.12.0) --- updated-dependencies: - dependency-name: govuk_app_config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 294120e08..0ad49acc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,10 +174,10 @@ GEM googleapis-common-protos-types (1.15.0) google-protobuf (>= 3.18, < 5.a) govuk_ab_testing (2.4.3) - govuk_app_config (9.11.2) + govuk_app_config (9.12.0) logstasher (~> 2.1) - opentelemetry-exporter-otlp (>= 0.25, < 0.27) - opentelemetry-instrumentation-all (>= 0.39.1, < 0.61.0) + opentelemetry-exporter-otlp (>= 0.25, < 0.29) + opentelemetry-instrumentation-all (>= 0.39.1, < 0.62.0) opentelemetry-sdk (~> 1.2) plek (>= 4, < 6) prometheus_exporter (~> 2.0) @@ -270,8 +270,8 @@ GEM opentelemetry-api (1.2.5) opentelemetry-common (0.21.0) opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.26.3) - google-protobuf (~> 3.14) + opentelemetry-exporter-otlp (0.28.0) + google-protobuf (>= 3.18) googleapis-common-protos-types (~> 1.3) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) @@ -306,8 +306,9 @@ GEM opentelemetry-instrumentation-active_support (0.5.3) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-all (0.60.0) + opentelemetry-instrumentation-all (0.61.0) opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) + opentelemetry-instrumentation-aws_lambda (~> 0.1.0) opentelemetry-instrumentation-aws_sdk (~> 0.5.0) opentelemetry-instrumentation-bunny (~> 0.21.0) opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1) @@ -340,6 +341,9 @@ GEM opentelemetry-instrumentation-sidekiq (~> 0.25.0) opentelemetry-instrumentation-sinatra (~> 0.23.1) opentelemetry-instrumentation-trilogy (~> 0.59.0) + opentelemetry-instrumentation-aws_lambda (0.1.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-aws_sdk (0.5.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) From 1507800e2ac8b7d4c4d6adabadcc06dc3fb37083 Mon Sep 17 00:00:00 2001 From: Keith Lawrence Date: Thu, 27 Jun 2024 11:03:51 +0100 Subject: [PATCH 2/3] Update output atom date to London timezone --- spec/presenters/atom_presenter_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/presenters/atom_presenter_spec.rb b/spec/presenters/atom_presenter_spec.rb index 129ea1f13..651052a1a 100644 --- a/spec/presenters/atom_presenter_spec.rb +++ b/spec/presenters/atom_presenter_spec.rb @@ -119,7 +119,7 @@ describe "#updated_at" do it "provides the date of the most recent document update" do - expect(instance.updated_at.to_s).to eql("2019-02-01 12:21:00 UTC") + expect(instance.updated_at.to_s).to eql("2019-02-01 12:21:00 +0000") end end end From cdc772eeff2027284af24c68701b89d46cb96260 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Tue, 2 Jul 2024 11:01:01 +0100 Subject: [PATCH 3/3] Fix failing test --- features/step_definitions/filtering_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions/filtering_steps.rb b/features/step_definitions/filtering_steps.rb index 92bbd24e1..a774ed516 100644 --- a/features/step_definitions/filtering_steps.rb +++ b/features/step_definitions/filtering_steps.rb @@ -280,7 +280,7 @@ Then(/^I see the atom feed$/) do expect(page).to have_selector("id", text: "tag:www.dev.gov.uk,2005:/restrictions-on-usage-of-spells-within-school-grounds") - expect(page).to have_selector("updated", text: "2017-12-30T10:00:00Z") + expect(page).to have_selector("updated", text: "2017-12-30T10:00:00+00:00") expect(page).to have_selector(:css, 'link[href="http://www.dev.gov.uk/restrictions-on-usage-of-spells-within-school-grounds"]') expect(page).to have_selector("title", text: "Restrictions on usage of spells within school grounds") expect(page).to have_selector("summary", text: "Restrictions on usage of spells within school grounds")