diff --git a/Gemfile.lock b/Gemfile.lock index 9901b11fc..9df4f63ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,14 +72,13 @@ GEM reline (>= 0.6.0) climate_control (1.2.0) coderay (1.1.3) - concurrent-ruby (1.3.7) - connection_pool (2.5.5) + concurrent-ruby (1.3.8) + connection_pool (3.0.2) crack (1.0.1) bigdecimal rexml crass (1.0.7) csv (3.3.6) - date (3.5.1) declarative (0.0.20) diff-lcs (1.6.2) dig_rb (1.0.1) @@ -93,7 +92,7 @@ GEM elasticsearch-transport (6.8.3) faraday (~> 1) multi_json - erb (6.0.4) + erb (6.0.6) erubi (1.13.1) expgen (0.1.1) parslet @@ -220,11 +219,11 @@ GEM ostruct govuk_schemas (6.3.2) json-schema (>= 2.8, < 6.3) - govuk_sidekiq (11.1.2) + govuk_sidekiq (12.0.0) gds-api-adapters (>= 19.1.0) govuk_app_config (>= 1.1) redis-client (>= 0.22.2) - sidekiq (~> 7.0, < 8) + sidekiq (>= 8.1.1, < 9) grpc (1.81.1) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) @@ -249,7 +248,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) jmespath (1.6.2) - json (2.20.0) + json (2.21.2) json-schema (6.2.0) addressable (~> 2.8) bigdecimal (>= 3.1, < 5) @@ -320,11 +319,11 @@ GEM oj (3.17.4) bigdecimal (>= 3.0) ostruct (>= 0.2) - opentelemetry-api (1.10.0) + opentelemetry-api (1.11.0) logger - opentelemetry-common (0.25.0) + opentelemetry-common (0.25.1) opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.34.0) + opentelemetry-exporter-otlp (0.34.1) google-protobuf (>= 3.18) googleapis-common-protos-types (~> 1.3) opentelemetry-api (~> 1.1) @@ -353,7 +352,7 @@ GEM opentelemetry-instrumentation-base (~> 0.25) opentelemetry-instrumentation-active_storage (0.5.1) opentelemetry-instrumentation-active_support (~> 0.10) - opentelemetry-instrumentation-active_support (0.12.0) + opentelemetry-instrumentation-active_support (0.12.1) opentelemetry-instrumentation-base (~> 0.25) opentelemetry-instrumentation-all (0.94.0) opentelemetry-instrumentation-active_model_serializers (~> 0.25.0) @@ -417,13 +416,13 @@ GEM opentelemetry-instrumentation-base (~> 0.25) opentelemetry-instrumentation-faraday (0.33.0) opentelemetry-instrumentation-base (~> 0.25) - opentelemetry-instrumentation-grape (0.7.0) + opentelemetry-instrumentation-grape (0.7.1) opentelemetry-instrumentation-rack (~> 0.29) opentelemetry-instrumentation-graphql (0.32.0) opentelemetry-instrumentation-base (~> 0.25) - opentelemetry-instrumentation-grpc (0.5.1) + opentelemetry-instrumentation-grpc (0.5.2) opentelemetry-instrumentation-base (~> 0.25) - opentelemetry-instrumentation-gruf (0.6.1) + opentelemetry-instrumentation-gruf (0.6.2) opentelemetry-instrumentation-base (~> 0.25) opentelemetry-instrumentation-http (0.30.0) opentelemetry-instrumentation-base (~> 0.25) @@ -485,15 +484,15 @@ GEM opentelemetry-helpers-sql-processor opentelemetry-instrumentation-base (~> 0.25) opentelemetry-semantic_conventions (>= 1.8.0) - opentelemetry-registry (0.6.0) + opentelemetry-registry (0.6.3) opentelemetry-api (~> 1.1) - opentelemetry-sdk (1.12.0) + opentelemetry-sdk (1.13.0) logger opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.41.0) + opentelemetry-semantic_conventions (1.43.0) opentelemetry-api (~> 1.0) os (1.1.4) ostruct (0.6.3) @@ -554,9 +553,6 @@ GEM byebug (~> 13.0) pry (>= 0.13, < 0.17) pstore (0.2.1) - psych (5.4.0) - date - stringio public_suffix (7.0.5) puma (8.0.2) nio4r (~> 2.0) @@ -569,7 +565,7 @@ GEM base64 (>= 0.1.0) logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-proxy (0.8.2) + rack-proxy (0.8.3) rack rack-session (2.1.2) base64 (>= 0.1.0) @@ -582,8 +578,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.7.0) - loofah (~> 2.25) + rails-html-sanitizer (1.7.1) + loofah (~> 2.25, >= 2.25.2) 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 (8.1.3) actionpack (= 8.1.3) @@ -602,14 +598,19 @@ GEM ffi (~> 1.0) rb-kqueue (0.2.8) ffi (>= 0.5.0) + rbs (4.1.1) + logger + prism (>= 1.6.0) + tsort rbtree (0.4.6) - rdoc (7.2.0) + rdoc (8.0.0) erb - psych (>= 4.0.0) + prism (>= 1.6.0) + rbs (>= 4.0.0) tsort readline (0.0.4) reline - redis-client (0.30.0) + redis-client (0.30.1) connection_pool regexp_parser (2.12.0) reline (0.6.3) @@ -689,12 +690,12 @@ GEM sentry-sidekiq (6.6.2) sentry-ruby (~> 6.6.2) sidekiq (>= 5.0) - sidekiq (7.3.10) - base64 - connection_pool (>= 2.3.0, < 3) - logger - rack (>= 2.2.4, < 3.3) - redis-client (>= 0.23.0, < 1) + sidekiq (8.1.6) + connection_pool (>= 3.0.0) + json (>= 2.16.0) + logger (>= 1.7.0) + rack (>= 3.2.0) + redis-client (>= 0.29.0) sidekiq-limit_fetch (4.4.1) sidekiq (>= 6) signet (0.22.0) @@ -717,7 +718,6 @@ GEM statsd-ruby (1.5.0) string_pattern (2.4.0) regexp_parser (~> 2.5, >= 2.5.0) - stringio (3.2.0) sync (0.5.0) table_print (1.5.7) term-ansicolor (1.11.3) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 78f2e9aeb..7219c79a4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -27,11 +27,13 @@ require "pry-byebug" require "govuk_sidekiq/testing" -require "sidekiq/testing/inline" # Make all queued jobs run immediately require "bunny-mock" require "govuk_schemas" require "govuk_message_queue_consumer/test_helpers" +# Make all queued jobs run immediately +Sidekiq.testing!(:inline) + # Silence log output Logging.logger.root.appenders = nil Sidekiq.logger.level = Logger::WARN