diff --git a/Gemfile b/Gemfile index 1e7b61ae3..ef19fd3a4 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,7 @@ gem "pundit" gem "rack-attack" gem "rails-html-sanitizer" gem "rake" +gem "redis" gem "rotp" gem "rqrcode" gem "sentry-sidekiq" diff --git a/Gemfile.lock b/Gemfile.lock index f435012b5..92ead4cfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,12 +203,11 @@ GEM rouge sprockets (>= 3) sprockets-rails - govuk_sidekiq (8.0.1) + govuk_sidekiq (9.0.0) gds-api-adapters (>= 19.1.0) govuk_app_config (>= 1.1) - redis (< 5) - redis-namespace (~> 1.6) - sidekiq (~> 6.5, >= 6.5.12) + redis-client (>= 0.22.2) + sidekiq (~> 7.0, < 8) govuk_test (4.1.0) brakeman (>= 5.0.2) capybara (>= 3.36) @@ -544,18 +543,18 @@ GEM pundit (2.4.0) activesupport (>= 3.0.0) racc (1.8.1) - rack (2.2.9) + rack (3.1.7) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-proxy (0.7.7) rack - rack-session (1.0.2) - rack (< 3) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.0) - rack (< 3) - webrick + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) rails (7.2.1) actioncable (= 7.2.1) actionmailbox (= 7.2.1) @@ -597,9 +596,10 @@ GEM rdoc (6.7.0) psych (>= 4.0.0) recursive-open-struct (1.2.2) - redis (4.8.1) - redis-namespace (1.11.0) - redis (>= 4) + redis (5.3.0) + redis-client (>= 0.22.0) + redis-client (0.22.2) + connection_pool regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) @@ -680,10 +680,12 @@ GEM sentry-ruby (~> 5.19.0) sidekiq (>= 3.0) shoulda-context (2.0.0) - sidekiq (6.5.12) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.3.2) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) @@ -775,6 +777,7 @@ DEPENDENCIES rails-controller-testing rails-html-sanitizer rake + redis rotp rqrcode rubocop-govuk diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb deleted file mode 100644 index 98860c611..000000000 --- a/config/initializers/sidekiq.rb +++ /dev/null @@ -1,2 +0,0 @@ -# Use Sidekiq strict args to force Sidekiq 6 deprecations to error ahead of upgrade to Sidekiq 7 -Sidekiq.strict_args! diff --git a/test/integration/cookies_security_test.rb b/test/integration/cookies_security_test.rb index a7888b909..eeeb1b16f 100644 --- a/test/integration/cookies_security_test.rb +++ b/test/integration/cookies_security_test.rb @@ -6,8 +6,8 @@ class CookiesSecurityTest < ActionDispatch::IntegrationTest sign_up_with user.email, user.password visit new_user_session_path response_cookies = Capybara.current_session.driver.response.headers["Set-Cookie"] - assert_match "HttpOnly", response_cookies - assert_match "SameSite=Lax", response_cookies + assert_match "httponly", response_cookies + assert_match "samesite=lax", response_cookies end def sign_up_with(email, password)